]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/command_parse.cpp
Hash rehashing change
[user/henk/code/inspircd.git] / src / command_parse.cpp
index 2c3a482cb019bb6d5c1f077bfa66007735eb2eef..07b41c4cba644b4ead2fba50b4c4992f479c1fbd 100644 (file)
-/*       +------------------------------------+
+       /*       +------------------------------------+
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *                <Craig@chatspike.net>
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
  *
- * Written by Craig Edwards, Craig McLure, and others.
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-#include "inspircd_config.h"
 #include "inspircd.h"
 #include "configreader.h"
-#include <unistd.h>
-#include <fcntl.h>
-#include <sys/errno.h>
-#include <sys/ioctl.h>
-#include <sys/utsname.h>
-#include <time.h>
-#include <string>
-#include <sstream>
-#include <vector>
 #include <algorithm>
+#include <dirent.h>
+#include <dlfcn.h>
 #include "users.h"
-#include "globals.h"
 #include "modules.h"
-#include "dynamic.h"
 #include "wildcard.h"
-#include "mode.h"
-#include "commands.h"
 #include "xline.h"
-#include "inspstring.h"
-#include "helperfuncs.h"
-#include "hashcomp.h"
 #include "socketengine.h"
-#include "userprocess.h"
 #include "socket.h"
-#include "dns.h"
-#include "typedefs.h"
 #include "command_parse.h"
-#include "ctables.h"
 
-#define nspace __gnu_cxx
+bool InspIRCd::ULine(const char* server)
+{
+       if (!server)
+               return false;
+       if (!*server)
+               return true;
+
+       return (find(Config->ulines.begin(),Config->ulines.end(),server) != Config->ulines.end());
+}
+
+int InspIRCd::OperPassCompare(const char* data,const char* input, int tagnumber)
+{
+       int MOD_RESULT = 0;
+       FOREACH_RESULT_I(this,I_OnOperCompare,OnOperCompare(data, input, tagnumber))
+       Log(DEBUG,"OperPassCompare: %d",MOD_RESULT);
+       if (MOD_RESULT == 1)
+               return 0;
+       if (MOD_RESULT == -1)
+               return 1;
+       Log(DEBUG,"strcmp fallback: '%s' '%s' %d",data,input,strcmp(data,input));
+       return strcmp(data,input);
+}
+
+long InspIRCd::Duration(const char* str)
+{
+       char n_field[MAXBUF];
+       long total = 0;
+       n_field[0] = 0;
+
+       if ((!strchr(str,'s')) && (!strchr(str,'m')) && (!strchr(str,'h')) && (!strchr(str,'d')) && (!strchr(str,'w')) && (!strchr(str,'y')))
+       {
+               std::string n = str;
+               n += 's';
+               return Duration(n.c_str());
+       }
+       
+       for (char* i = (char*)str; *i; i++)
+       {
+               // if we have digits, build up a string for the value in n_field,
+               // up to 10 digits in size.
+               if ((*i >= '0') && (*i <= '9'))
+               {
+                       strlcat(n_field,i,10);
+               }
+               else
+               {
+                       // we dont have a digit, check for numeric tokens
+                       switch (tolower(*i))
+                       {
+                               case 's':
+                                       total += atoi(n_field);
+                               break;
 
-/* Special commands which may occur without registration of the user */
-cmd_user* command_user;
-cmd_nick* command_nick;
-cmd_pass* command_pass;
+                               case 'm':
+                                       total += (atoi(n_field)*duration_m);
+                               break;
+
+                               case 'h':
+                                       total += (atoi(n_field)*duration_h);
+                               break;
+
+                               case 'd':
+                                       total += (atoi(n_field)*duration_d);
+                               break;
 
+                               case 'w':
+                                       total += (atoi(n_field)*duration_w);
+                               break;
+
+                               case 'y':
+                                       total += (atoi(n_field)*duration_y);
+                               break;
+                       }
+                       n_field[0] = 0;
+               }
+       }
+       // add trailing seconds
+       total += atoi(n_field);
+       
+       return total;
+}
 
 /* LoopCall is used to call a command classes handler repeatedly based on the contents of a comma seperated list.
  * There are two overriden versions of this method, one of which takes two potential lists and the other takes one.
@@ -72,11 +124,17 @@ int CommandParser::LoopCall(userrec* user, command_t* CommandObj, const char** p
        if (!strchr(parameters[splithere],','))
                return 0;
 
+       /** Some lame ircds will weed out dupes using some shitty O(n^2) algorithm.
+        * By using std::map (thanks for the idea w00t) we can cut this down a ton.
+        * ...VOOODOOOO!
+        */
+       std::map<irc::string, bool> dupes;
+
        /* Create two lists, one for channel names, one for keys
         */
        irc::commasepstream items1(parameters[splithere]);
        irc::commasepstream items2(parameters[extra]);
