]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/command_parse.cpp
As we have an enum for type, why not ..use it?
[user/henk/code/inspircd.git] / src / command_parse.cpp
index 311def7d2f0451a53f6ea5dbdd8ce3d23930e9a4..0f93e6f53d83e0ad9978d4b215f8f0ff11018a05 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-2008 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.
+ *         the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-using namespace std;
+/* $Core */
 
-#include "inspircd_config.h"
 #include "inspircd.h"
-#include "inspircd_io.h"
-#include <unistd.h>
-#include <fcntl.h>
-#include <sys/errno.h>
-#include <sys/ioctl.h>
-#include <sys/utsname.h>
-#include <time.h>
-#include <string>
-#ifdef GCC3
-#include <ext/hash_map>
-#else
-#include <hash_map>
-#endif
-#include <map>
-#include <sstream>
-#include <vector>
-#include <deque>
-#include <sched.h>
-#ifdef THREADED_DNS
-#include <pthread.h>
-#endif
-#include "users.h"
-#include "globals.h"
-#include "modules.h"
-#include "dynamic.h"
-#include "wildcard.h"
-#include "message.h"
-#include "mode.h"
-#include "commands.h"
 #include "xline.h"
-#include "inspstring.h"
-#include "dnsqueue.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"
+#include "exitcodes.h"
 
-#ifdef GCC3
-#define nspace __gnu_cxx
-#else
-#define nspace std
+/* Directory Searching for Unix-Only */
+#ifndef WIN32
+#include <dirent.h>
+#include <dlfcn.h>
 #endif
 
+int InspIRCd::PassCompare(Extensible* ex, const std::string &data, const std::string &input, const std::string &hashtype)
+{
+       int MOD_RESULT = 0;
+       FOREACH_RESULT_I(this,I_OnPassCompare,OnPassCompare(ex, data, input, hashtype))
+       if (MOD_RESULT == 1)
+               return 0;
+       if (MOD_RESULT == -1)
+               return 1;
+       return data != input; // this seems back to front, but returns 0 if they *match*, 1 else
+}
 
-extern InspIRCd* ServerInstance;
+/* 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.
+ * We need a version which takes two potential lists for JOIN, because a JOIN may contain two lists of items at once,
+ * the channel names and their keys as follows:
+ * JOIN #chan1,#chan2,#chan3 key1,,key3
+ * Therefore, we need to deal with both lists concurrently. The first instance of this method does that by creating
+ * two instances of irc::commasepstream and reading them both together until the first runs out of tokens.
+ * The second version is much simpler and just has the one stream to read, and is used in NAMES, WHOIS, PRIVMSG etc.
+ * Both will only parse until they reach ServerInstance->Config->MaxTargets number of targets, to stop abuse via spam.
+ */
+int CommandParser::LoopCall(User* user, Command* CommandObj, const std::vector<std::string>& parameters, unsigned int splithere, unsigned int extra)
+{
+       if (splithere >= parameters.size())
+               return 0;
+
+       /* First check if we have more than one item in the list, if we don't we return zero here and the handler
+        * which called us just carries on as it was.
+        */
+       if (parameters[splithere].find(',') == std::string::npos)
+               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 extrastuff;
+       std::string item;
+       unsigned int max = 0;
+
+       /* Attempt to iterate these lists and call the command objech
+        * which called us, for every parameter pair until there are
+        * no more left to parse.
+        */
+       while (items1.GetToken(item) && (max++ < ServerInstance->Config->MaxTargets))
+       {
+               if (dupes.find(item.c_str()) == dupes.end())
+               {
+                       std::vector<std::string> new_parameters;
 
-extern std::vector<Module*> modules;
-extern std::vector<ircd_module*> factory;
-extern std::vector<InspSocket*> module_sockets;
-extern std::vector<userrec*> local_users;
+                       for (unsigned int t = 0; (t < parameters.size()) && (t < MAXPARAMETERS); t++)
+                               new_parameters.push_back(parameters[t]);
 
-extern int MODCOUNT;
-extern InspSocket* socket_ref[MAX_DESCRIPTORS];
-extern time_t TIME;
+                       if (!items2.GetToken(extrastuff))
+                               extrastuff = "";
 
-// This table references users by file descriptor.
-// its an array to make it VERY fast, as all lookups are referenced
-// by an integer, meaning there is no need for a scan/search operation.
-extern userrec* fd_ref_table[MAX_DESCRIPTORS];
+                       new_parameters[splithere] = item.c_str();
+                       new_parameters[extra] = extrastuff.c_str();
 
-extern Server* MyServer;
-extern ServerConfig *Config;
+                       CommandObj->Handle(new_parameters, user);
 
-extern user_hash clientlist;
-extern chan_hash chanlist;
+                       dupes[item.c_str()] = true;
+               }
+       }
+       return 1;
+}
 
-/* This function pokes and hacks at a parameter list like the following:
- *
- * PART #winbot,#darkgalaxy :m00!
- *
- * to turn it into a series of individual calls like this:
- *
- * PART #winbot :m00!
- * PART #darkgalaxy :m00!
- *
- * The seperate calls are sent to a callback function provided by the caller
- * (the caller will usually call itself recursively). The callback function
- * must be a command handler. Calling this function on a line with no list causes
- * no action to be taken. You must provide a starting and ending parameter number
- * where the range of the list can be found, useful if you have a terminating
- * parameter as above which is actually not part of the list, or parameters
- * before the actual list as well. This code is used by many functions which
- * can function as "one to list" (see the RFC) */
-
-int CommandParser::LoopCall(command_t* fn, char **parameters, int pcnt, userrec *u, int start, int end, int joins)
+int CommandParser::LoopCall(User* user, Command* CommandObj, const std::vector<std::string>& parameters, unsigned int splithere)
 {
-        char plist[MAXBUF];
-        char *param;
-        char *pars[32];
-        char blog[32][MAXBUF];
-        char blog2[32][MAXBUF];
-        int j = 0, q = 0, total = 0, t = 0, t2 = 0, total2 = 0;
-        char keystr[MAXBUF];
-        char moo[MAXBUF];
-
-        for (int i = 0; i <32; i++)
-                *blog[i] = 0;
-
-        for (int i = 0; i <32; i++)
-                *blog2[i] = 0;
-
-        *moo = 0;
-        for (int i = 0; i <10; i++)
-        {
-                if (!parameters[i])
-                {
-                        parameters[i] = moo;
-                }
-        }
-        if (joins)
-        {
-                if (pcnt > 1) /* we have a key to copy */
-                {
-                        strlcpy(keystr,parameters[1],MAXBUF);
-                }
-        }
-
-        if (!parameters[start])
-        {
-                return 0;
-        }
-        if (!strchr(parameters[start],','))
-        {
-                return 0;
-        }
-        *plist = 0;
-        for (int i = start; i <= end; i++)
-        {
-                if (parameters[i])
-                {
-                        strlcat(plist,parameters[i],MAXBUF);
-                }
-        }
-
-        j = 0;
-        param = plist;
-
-        t = strlen(plist);
-        for (int i = 0; i < t; i++)
-        {
-                if (plist[i] == ',')
-                {
-                        plist[i] = '\0';
-                        strlcpy(blog[j++],param,MAXBUF);
-                        param = plist+i+1;
-                        if ((unsigned int)j > Config->MaxTargets)
-                        {
-                                WriteServ(u->fd,"407 %s %s :Too many targets in list, message not delivered.",u->nick,blog[j-1]);
-                                return 1;
-                        }
-                }
-        }
-        strlcpy(blog[j++],param,MAXBUF);
-        total = j;
-
-        if ((joins) && (keystr) && (total>0)) // more than one channel and is joining
-        {
-                strcat(keystr,",");
-        }
-
-        if ((joins) && (keystr))
-        {
-                if (strchr(keystr,','))
-                {
-                        j = 0;
-                        param = keystr;
-                        t2 = strlen(keystr);
-                        for (int i = 0; i < t2; i++)
-                        {
-                                if (keystr[i] == ',')
-                                {
-                                        keystr[i] = '\0';
-                                        strlcpy(blog2[j++],param,MAXBUF);
-                                        param = keystr+i+1;
-                                }
-                        }
-                        strlcpy(blog2[j++],param,MAXBUF);
-                        total2 = j;
-                }
-        }
-
-        for (j = 0; j < total; j++)
-        {
-                if (blog[j])
-                {
-                        pars[0] = blog[j];
-                }
-                for (q = end; q < pcnt-1; q++)
-                {
-                        if (parameters[q+1])
-                        {
-                                pars[q-end+1] = parameters[q+1];
-                        }
-                }
-                if ((joins) && (parameters[1]))
-                {
-                        if (pcnt > 1)
-                        {
-                                pars[1] = blog2[j];
-                        }
-                        else
-                        {
-                                pars[1] = NULL;
-                        }
-                }
-                /* repeatedly call the function with the hacked parameter list */
-                if ((joins) && (pcnt > 1))
-                {
-                        if (pars[1])
-                        {
-                                // pars[1] already set up and containing key from blog2[j]
-                                fn->Handle(pars,2,u);
-                        }
-                        else
-                        {
-                                pars[1] = parameters[1];
-                                fn->Handle(pars,2,u);
-                        }
-                }
-                else
-                {
-                        fn->Handle(pars,pcnt-(end-start),u);
-                }
-        }
-
-        return 1;
+       if (splithere >= parameters.size())
+               return 0;
+
+       /* First check if we have more than one item in the list, if we don't we return zero here and the handler
+        * which called us just carries on as it was.
+        */
+       if (parameters[splithere].find(',') == std::string::npos)
+               return 0;
+
+       std::map<irc::string, bool> dupes;
+
+       /* Only one commasepstream here */
+       irc::commasepstream items1(parameters[splithere]);
+       std::string item;
+       unsigned int max = 0;
+
+       /* Parse the commasepstream until there are no tokens remaining.
+        * Each token we parse out, call the command handler that called us
+        * with it
+        */
+       while (items1.GetToken(item) && (max++ < ServerInstance->Config->MaxTargets))
+       {
+               if (dupes.find(item.c_str()) == dupes.end())
+               {
+                       std::vector<std::string> new_parameters;
+
+                       for (unsigned int t = 0; (t < parameters.size()) && (t < MAXPARAMETERS); t++)
+                               new_parameters.push_back(parameters[t]);
+
+                       new_parameters[splithere] = item.c_str();
+
+                       /* Execute the command handler. */
+                       CommandObj->Handle(new_parameters, user);
+
+                       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
+        * return without doing any processing.
+        */
+       return 1;
 }
 
-bool CommandParser::IsValidCommand(std::string &commandname, int pcnt, userrec * user)
+bool CommandParser::IsValidCommand(const std::string &commandname, unsigned int pcnt, User * user)
 {
-       nspace::hash_map<std::string,command_t*>::iterator n = cmdlist.find(commandname);
+       Commandtable::iterator n = cmdlist.find(commandname);
+
        if (n != cmdlist.end())
        {
-                        if ((pcnt>=n->second->min_params) && (n->second->source != "<core>"))
-                        {
-                                if ((strchr(user->modes,n->second->flags_needed)) || (!n->second->flags_needed))
-                                {
-                                        if (n->second->flags_needed)
-                                        {
-                                                if ((user->HasPermission(commandname)) || (is_uline(user->server)))
-                                                {
-                                                        return true;
-                                                }
-                                                else
-                                                {
-                                                        return false;
-                                                }
-                                        }
-                                        return true;
-                                }
-                        }
-        }
-        return false;
+               if ((pcnt >= n->second->min_params) && (n->second->source != "<core>"))
+               {
+                       if (IS_LOCAL(user) && n->second->flags_needed)
+                       {
+                               if (user->IsModeSet(n->second->flags_needed))
+                               {
+                                       return (user->HasPermission(commandname));
+                               }
+                       }
+                       else
+                       {
+                               return true;
+                       }
+               }
+       }
+       return false;
+}
+
+Command* CommandParser::GetHandler(const std::string &commandname)
+{
+       Commandtable::iterator n = cmdlist.find(commandname);
+       if (n != cmdlist.end())
+               return n->second;
+
+       return NULL;
 }
 
 // calls a handler function for a command
 
-void CommandParser::CallHandler(std::string &commandname,char **parameters, int pcnt, userrec *user)
+CmdResult CommandParser::CallHandler(const std::string &commandname, const std::vector<std::string>& parameters, User *user)
 {
-       nspace::hash_map<std::string,command_t*>::iterator n = cmdlist.find(commandname);
-        if (n != cmdlist.end())
-        {
-                        if (pcnt >= n->second->min_params)
-                        {
-                                if ((strchr(user->modes,n->second->flags_needed)) || (!n->second->flags_needed))
-                                {
-                                        if (n->second->flags_needed)
-                                        {
-                                                if ((user->HasPermission(commandname)) || (is_uline(user->server)))
-                                                {
-                                                        n->second->Handle(parameters,pcnt,user);
-                                                }
-                                        }
-                                        else
-                                        {
-                                                n->second->Handle(parameters,pcnt,user);
-                                        }
-                                }
-                        }
-        }
+       Commandtable::iterator n = cmdlist.find(commandname);
+
+       if (n != cmdlist.end())
+       {
+               if (parameters.size() >= n->second->min_params)
+               {
+                       bool bOkay = false;
+
+                       if (IS_LOCAL(user) && n->second->flags_needed)
+                       {
+                               /* if user is local, and flags are needed .. */
+
+                               if (user->IsModeSet(n->second->flags_needed))
+                               {
+                                       /* if user has the flags, and now has the permissions, go ahead */
+                                       if (user->HasPermission(commandname))
+                                               bOkay = true;
+                               }
+                       }
+                       else
+                       {
+                               /* remote or no flags required anyway */
+                               bOkay = true;
+                       }
+
+                       if (bOkay)
+                       {
+                               return n->second->Handle(parameters,user);
+                       }
+               }
+       }
+       return CMD_INVALID;
 }
 
-int CommandParser::ProcessParameters(char **command_p,char *parameters)
+void CommandParser::DoLines(User* current, bool one_only)
 {
-        int j = 0;
-        int q = strlen(parameters);
-        if (!q)
-        {
-                /* no parameters, command_p invalid! */
-                return 0;
-        }
-        if (parameters[0] == ':')
-        {
-                command_p[0] = parameters+1;
-                return 1;
-        }
-        if (q)
-        {
-                if ((strchr(parameters,' ')==NULL) || (parameters[0] == ':'))
-                {
-                        /* only one parameter */
-                        command_p[0] = parameters;
-                        if (parameters[0] == ':')
-                        {
-                                if (strchr(parameters,' ') != NULL)
-                                {
-                                        command_p[0]++;
-                                }
-                        }
-                        return 1;
-                }
-        }
-        command_p[j++] = parameters;
-        for (int i = 0; i <= q; i++)
-        {
-                if (parameters[i] == ' ')
-                {
-                        command_p[j++] = parameters+i+1;
-                        parameters[i] = '\0';
-                        if (command_p[j-1][0] == ':')
-                        {
-                                *command_p[j-1]++; /* remove dodgy ":" */
-                                break;
-                                /* parameter like this marks end of the sequence */
-                        }
-                }
-        }
-        return j; /* returns total number of items in the list */
+       // while there are complete lines to process...
+       unsigned int floodlines = 0;
+
+       while (current->BufferIsReady())
+       {
+               if (current->MyClass)
+               {
+                       if (ServerInstance->Time() > current->reset_due)
+                       {
+                               current->reset_due = ServerInstance->Time() + current->MyClass->GetThreshold();
+                               current->lines_in = 0;
+                       }
+
+                       if (++current->lines_in > current->MyClass->GetFlood() && current->MyClass->GetFlood())
+                       {
+                               ServerInstance->FloodQuitUser(current);
+                               return;
+                       }
+
+                       if ((++floodlines > current->MyClass->GetFlood()) && (current->MyClass->GetFlood() != 0))
+                       {
+                               ServerInstance->FloodQuitUser(current);
+                               return;
+                       }
+               }
+
+               // use GetBuffer to copy single lines into the sanitized string
+               std::string single_line = current->GetBuffer();
+               current->bytes_in += single_line.length();
+               current->cmds_in++;
+               if (single_line.length() > MAXBUF - 2)  // MAXBUF is 514 to allow for neccessary line terminators
+                       single_line.resize(MAXBUF - 2); // So to trim to 512 here, we use MAXBUF - 2
+
+               // ProcessBuffer returns false if the user has gone over penalty
+               if (!ServerInstance->Parser->ProcessBuffer(single_line, current) || one_only)
+                       break;
+       }
 }
 
-void CommandParser::ProcessCommand(userrec *user, char* cmd)
+bool CommandParser::ProcessCommand(User *user, std::string &cmd)
 {
-        char *parameters;
-        char *command;
-        char *command_p[127];
-        char p[MAXBUF], temp[MAXBUF];
-        int j, items, cmd_found;
-
-        for (int i = 0; i < 127; i++)
-                command_p[i] = NULL;
-
-        if (!user)
-        {
-                return;
-        }
-        if (!cmd)
-        {
-                return;
-        }
-        if (!cmd[0])
-        {
-                return;
-        }
-
-        int total_params = 0;
-       unsigned int xl = strlen(cmd);
-        if (xl > 2)
-        {
-                for (unsigned int q = 0; q < xl - 1; q++)
-                {
-                        if ((cmd[q] == ' ') && (cmd[q+1] == ':'))
-                        {
-                                total_params++;
-                                // found a 'trailing', we dont count them after this.
-                                break;
-                        }
-                        if (cmd[q] == ' ')
-                                total_params++;
-                }
-        }
-
-        // another phidjit bug...
-        if (total_params > 126)
-        {
-                *(strchr(cmd,' ')) = '\0';
-                WriteServ(user->fd,"421 %s %s :Too many parameters given",user->nick,cmd);
-                return;
-        }
-
-        strlcpy(temp,cmd,MAXBUF);
-
-        std::string tmp = cmd;
-        for (int i = 0; i <= MODCOUNT; i++)
-        {
-                std::string oldtmp = tmp;
-                modules[i]->OnServerRaw(tmp,true,user);
-                if (oldtmp != tmp)
-                {
-                        log(DEBUG,"A Module changed the input string!");
-                        log(DEBUG,"New string: %s",tmp.c_str());
-                        log(DEBUG,"Old string: %s",oldtmp.c_str());
-                        break;
-                }
-        }
-        strlcpy(cmd,tmp.c_str(),MAXBUF);
-        strlcpy(temp,cmd,MAXBUF);
-
-        if (!strchr(cmd,' '))
-        {
-                /* no parameters, lets skip the formalities and not chop up
-                 * the string */
-                log(DEBUG,"About to preprocess command with no params");
-                items = 0;
-                command_p[0] = NULL;
-                parameters = NULL;
-               unsigned int tl = strlen(cmd);
-                for (unsigned int i = 0; i <= tl; i++)
-                {
-                        cmd[i] = toupper(cmd[i]);
-                }
-                command = cmd;
-        }
-        else
-        {
-                *cmd = 0;
-                j = 0;
-
-               unsigned int vl = strlen(temp);
-                /* strip out extraneous linefeeds through mirc's crappy pasting (thanks Craig) */
-                for (unsigned int i = 0; i < vl; i++)
-                {
-                        if ((temp[i] != 10) && (temp[i] != 13) && (temp[i] != 0) && (temp[i] != 7))
-                        {
-                                cmd[j++] = temp[i];
-                                cmd[j] = 0;
-                        }
-                }
-                /* split the full string into a command plus parameters */
-                parameters = p;
-                p[0] = ' ';
-               p[1] = 0;
+       std::vector<std::string> command_p;
+       irc::tokenstream tokens(cmd);
+       std::string command, token;
+       tokens.GetToken(command);
+
+       /* A client sent a nick prefix on their command (ick)
+        * rhapsody and some braindead bouncers do this --
+        * the rfc says they shouldnt but also says the ircd should
+        * discard it if they do.
+        */
+       if (command[0] == ':')
+               tokens.GetToken(command);
+
+       while (tokens.GetToken(token) && (command_p.size() <= MAXPARAMETERS))
+               command_p.push_back(token);
+
+       std::transform(command.begin(), command.end(), command.begin(), ::toupper);
                
-                command = cmd;
-                if (strchr(cmd,' '))
-                {
-                       unsigned int cl = strlen(cmd);
-                        for (unsigned int i = 0; i <= cl; i++)
-                        {
-                                /* capitalise the command ONLY, leave params intact */
-                                cmd[i] = toupper(cmd[i]);
-                                /* are we nearly there yet?! :P */
-                                if (cmd[i] == ' ')
-                                {
-                                        command = cmd;
-                                        parameters = cmd+i+1;
-                                        cmd[i] = '\0';
-                                        break;
-                                }
-                        }
-                }
-                else
-                {
-                        for (char* i = cmd; *i; i++)
-                        {
-                                *i = toupper(*i);
-                        }
-                }
-
-        }
-
-        if (strlen(command)>MAXCOMMAND)
-        {
-                WriteServ(user->fd,"421 %s %s :Command too long",user->nick,command);
-                return;
-        }
-
-        for (char* x = command; *x; x++)
-        {
-                if (((*x < 'A') || (*x > 'Z')) && (*x != '.'))
-                {
-                        if (((*x < '0') || (*x> '9')) && (*x != '-'))
-                        {
-                                if (strchr("@!\"$%^&*(){}[]_=+;:'#~,<>/?\\|`",*x))
-                                {
-                                        ServerInstance->stats->statsUnknown++;
-                                        WriteServ(user->fd,"421 %s %s :Unknown command",user->nick,command);
-                                        return;
-                                }
-                        }
-                }
-        }
-
-        std::string xcommand = command;
-       if ((user->registered != 7) && (xcommand == "SERVER"))
-       {
-               kill_link(user,"Server connection to non-server port");
-               return;
+       int MOD_RESULT = 0;
+       FOREACH_RESULT(I_OnPreCommand,OnPreCommand(command, command_p, user, false, cmd));
+       if (MOD_RESULT == 1) {
+               return true;
        }
+
+       /* find the command, check it exists */
+       Commandtable::iterator cm = cmdlist.find(command);
        
-       /* Tweak by brain - why was this INSIDE the mainloop? */
-       if (parameters)
+       if (cm == cmdlist.end())
+       {
+               if (user->registered == REG_ALL)
+               {
+                       user->WriteNumeric(ERR_UNKNOWNCOMMAND, "%s %s :Unknown command",user->nick.c_str(),command.c_str());
+               }
+               ServerInstance->stats->statsUnknown++;
+               return true;
+       }
+
+       /* Modify the user's penalty */
+       bool do_more = true;
+       if (!user->ExemptFromPenalty)
+       {
+               user->IncreasePenalty(cm->second->Penalty);
+               do_more = (user->Penalty < 10);
+               if (!do_more)
+                       user->OverPenalty = true;
+       }
+
+       /* activity resets the ping pending timer */
+       if (user->MyClass)
+               user->nping = ServerInstance->Time() + user->MyClass->GetPingTime();
+
+       if (cm->second->flags_needed)
+       {
+               if (!user->IsModeSet(cm->second->flags_needed))
+               {
+                       user->WriteNumeric(ERR_NOPRIVILEGES, "%s :Permission Denied - You do not have the required operator privileges",user->nick.c_str());
+                       return do_more;
+               }
+               if (!user->HasPermission(command))
+               {
+                       user->WriteNumeric(ERR_NOPRIVILEGES, "%s :Permission Denied - Oper type %s does not have access to command %s",user->nick.c_str(),user->oper.c_str(),command.c_str());
+                       return do_more;
+               }
+       }
+       if ((user->registered == REG_ALL) && (!IS_OPER(user)) && (cm->second->IsDisabled()))
+       {
+               /* command is disabled! */
+               if (ServerInstance->Config->DisabledDontExist)
+               {
+                       user->WriteNumeric(ERR_UNKNOWNCOMMAND, "%s %s :Unknown command",user->nick.c_str(),command.c_str());
+               }
+               else
+               {
+                       user->WriteNumeric(ERR_UNKNOWNCOMMAND, "%s %s :This command has been disabled.",
+                                                                               user->nick.c_str(), command.c_str());
+               }
+
+               ServerInstance->SNO->WriteToSnoMask('d', "%s denied for %s (%s@%s)",
+                               command.c_str(), user->nick.c_str(), user->ident.c_str(), user->host.c_str());
+               return do_more;
+       }
+       if (command_p.size() < cm->second->min_params)
+       {
+               user->WriteNumeric(ERR_NEEDMOREPARAMS, "%s %s :Not enough parameters.", user->nick.c_str(), command.c_str());
+               if ((ServerInstance->Config->SyntaxHints) && (user->registered == REG_ALL) && (cm->second->syntax.length()))
+                       user->WriteNumeric(RPL_SYNTAX, "%s :SYNTAX %s %s", user->nick.c_str(), cm->second->command.c_str(), cm->second->syntax.c_str());
+               return do_more;
+       }
+       if ((user->registered != REG_ALL) && (!cm->second->WorksBeforeReg()))
        {
-                if (parameters[0])
-                {
-                        items = this->ProcessParameters(command_p,parameters);
-                }
-                else
-                {
-                        items = 0;
-                        command_p[0] = NULL;
-                }
+               user->WriteNumeric(ERR_NOTREGISTERED, "%s :You have not registered",command.c_str());
+               return do_more;
        }
        else
        {
-               items = 0;
-               command_p[0] = NULL;
+               /* passed all checks.. first, do the (ugly) stats counters. */
+               cm->second->use_count++;
+               cm->second->total_bytes += cmd.length();
+
+               /* module calls too */
+               MOD_RESULT = 0;
+               FOREACH_RESULT(I_OnPreCommand,OnPreCommand(command, command_p, user, true, cmd));
+               if (MOD_RESULT == 1)
+                       return do_more;
+
+               /*
+                * WARNING: be careful, the user may be deleted soon
+                */
+               CmdResult result = cm->second->Handle(command_p, user);
+
+               FOREACH_MOD(I_OnPostCommand,OnPostCommand(command, command_p, user, result,cmd));
+               return do_more;
        }
+}
 
-       int MOD_RESULT = 0;
-       FOREACH_RESULT(I_OnPreCommand,OnPreCommand(command,command_p,items,user,false));
-       if (MOD_RESULT == 1) {
-               return;
+void CommandParser::RemoveCommands(const char* source)
+{
+       Commandtable::iterator i,safei;
+       for (i = cmdlist.begin(); i != cmdlist.end();)
+       {
+               safei = i;
+               i++;
+               RemoveCommand(safei, source);
+       }
+}
+
+void CommandParser::RemoveCommand(Commandtable::iterator safei, const char* source)
+{
+       Command* x = safei->second;
+       if (x->source == std::string(source))
+       {
+               cmdlist.erase(safei);
+               delete x;
        }
-       
-       nspace::hash_map<std::string,command_t*>::iterator cm = cmdlist.find(xcommand);
-       
-        if (cm != cmdlist.end())
-        {
-                        if (user)
-                        {
-                                /* activity resets the ping pending timer */
-                                user->nping = TIME + user->pingmax;
-                                if ((items) < cm->second->min_params)
-                                {
-                                        log(DEBUG,"not enough parameters: %s %s",user->nick,command);
-                                        WriteServ(user->fd,"461 %s %s :Not enough parameters",user->nick,command);
-                                        return;
-                                }
-                                        if ((!strchr(user->modes,cm->second->flags_needed)) && (cm->second->flags_needed))
-                                        {
-                                                log(DEBUG,"permission denied: %s %s",user->nick,command);
-                                                WriteServ(user->fd,"481 %s :Permission Denied- You do not have the required operator privilages",user->nick);
-                                                cmd_found = 1;
-                                                return;
-                                        }
-                                        if ((cm->second->flags_needed) && (!user->HasPermission(xcommand)))
-                                        {
-                                                log(DEBUG,"permission denied: %s %s",user->nick,command);
-                                                WriteServ(user->fd,"481 %s :Permission Denied- Oper type %s does not have access to command %s",user->nick,user->oper,command);
-                                                cmd_found = 1;
-                                                return;
-                                        }
-                                        /* if the command isnt USER, PASS, or NICK, and nick is empty,
-                                         * deny command! */
-                                        if ((strncmp(command,"USER",4)) && (strncmp(command,"NICK",4)) && (strncmp(command,"PASS",4)))
-                                        {
-                                                if ((!isnick(user->nick)) || (user->registered != 7))
-                                                {
-                                                        log(DEBUG,"not registered: %s %s",user->nick,command);
-                                                        WriteServ(user->fd,"451 %s :You have not registered",command);
-                                                        return;
-                                                }
-                                        }
-                                        if ((user->registered == 7) && (!strchr(user->modes,'o')))
-                                        {
-                                                std::stringstream dcmds(Config->DisabledCommands);
-                                                while (!dcmds.eof())
-                                                {
-                                                        std::string thiscmd;
-                                                        dcmds >> thiscmd;
-                                                        if (!strcasecmp(thiscmd.c_str(),command))
-                                                        {
-                                                                // command is disabled!
-                                                                WriteServ(user->fd,"421 %s %s :This command has been disabled.",user->nick,command);
-                                                                return;
-                                                        }
-                                                }
-                                        }
-                                        if ((user->registered == 7) || (!strncmp(command,"USER",4)) || (!strncmp(command,"NICK",4)) || (!strncmp(command,"PASS",4)))
-                                        {
-                                                        /* ikky /stats counters */
-                                                        if (temp)
-                                                        {
-                                                                cm->second->use_count++;
-                                                                cm->second->total_bytes+=strlen(temp);
-                                                        }
-
-                                                        int MOD_RESULT = 0;
-                                                        FOREACH_RESULT(I_OnPreCommand,OnPreCommand(command,command_p,items,user,true));
-                                                        if (MOD_RESULT == 1) {
-                                                                return;
-                                                        }
-
-                                                        /* WARNING: nothing may come after the
-                                                         * command handler call, as the handler
-                                                         * may free the user structure! */
-
-                                                        cm->second->Handle(command_p,items,user);
-                                                return;
-                                        }
-                                        else
-                                        {
-                                                WriteServ(user->fd,"451 %s :You have not registered",command);
-                                                return;
-                                        }
-                                }
-        }
-       else if (user)
-        {
-                ServerInstance->stats->statsUnknown++;
-                WriteServ(user->fd,"421 %s %s :Unknown command",user->nick,command);
-        }
 }
 
-bool CommandParser::RemoveCommands(const char* source)
+bool CommandParser::ProcessBuffer(std::string &buffer,User *user)
 {
-        bool go_again = true;
-        while (go_again)
-        {
-                go_again = false;
-                for (nspace::hash_map<std::string,command_t*>::iterator i = cmdlist.begin(); i != cmdlist.end(); i++)
-                {
-                       command_t* x = i->second;
-                        if (x->source == std::string(source))
-                        {
-                                log(DEBUG,"removecommands(%s) Removing dependent command: %s",x->source.c_str(),x->command.c_str());
-                                cmdlist.erase(i);
-                                go_again = true;
-                                break;
-                        }
-                }
-        }
-        return true;
+       std::string::size_type a;
+
+       if (!user)
+               return true;
+
+       while ((a = buffer.rfind("\n")) != std::string::npos)
+               buffer.erase(a);
+       while ((a = buffer.rfind("\r")) != std::string::npos)
+               buffer.erase(a);
+
+       if (buffer.length())
+       {
+               ServerInstance->Logs->Log("USERINPUT", DEBUG,"C[%d] I :%s %s",user->GetFd(), user->nick.c_str(), buffer.c_str());
+               return this->ProcessCommand(user,buffer);
+       }
+
+       return true;
 }
 
-void CommandParser::ProcessBuffer(const char* cmdbuf,userrec *user)
+bool CommandParser::CreateCommand(Command *f, void* so_handle)
 {
-        if (!user)
-        {
-                log(DEFAULT,"*** BUG *** process_buffer was given an invalid parameter");
-                return;
-        }
-        char cmd[MAXBUF];
-        if (!cmdbuf)
-        {
-                log(DEFAULT,"*** BUG *** process_buffer was given an invalid parameter");
-                return;
-        }
-        if (!cmdbuf[0])
-        {
-                return;
-        }
-        while (*cmdbuf == ' ') cmdbuf++; // strip leading spaces
-
-        strlcpy(cmd,cmdbuf,MAXBUF);
-        if (!cmd[0])
-        {
-                return;
-        }
-        int sl = strlen(cmd)-1;
-        if ((cmd[sl] == 13) || (cmd[sl] == 10))
-        {
-                cmd[sl] = '\0';
-        }
-        sl = strlen(cmd)-1;
-        if ((cmd[sl] == 13) || (cmd[sl] == 10))
-        {
-                cmd[sl] = '\0';
-        }
-        sl = strlen(cmd)-1;
-        while (cmd[sl] == ' ') // strip trailing spaces
-        {
-                cmd[sl] = '\0';
-                sl = strlen(cmd)-1;
-        }
-
-        if (!cmd[0])
-        {
-                return;
-        }
-        log(DEBUG,"CMDIN: %s %s",user->nick,cmd);
-        tidystring(cmd);
-        if ((user) && (cmd))
-        {
-                this->ProcessCommand(user,cmd);
-        }
+       if (so_handle)
+       {
+               if (RFCCommands.find(f->command) == RFCCommands.end())
+                       RFCCommands[f->command] = so_handle;
+               else
+               {
+                       ServerInstance->Logs->Log("COMMAND",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())
+       {
+               cmdlist[f->command] = f;
+               return true;
+       }
+       else return false;
 }
 
-bool CommandParser::CreateCommand(command_t *f)
+CommandParser::CommandParser(InspIRCd* Instance) : ServerInstance(Instance)
 {
-        /* create the command and push it onto the table */
-        cmdlist[f->command] = f;
-        log(DEBUG,"Added command %s (%lu parameters)",f->command.c_str(),(unsigned long)f->min_params);
+       para.resize(128);
+}
+
+bool CommandParser::FindSym(void** v, void* h, const std::string &name)
+{
+       *v = dlsym(h, "init_command");
+       const char* err = dlerror();
+       if (err && !(*v))
+       {
+               ServerInstance->Logs->Log("COMMAND",SPARSE, "Error loading core command %s: %s\n", name.c_str(), err);
+               return false;
+       }
        return true;
 }
 
-CommandParser::CommandParser()
+bool CommandParser::ReloadCommand(std::string cmd, User* user)
 {
-       this->SetupCommandTable();
+       char filename[MAXBUF];
+       std::transform(cmd.begin(), cmd.end(), cmd.begin(), ::toupper);
+
+       SharedObjectList::iterator command = RFCCommands.find(cmd);
+
+       if (command != RFCCommands.end())
+       {
+               Command* cmdptr = cmdlist.find(cmd)->second;
+               cmdlist.erase(cmdlist.find(cmd));
+
+               RFCCommands.erase(cmd);
+               std::transform(cmd.begin(), cmd.end(), cmd.begin(), ::tolower);
+               delete cmdptr;
+               dlclose(command->second);
+
+               snprintf(filename, MAXBUF, "cmd_%s.so", cmd.c_str());
+               const char* err = this->LoadCommand(filename);
+               if (err)
+               {
+                       if (user)
+                               user->WriteServ("NOTICE %s :*** Error loading 'cmd_%s.so': %s", user->nick.c_str(), cmd.c_str(), err);
+                       return false;
+               }
+
+               return true;
+       }
+
+       return false;
 }
 
-void CommandParser::SetupCommandTable()
+CmdResult cmd_reload::Handle(const std::vector<std::string>& parameters, User *user)
 {
-       this->CreateCommand(new cmd_user);
-        this->CreateCommand(new cmd_nick);
-        this->CreateCommand(new cmd_quit);
-        this->CreateCommand(new cmd_version);
-        this->CreateCommand(new cmd_ping);
-        this->CreateCommand(new cmd_pong);
-        this->CreateCommand(new cmd_admin);
-        this->CreateCommand(new cmd_privmsg);
-        this->CreateCommand(new cmd_info);
-        this->CreateCommand(new cmd_time);
-        this->CreateCommand(new cmd_whois);
-        this->CreateCommand(new cmd_wallops);
-        this->CreateCommand(new cmd_notice);
-        this->CreateCommand(new cmd_join);
-        this->CreateCommand(new cmd_names);
-        this->CreateCommand(new cmd_part);
-        this->CreateCommand(new cmd_kick);
-        this->CreateCommand(new cmd_mode);
-        this->CreateCommand(new cmd_topic);
-        this->CreateCommand(new cmd_who);
-        this->CreateCommand(new cmd_motd);
-        this->CreateCommand(new cmd_rules);
-        this->CreateCommand(new cmd_oper);
-        this->CreateCommand(new cmd_list);
-        this->CreateCommand(new cmd_die);
-        this->CreateCommand(new cmd_restart);
-        this->CreateCommand(new cmd_kill);
-        this->CreateCommand(new cmd_rehash);
-        this->CreateCommand(new cmd_lusers);
-        this->CreateCommand(new cmd_stats);
-        this->CreateCommand(new cmd_userhost);
-        this->CreateCommand(new cmd_away);
-        this->CreateCommand(new cmd_ison);
-        this->CreateCommand(new cmd_summon);
-        this->CreateCommand(new cmd_users);
-        this->CreateCommand(new cmd_invite);
-        this->CreateCommand(new cmd_pass);
-        this->CreateCommand(new cmd_trace);
-        this->CreateCommand(new cmd_whowas);
-        this->CreateCommand(new cmd_connect);
-        this->CreateCommand(new cmd_squit);
-        this->CreateCommand(new cmd_modules);
-        this->CreateCommand(new cmd_links);
-        this->CreateCommand(new cmd_map);
-        this->CreateCommand(new cmd_kline);
-        this->CreateCommand(new cmd_gline);
-        this->CreateCommand(new cmd_zline);
-        this->CreateCommand(new cmd_qline);
-        this->CreateCommand(new cmd_eline);
-        this->CreateCommand(new cmd_loadmodule);
-        this->CreateCommand(new cmd_unloadmodule);
-        this->CreateCommand(new cmd_server);
-        this->CreateCommand(new cmd_commands);
+       if (parameters.size() < 1)
+               return CMD_FAILURE;
+
+       user->WriteServ("NOTICE %s :*** Reloading command '%s'",user->nick.c_str(), parameters[0].c_str());
+       if (ServerInstance->Parser->ReloadCommand(parameters[0], user))
+       {
+               user->WriteServ("NOTICE %s :*** Successfully reloaded command '%s'", user->nick.c_str(), parameters[0].c_str());
+               ServerInstance->SNO->WriteToSnoMask('A', "RELOAD: %s reloaded the '%s' command.", user->nick.c_str(), parameters[0].c_str());
+               return CMD_SUCCESS;
+       }
+       else
+       {
+               user->WriteServ("NOTICE %s :*** Could not reload command '%s' -- fix this problem, then /REHASH as soon as possible!", user->nick.c_str(), parameters[0].c_str());
+               return CMD_FAILURE;
+       }
 }
 
+const char* CommandParser::LoadCommand(const char* name)
+{
+       char filename[MAXBUF];
+       void* h;
+       Command* (*cmd_factory_func)(InspIRCd*);
+
+       /* Command already exists? Succeed silently - this is needed for REHASH */
+       if (RFCCommands.find(name) != RFCCommands.end())
+       {
+               ServerInstance->Logs->Log("COMMAND",DEBUG,"Not reloading command %s/%s, it already exists", LIBRARYDIR, name);
+               return NULL;
+       }
+
+       snprintf(filename, MAXBUF, "%s/%s", LIBRARYDIR, name);
+       h = dlopen(filename, RTLD_NOW | RTLD_GLOBAL);
+
+       if (!h)
+       {
+               const char* n = dlerror();
+               ServerInstance->Logs->Log("COMMAND",SPARSE, "Error loading core command %s: %s", name, n);
+               return n;
+       }
+
+       if (this->FindSym((void **)&cmd_factory_func, h, name))
+       {
+               Command* newcommand = cmd_factory_func(ServerInstance);
+               this->CreateCommand(newcommand, h);
+       }
+       return NULL;
+}
+
+void CommandParser::SetupCommandTable(User* user)
+{
+       RFCCommands.clear();
+
+       if (!user)
+       {
+               printf("\nLoading core commands");
+               fflush(stdout);
+       }
+
+       DIR* library = opendir(LIBRARYDIR);
+       if (library)
+       {
+               dirent* entry = NULL;
+               while (0 != (entry = readdir(library)))
+               {
+                       if (InspIRCd::Match(entry->d_name, "cmd_*.so"))
+                       {
+                               if (!user)
+                               {
+                                       printf(".");
+                                       fflush(stdout);
+                               }
+                               const char* err = this->LoadCommand(entry->d_name);
+                               if (err)
+                               {
+                                       if (user)
+                                       {
+                                               user->WriteServ("NOTICE %s :*** Failed to load core command %s: %s", user->nick.c_str(), entry->d_name, err);
+                                       }
+                                       else
+                                       {
+                                               printf("Error loading %s: %s", entry->d_name, err);
+                                               exit(EXIT_STATUS_BADHANDLER);
+                                       }
+                               }
+                       }
+               }
+               closedir(library);
+               if (!user)
+                       printf("\n");
+       }
+
+       if (cmdlist.find("RELOAD") == cmdlist.end())
+               this->CreateCommand(new cmd_reload(ServerInstance));
+}
+
+int CommandParser::TranslateUIDs(TranslateType to, const std::string &source, std::string &dest)
+{
+       User* user = NULL;
+       std::string item;
+       int translations = 0;
+       dest.clear();
+
+       switch (to)
+       {
+               case TR_NICK:
+                       /* Translate single nickname */
+                       user = ServerInstance->FindNick(source);
+                       if (user)
+                       {
+                               dest = user->uuid;
+                               translations++;
+                       }
+                       else
+                               dest = source;
+               break;
+               case TR_NICKLIST:
+               {
+                       /* Translate comma seperated list of nicknames */
+                       irc::commasepstream items(source);
+                       while (items.GetToken(item))
+                       {
+                               user = ServerInstance->FindNick(item);
+                               if (user)
+                               {
+                                       dest.append(user->uuid);
+                                       translations++;
+                               }
+                               else
+                                       dest.append(item);
+                               dest.append(",");
+                       }
+                       if (!dest.empty())
+                               dest.erase(dest.end() - 1);
+               }
+               break;
+               case TR_SPACENICKLIST:
+               {
+                       /* Translate space seperated list of nicknames */
+                       irc::spacesepstream items(source);
+                       while (items.GetToken(item))
+                       {
+                               user = ServerInstance->FindNick(item);
+                               if (user)
+                               {
+                                       dest.append(user->uuid);
+                                       translations++;
+                               }
+                               else
+                                       dest.append(item);
+                               dest.append(" ");
+                       }
+                       if (!dest.empty())
+                               dest.erase(dest.end() - 1);
+               }
+               break;
+               case TR_END:
+               case TR_TEXT:
+               default:
+                       /* Do nothing */
+                       dest = source;
+               break;
+       }
+
+       return translations;
+}
+
+