-       std::string item = "";
+       std::string item = "*";
        unsigned int max = 0;
 
        /* Attempt to iterate these lists and call the command objech
@@ -85,10 +143,23 @@ int CommandParser::LoopCall(userrec* user, command_t* CommandObj, const char** p
         */
        while (((item = items1.GetToken()) != "") && (max++ < ServerInstance->Config->MaxTargets))
        {
-               std::string extrastuff = items2.GetToken();
-               parameters[splithere] = item.c_str();
-               parameters[extra] = extrastuff.c_str();
-               CommandObj->Handle(parameters,pcnt,user);
+               if (dupes.find(item.c_str()) == dupes.end())
+               {
+                       const char* new_parameters[127];
+
+                       for (int t = 0; (t < pcnt) && (t < 127); t++)
+                               new_parameters[t] = parameters[t];
+
+                       std::string extrastuff = items2.GetToken();
+
+                       new_parameters[splithere] = item.c_str();
+                       new_parameters[extra] = extrastuff.c_str();
+
+                       if (CommandObj->Handle(new_parameters,pcnt,user) == CMD_USER_DELETED)
+                               return 1;
+
+                       dupes[item.c_str()] = true;
+               }
        }
        return 1;
 }
@@ -101,9 +172,12 @@ int CommandParser::LoopCall(userrec* user, command_t* CommandObj, const char** p
        if (!strchr(parameters[splithere],','))
                return 0;
 
+       std::map<irc::string, bool> dupes;
+
        /* Only one commasepstream here */
+       ServerInstance->Log(DEBUG,"Splitting '%s'",parameters[splithere]);
        irc::commasepstream items1(parameters[splithere]);
-       std::string item = "";
+       std::string item = "*";
        unsigned int max = 0;
 
        /* Parse the commasepstream until there are no tokens remaining.
@@ -112,8 +186,26 @@ int CommandParser::LoopCall(userrec* user, command_t* CommandObj, const char** p
         */
        while (((item = items1.GetToken()) != "") && (max++ < ServerInstance->Config->MaxTargets))
        {
-               parameters[splithere] = item.c_str();
-               CommandObj->Handle(parameters,pcnt,user);
+               if (dupes.find(item.c_str()) == dupes.end())
+               {
+                       const char* new_parameters[127];
+
+                       for (int t = 0; (t < pcnt) && (t < 127); t++)
+                               new_parameters[t] = parameters[t];
+
+                       new_parameters[splithere] = item.c_str();
+
+                       parameters[splithere] = item.c_str();
+
+                       /* Execute the command handler over and over. If someone pulls our user
+                        * record out from under us (e.g. if we /kill a comma sep list, and we're
+                        * in that list ourselves) abort if we're gone.
+                        */
+                       if (CommandObj->Handle(new_parameters,pcnt,user) == CMD_USER_DELETED)
+                               return 1;
+
+                       dupes[item.c_str()] = true;
+               }
        }
        /* By returning 1 we tell our caller that nothing is to be done,
         * as all the previous calls handled the data. This makes the parent
@@ -134,7 +226,7 @@ bool CommandParser::IsValidCommand(const std::string &commandname, int pcnt, use
                        {
                                if (n->second->flags_needed)
                                {
-                                       return ((user->HasPermission(commandname)) || (ServerInstance->is_uline(user->server)));
+                                       return ((user->HasPermission(commandname)) || (ServerInstance->ULine(user->server)));
                                }
                                return true;
                        }
@@ -143,9 +235,18 @@ bool CommandParser::IsValidCommand(const std::string &commandname, int pcnt, use
        return false;
 }
 
+command_t* CommandParser::GetHandler(const std::string &commandname)
+{
+       nspace::hash_map<std::string,command_t*>::iterator n = cmdlist.find(commandname);
+       if (n != cmdlist.end())
+               return n->second;
+
+       return NULL;
+}
+
 // calls a handler function for a command
 
-bool CommandParser::CallHandler(const std::string &commandname,const char** parameters, int pcnt, userrec *user)
+CmdResult CommandParser::CallHandler(const std::string &commandname,const char** parameters, int pcnt, userrec *user)
 {
        nspace::hash_map<std::string,command_t*>::iterator n = cmdlist.find(commandname);
 
@@ -159,36 +260,36 @@ bool CommandParser::CallHandler(const std::string &commandname,const char** para
                                {
                                        if ((user->HasPermission(commandname)) || (!IS_LOCAL(user)))
                                        {
-                                               n->second->Handle(parameters,pcnt,user);
-                                               return true;
+                                               return n->second->Handle(parameters,pcnt,user);
                                        }
                                }
                                else
                                {
-                                       n->second->Handle(parameters,pcnt,user);
-                                       return true;
+                                       return n->second->Handle(parameters,pcnt,user);
                                }
                        }
                }
        }
-       return false;
+       return CMD_INVALID;
 }
 
 void CommandParser::ProcessCommand(userrec *user, std::string &cmd)
 {
        const char *command_p[127];
        int items = 0;
-       std::string para[127];
        irc::tokenstream tokens(cmd);
        std::string command = tokens.GetToken();
 
        while (((para[items] = tokens.GetToken()) != "") && (items < 127))
-               command_p[items] = para[items++].c_str();
+       {
+               command_p[items] = para[items].c_str();
+               items++;
+       }
 
        std::transform(command.begin(), command.end(), command.begin(), ::toupper);
                
        int MOD_RESULT = 0;
-       FOREACH_RESULT(I_OnPreCommand,OnPreCommand(command,command_p,items,user,false));
+       FOREACH_RESULT(I_OnPreCommand,OnPreCommand(command,command_p,items,user,false,cmd));
        if (MOD_RESULT == 1) {
                return;
        }
@@ -205,7 +306,7 @@ void CommandParser::ProcessCommand(userrec *user, std::string &cmd)
                        {
                                if (!user->IsModeSet(cm->second->flags_needed))
                                {
-                                       user->WriteServ("481 %s :Permission Denied- You do not have the required operator privilages",user->nick);
+                                       user->WriteServ("481 %s :Permission Denied- You do not have the required operator privileges",user->nick);
                                        return;
                                }
                                if (!user->HasPermission(command))
@@ -228,14 +329,14 @@ void CommandParser::ProcessCommand(userrec *user, std::string &cmd)
                                        user->WriteServ("304 %s :SYNTAX %s %s", user->nick, cm->second->command.c_str(), cm->second->syntax.c_str());
                                return;
                        }
-                       if ((user->registered == REG_ALL) || (cm->second == command_user) || (cm->second == command_nick) || (cm->second == command_pass))
+                       if ((user->registered == REG_ALL) || (cm->second->WorksBeforeReg()))
                        {
                                /* ikky /stats counters */
                                cm->second->use_count++;
                                cm->second->total_bytes += cmd.length();
 
                                int MOD_RESULT = 0;
-                               FOREACH_RESULT(I_OnPreCommand,OnPreCommand(command,command_p,items,user,true));
+                               FOREACH_RESULT(I_OnPreCommand,OnPreCommand(command,command_p,items,user,true,cmd));
                                if (MOD_RESULT == 1)
                                        return;
 
@@ -244,8 +345,12 @@ void CommandParser::ProcessCommand(userrec *user, std::string &cmd)
                                 * command handler call, as the handler
                                 * may free the user structure!
                                 */
+                               CmdResult result = cm->second->Handle(command_p,items,user);
 
-                               cm->second->Handle(command_p,items,user);
+                               if (result != CMD_USER_DELETED)
+                               {
+                                       FOREACH_MOD(I_OnPostCommand,OnPostCommand(command, command_p, items, user, result,cmd));
+                               }
                                return;
                        }
                        else
@@ -264,28 +369,33 @@ void CommandParser::ProcessCommand(userrec *user, std::string &cmd)
 
 bool CommandParser::RemoveCommands(const char* source)
 {
-       bool go_again = true;
-
-       while (go_again)
+       nspace::hash_map<std::string,command_t*>::iterator i,safei;
+       for (i = cmdlist.begin(); i != cmdlist.end(); i++)
        {
-               go_again = false;
-
-               for (nspace::hash_map<std::string,command_t*>::iterator i = cmdlist.begin(); i != cmdlist.end(); i++)
+               safei = i;
+               safei++;
+               if (safei != cmdlist.end())
                {
-                       command_t* x = i->second;
-                       if (x->source == std::string(source))
-                       {
-                               ServerInstance->Log(DEBUG,"removecommands(%s) Removing dependent command: %s",x->source.c_str(),x->command.c_str());
-                               cmdlist.erase(i);
-                               go_again = true;
-                               break;
-                       }
+                       RemoveCommand(safei, source);
                }
        }
-
+       safei = cmdlist.begin();
+       if (safei != cmdlist.end())
+       {
+               RemoveCommand(safei, source);
+       }
        return true;
 }
 
+void CommandParser::RemoveCommand(nspace::hash_map<std::string,command_t*>::iterator safei, const char* source)
+{
+       command_t* x = safei->second;
+       if (x->source == std::string(source))
+       {
+               cmdlist.erase(safei);
+       }
+}
+
 void CommandParser::ProcessBuffer(std::string &buffer,userrec *user)
 {
        std::string::size_type a;
@@ -293,9 +403,9 @@ void CommandParser::ProcessBuffer(std::string &buffer,userrec *user)
        if (!user)
                return;
 
-       while ((a = buffer.find("\n")) != std::string::npos)
+       while ((a = buffer.rfind("\n")) != std::string::npos)
                buffer.erase(a);
-       while ((a = buffer.find("\r")) != std::string::npos)
+       while ((a = buffer.rfind("\r")) != std::string::npos)
                buffer.erase(a);
 
        if (buffer.length())
@@ -305,8 +415,22 @@ void CommandParser::ProcessBuffer(std::string &buffer,userrec *user)
        }
 }
 
-bool CommandParser::CreateCommand(command_t *f)
+bool CommandParser::CreateCommand(command_t *f, void* so_handle)
 {
+       if (so_handle)
+       {
+               if (RFCCommands.find(f->command) == RFCCommands.end())
+               {
+                       RFCCommands[f->command] = so_handle;
+                       ServerInstance->Log(DEFAULT,"Monitoring RFC-specified reloadable command at %8x",so_handle);
+               }
+               else
+               {
+                       ServerInstance->Log(DEFAULT,"ERK! Somehow, we loaded a cmd_*.so file twice! Only the first instance is being recorded.");
+                       return false;
+               }
+       }
+
        /* create the command and push it onto the table */
        if (cmdlist.find(f->command) == cmdlist.end())
        {
@@ -319,73 +443,115 @@ bool CommandParser::CreateCommand(command_t *f)
 
 CommandParser::CommandParser(InspIRCd* Instance) : ServerInstance(Instance)
 {
+       para.resize(128);
        this->SetupCommandTable();
 }
 
+bool CommandParser::FindSym(void** v, void* h)
+{
+       *v = dlsym(h, "init_command");
+       const char* err = dlerror();
+       if (err)
+       {
+               ServerInstance->Log(SPARSE, "Error loading core command: %s\n", err);
+               return false;
+       }
+       return true;
+}
+
+bool CommandParser::ReloadCommand(const char* cmd)
+{
+       char filename[MAXBUF];
+       char commandname[MAXBUF];
+       int y = 0;
+
+       for (const char* x = cmd; *x; x++, y++)
+               commandname[y] = toupper(*x);
+
+       commandname[y] = 0;
+
+       SharedObjectList::iterator command = RFCCommands.find(commandname);
+
+       if (command != RFCCommands.end())
+       {
+               command_t* cmdptr = cmdlist.find(commandname)->second;
+               cmdlist.erase(cmdlist.find(commandname));
+
+               for (char* x = commandname; *x; x++)
+                       *x = tolower(*x);
+
+
+               delete cmdptr;
+               dlclose(command->second);
+               RFCCommands.erase(command);
+
+               snprintf(filename, MAXBUF, "cmd_%s.so", commandname);
+               this->LoadCommand(filename);
+
+               return true;
+       }
+
+       return false;
+}
+
+CmdResult cmd_reload::Handle(const char** parameters, int pcnt, userrec *user)
+{
+       user->WriteServ("NOTICE %s :*** Reloading command '%s'",user->nick, parameters[0]);
+       if (ServerInstance->Parser->ReloadCommand(parameters[0]))
+       {
+               user->WriteServ("NOTICE %s :*** Successfully reloaded command '%s'", user->nick, parameters[0]);
+               ServerInstance->WriteOpers("*** RELOAD: %s reloaded the '%s' command.", user->nick, parameters[0]);
+               return CMD_SUCCESS;
+       }
+       else
+       {
+               user->WriteServ("NOTICE %s :*** Could not reload command '%s'", user->nick, parameters[0]);
+               return CMD_FAILURE;
+       }
+}
+
+void CommandParser::LoadCommand(const char* name)
+{
+       char filename[MAXBUF];
+       void* h;
+       command_t* (*cmd_factory_func)(InspIRCd*);
+
+       snprintf(filename, MAXBUF, "%s/%s", LIBRARYDIR, name);
+       ServerInstance->Log(DEBUG,"Load command: %s", filename);
+
+       h = dlopen(filename, RTLD_NOW | RTLD_GLOBAL);
+
+       if (!h)
+       {
+               ServerInstance->Log(SPARSE, "Error loading core command: %s", dlerror());
+               return;
+       }
+
+       if (this->FindSym((void **)&cmd_factory_func, h))
+       {
+               command_t* newcommand = cmd_factory_func(ServerInstance);
+               this->CreateCommand(newcommand, h);
+       }
+}
+
 void CommandParser::SetupCommandTable()
 {
-       /* These three are special (can occur without
-        * full user registration) and so are saved
-        * for later use.
-        */
-       command_user = new cmd_user(ServerInstance);
-       command_nick = new cmd_nick(ServerInstance);
-       command_pass = new cmd_pass(ServerInstance);
-       this->CreateCommand(command_user);
-       this->CreateCommand(command_nick);
-       this->CreateCommand(command_pass);
-
-       /* The rest of these arent special. boo hoo.
-        */
-       this->CreateCommand(new cmd_quit(ServerInstance));
-       this->CreateCommand(new cmd_version(ServerInstance));
-       this->CreateCommand(new cmd_ping(ServerInstance));
-       this->CreateCommand(new cmd_pong(ServerInstance));
-       this->CreateCommand(new cmd_admin(ServerInstance));
-       this->CreateCommand(new cmd_privmsg(ServerInstance));
-       this->CreateCommand(new cmd_info(ServerInstance));
-       this->CreateCommand(new cmd_time(ServerInstance));
-       this->CreateCommand(new cmd_whois(ServerInstance));
-       this->CreateCommand(new cmd_wallops(ServerInstance));
-       this->CreateCommand(new cmd_notice(ServerInstance));
-       this->CreateCommand(new cmd_join(ServerInstance));
-       this->CreateCommand(new cmd_names(ServerInstance));
-       this->CreateCommand(new cmd_part(ServerInstance));
-       this->CreateCommand(new cmd_kick(ServerInstance));
-       this->CreateCommand(new cmd_mode(ServerInstance));
-       this->CreateCommand(new cmd_topic(ServerInstance));
-       this->CreateCommand(new cmd_who(ServerInstance));
-       this->CreateCommand(new cmd_motd(ServerInstance));
-       this->CreateCommand(new cmd_rules(ServerInstance));
-       this->CreateCommand(new cmd_oper(ServerInstance));
-       this->CreateCommand(new cmd_list(ServerInstance));
-       this->CreateCommand(new cmd_die(ServerInstance));
-       this->CreateCommand(new cmd_restart(ServerInstance));
-       this->CreateCommand(new cmd_kill(ServerInstance));
-       this->CreateCommand(new cmd_rehash(ServerInstance));
-       this->CreateCommand(new cmd_lusers(ServerInstance));
-       this->CreateCommand(new cmd_stats(ServerInstance));
-       this->CreateCommand(new cmd_userhost(ServerInstance));
-       this->CreateCommand(new cmd_away(ServerInstance));
-       this->CreateCommand(new cmd_ison(ServerInstance));
-       this->CreateCommand(new cmd_summon(ServerInstance));
-       this->CreateCommand(new cmd_users(ServerInstance));
-       this->CreateCommand(new cmd_invite(ServerInstance));
-       this->CreateCommand(new cmd_trace(ServerInstance));
-       this->CreateCommand(new cmd_whowas(ServerInstance));
-       this->CreateCommand(new cmd_connect(ServerInstance));
-       this->CreateCommand(new cmd_squit(ServerInstance));
-       this->CreateCommand(new cmd_modules(ServerInstance));
-       this->CreateCommand(new cmd_links(ServerInstance));
-       this->CreateCommand(new cmd_map(ServerInstance));
-       this->CreateCommand(new cmd_kline(ServerInstance));
-       this->CreateCommand(new cmd_gline(ServerInstance));
-       this->CreateCommand(new cmd_zline(ServerInstance));
-       this->CreateCommand(new cmd_qline(ServerInstance));
-       this->CreateCommand(new cmd_eline(ServerInstance));
-       this->CreateCommand(new cmd_loadmodule(ServerInstance));
-       this->CreateCommand(new cmd_unloadmodule(ServerInstance));
-       this->CreateCommand(new cmd_server(ServerInstance));
-       this->CreateCommand(new cmd_commands(ServerInstance));
+       RFCCommands.clear();
+
+       DIR* library = opendir(LIBRARYDIR);
+       if (library)
+       {
+               dirent* entry = NULL;
+               while ((entry = readdir(library)))
+               {
+                       if (match(entry->d_name, "cmd_*.so"))
+                       {
+                               this->LoadCommand(entry->d_name);
+                       }
+               }
+               closedir(library);
+       }
+
+       this->CreateCommand(new cmd_reload(ServerInstance));
 }