]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/command_parse.cpp
Fix mistakenly using Clang instead of GCC on older FreeBSD versions.
[user/henk/code/inspircd.git] / src / command_parse.cpp
index 9835c696141f5df049611ac07201ab8fa3fcadcd..76dfc06ce05eabf887794b76981ef8410c36f992 100644 (file)
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *                <Craig@chatspike.net>
+ *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2006-2008 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2008 Thomas Stagner <aquanight@inspircd.org>
+ *   Copyright (C) 2005-2008 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2006-2007 Dennis Friis <peavey@inspircd.org>
  *
- * Written by Craig Edwards, Craig McLure, and others.
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-using namespace std;
 
-#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"
-
-#ifdef GCC3
-#define nspace __gnu_cxx
-#else
-#define nspace std
-#endif
-
-
-extern InspIRCd* ServerInstance;
-
-extern std::vector<Module*> modules;
-extern std::vector<ircd_module*> factory;
-extern std::vector<InspSocket*> module_sockets;
-extern std::vector<userrec*> local_users;
-
-extern int MODCOUNT;
-extern InspSocket* socket_ref[MAX_DESCRIPTORS];
-extern time_t TIME;
-
-// 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];
-
-extern Server* MyServer;
-extern ServerConfig *Config;
-
-extern user_hash clientlist;
-extern chan_hash chanlist;
-
-/* 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 InspIRCd::PassCompare(Extensible* ex, const std::string &data, const std::string &input, const std::string &hashtype)
 {
-        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;
+       ModResult res;
+       FIRST_MOD_RESULT(OnPassCompare, res, (ex, data, input, hashtype));
+
+       /* Module matched */
+       if (res == MOD_RES_ALLOW)
+               return 0;
+
+       /* Module explicitly didnt match */
+       if (res == MOD_RES_DENY)
+               return 1;
+
+       /* We dont handle any hash types except for plaintext - Thanks tra26 */
+       if (!hashtype.empty() && hashtype != "plaintext")
+               /* See below. 1 because they dont match */
+               return 1;
+
+       return (data != input); // this seems back to front, but returns 0 if they *match*, 1 else
 }
 
-bool CommandParser::IsValidCommand(std::string &commandname, int pcnt, userrec * user)
+/* 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, int extra, bool usemax)
 {
-       nspace::hash_map<std::string,command_t*>::iterator n = cmdlist.find(commandname);
-       if (n != cmdlist.end())
+       if (splithere >= parameters.size())
+               return 0;
+
+       if (extra >= (signed)parameters.size())
+               extra = -1;
+
+       /* 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::set (thanks for the idea w00t) we can cut this down a ton.
+        * ...VOOODOOOO!
+        */
+       std::set<irc::string> dupes;
+
+       /* Create two lists, one for channel names, one for keys
+        */
+       irc::commasepstream items1(parameters[splithere]);
+       irc::commasepstream items2(extra >= 0 ? 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) && (!usemax || max++ < ServerInstance->Config->MaxTargets))
        {
-                        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 (dupes.find(item.c_str()) == dupes.end())
+               {
+                       std::vector<std::string> new_parameters(parameters);
+
+                       if (!items2.GetToken(extrastuff))
+                               extrastuff.clear();
+
+                       new_parameters[splithere] = item;
+                       if (extra >= 0)
+                               new_parameters[extra] = extrastuff;
+
+                       CommandObj->Handle(new_parameters, user);
+
+                       dupes.insert(item.c_str());
+               }
+       }
+       return 1;
 }
 
-// calls a handler function for a command
+bool CommandParser::IsValidCommand(const std::string &commandname, unsigned int pcnt, User * user)
+{
+       Commandtable::iterator n = cmdlist.find(commandname);
 
-void CommandParser::CallHandler(std::string &commandname,char **parameters, int pcnt, userrec *user)
+       if (n != cmdlist.end())
+       {
+               if ((pcnt >= n->second->min_params))
+               {
+                       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)
 {
-       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())
+               return n->second;
+
+       return NULL;
 }
 
-int CommandParser::ProcessParameters(char **command_p,char *parameters)
+// calls a handler function for a command
+
+CmdResult CommandParser::CallHandler(const std::string &commandname, const std::vector<std::string>& parameters, User *user)
 {
-        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 */
+       Commandtable::iterator n = cmdlist.find(commandname);
+
+       if (n != cmdlist.end())
+       {
+               if ((!parameters.empty()) && (parameters.back().empty()) && (!n->second->allow_empty_last_param))
+                       return CMD_INVALID;
+
+               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;
 }
 
-void CommandParser::ProcessCommand(userrec *user, char* cmd)
+bool CommandParser::ProcessCommand(LocalUser *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;
-               
-                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 (unsigned int i = 0; i <= strlen(cmd); i++)
-                        {
-                                cmd[i] = toupper(cmd[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"))
+       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);
+
+       /* find the command, check it exists */
+       Commandtable::iterator cm = cmdlist.find(command);
+
+       // Penalty to give if the command fails before the handler is executed
+       unsigned int failpenalty = 0;
+
+       /* Modify the user's penalty regardless of whether or not the command exists */
+       bool do_more = true;
+       if (!user->HasPrivPermission("users/flood/no-throttle"))
        {
-               kill_link(user,"Server connection to non-server port");
-               return;
+               // If it *doesn't* exist, give it a slightly heftier penalty than normal to deter flooding us crap
+               unsigned int penalty = (cm != cmdlist.end() ? cm->second->Penalty * 1000 : 2000);
+               user->CommandFloodPenalty += penalty;
+
+               // Increase their penalty later if we fail and the command has 0 penalty by default (i.e. in Command::Penalty) to
+               // throttle sending ERR_* from the command parser. If the command does have a non-zero penalty then this is not
+               // needed because we've increased their penalty above.
+               if (penalty == 0)
+                       failpenalty = 1000;
        }
-       
-       /* Tweak by brain - why was this INSIDE the mainloop? */
-       if (parameters)
+
+
+       if (cm == cmdlist.end())
        {
-                if (parameters[0])
-                {
-                        items = this->ProcessParameters(command_p,parameters);
-                }
-                else
-                {
-                        items = 0;
-                        command_p[0] = NULL;
-                }
+               ModResult MOD_RESULT;
+               FIRST_MOD_RESULT(OnPreCommand, MOD_RESULT, (command, command_p, user, false, cmd));
+               if (MOD_RESULT == MOD_RES_DENY)
+                       return true;
+
+               /*
+                * This double lookup is in case a module (abbreviation) wishes to change a command.
+                * Sure, the double lookup is a bit painful, but bear in mind this only happens for unknowns anyway.
+                *
+                * Thanks dz for making me actually understand why this is necessary!
+                * -- w00t
+                */
+               cm = cmdlist.find(command);
+               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;
+               }
        }
-       else
+
+       if (cm->second->max_params && command_p.size() > cm->second->max_params)
+       {
+               /*
+                * command_p input (assuming max_params 1):
+                *      this
+                *      is
+                *      a
+                *      test
+                */
+               std::string lparam;
+
+               /*
+                * The '-1' here is a clever trick, we'll go backwards throwing everything into a temporary param
+                * and then just toss that into the array.
+                * -- w00t
+                */
+               while (command_p.size() > (cm->second->max_params - 1))
+               {
+                       // BE CAREFUL: .end() returns past the end of the vector, hence decrement.
+                       std::vector<std::string>::iterator it = command_p.end() - 1;
+
+                       lparam.insert(0, " " + *(it));
+                       command_p.erase(it); // remove last element
+               }
+
+               /* we now have (each iteration):
+                *      ' test'
+                *      ' a test'
+                *      ' is a test' <-- final string
+                * ...now remove the ' ' at the start...
+                */
+               lparam.erase(lparam.begin());
+
+               /* param is now 'is a test', which is exactly what we wanted! */
+               command_p.push_back(lparam);
+       }
+
+       /*
+        * We call OnPreCommand here seperately if the command exists, so the magic above can
+        * truncate to max_params if necessary. -- w00t
+        */
+       ModResult MOD_RESULT;
+       FIRST_MOD_RESULT(OnPreCommand, MOD_RESULT, (command, command_p, user, false, cmd));
+       if (MOD_RESULT == MOD_RES_DENY)
+               return true;
+
+       /* activity resets the ping pending timer */
+       user->nping = ServerInstance->Time() + user->MyClass->GetPingTime();
+
+       if (cm->second->flags_needed)
        {
-               items = 0;
-               command_p[0] = NULL;
+               if (!user->IsModeSet(cm->second->flags_needed))
+               {
+                       user->CommandFloodPenalty += failpenalty;
+                       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->CommandFloodPenalty += failpenalty;
+                       user->WriteNumeric(ERR_NOPRIVILEGES, "%s :Permission Denied - Oper type %s does not have access to command %s",
+                               user->nick.c_str(), user->oper->NameStr(), command.c_str());
+                       return do_more;
+               }
        }
+       if ((user->registered == REG_ALL) && (!IS_OPER(user)) && (cm->second->IsDisabled()))
+       {
+               /* command is disabled! */
+               user->CommandFloodPenalty += failpenalty;
+               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('a', "%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.empty()) && (command_p.back().empty()) && (!cm->second->allow_empty_last_param))
+               command_p.pop_back();
 
-       int MOD_RESULT = 0;
-       FOREACH_RESULT(I_OnPreCommand,OnPreCommand(command,command_p,items,user,false));
-       if (MOD_RESULT == 1) {
-               return;
+       if (command_p.size() < cm->second->min_params)
+       {
+               user->CommandFloodPenalty += failpenalty;
+               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->name.c_str(), cm->second->syntax.c_str());
+               return do_more;
+       }
+       if ((user->registered != REG_ALL) && (!cm->second->WorksBeforeReg()))
+       {
+               user->CommandFloodPenalty += failpenalty;
+               user->WriteNumeric(ERR_NOTREGISTERED, "%s %s :You have not registered", user->nick.c_str(), command.c_str());
+               return do_more;
+       }
+       else
+       {
+               /* passed all checks.. first, do the (ugly) stats counters. */
+               cm->second->use_count++;
+               cm->second->total_bytes += cmd.length();
+
+               /* module calls too */
+               FIRST_MOD_RESULT(OnPreCommand, MOD_RESULT, (command, command_p, user, true, cmd));
+               if (MOD_RESULT == MOD_RES_DENY)
+                       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;
        }
-       
-       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)
+void CommandParser::RemoveCommand(Command* x)
 {
-        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;
+       Commandtable::iterator n = cmdlist.find(x->name);
+       if (n != cmdlist.end() && n->second == x)
+               cmdlist.erase(n);
 }
 
-void CommandParser::ProcessBuffer(const char* cmdbuf,userrec *user)
+Command::~Command()
 {
-        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);
-        }
+       ServerInstance->Parser->RemoveCommand(this);
 }
 
-bool CommandParser::CreateCommand(command_t *f)
+bool CommandParser::ProcessBuffer(std::string &buffer,LocalUser *user)
 {
-        /* 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);
-       return true;
+       if (!user || buffer.empty())
+               return true;
+
+       ServerInstance->Logs->Log("USERINPUT", RAWIO, "C[%s] I :%s %s",
+               user->uuid.c_str(), user->nick.c_str(), buffer.c_str());
+       return ProcessCommand(user,buffer);
+}
+
+bool CommandParser::AddCommand(Command *f)
+{
+       /* create the command and push it onto the table */
+       if (cmdlist.find(f->name) == cmdlist.end())
+       {
+               cmdlist[f->name] = f;
+               return true;
+       }
+       return false;
 }
 
 CommandParser::CommandParser()
 {
-       this->SetupCommandTable();
 }
 
-void CommandParser::SetupCommandTable()
+int CommandParser::TranslateUIDs(const std::vector<TranslateType> to, const std::vector<std::string> &source, std::string &dest, bool prefix_final, Command* custom_translator)
 {
-       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);
+       std::vector<TranslateType>::const_iterator types = to.begin();
+       User* user = NULL;
+       unsigned int i;
+       int translations = 0;
+       dest.clear();
+
+       for(i=0; i < source.size(); i++)
+       {
+               TranslateType t;
+               std::string item = source[i];
+
+               if (types == to.end())
+                       t = TR_TEXT;
+               else
+               {
+                       t = *types;
+                       types++;
+               }
+
+               if (prefix_final && i == source.size() - 1)
+                       dest.append(":");
+
+               switch (t)
+               {
+                       case TR_NICK:
+                               /* Translate single nickname */
+                               user = ServerInstance->FindNick(item);
+                               if (user)
+                               {
+                                       dest.append(user->uuid);
+                                       translations++;
+                               }
+                               else
+                                       dest.append(item);
+                       break;
+                       case TR_CUSTOM:
+                               if (custom_translator)
+                                       custom_translator->EncodeParameter(item, i);
+                               dest.append(item);
+                       break;
+                       case TR_END:
+                       case TR_TEXT:
+                       default:
+                               /* Do nothing */
+                               dest.append(item);
+                       break;
+               }
+               if (i != source.size() - 1)
+                       dest.append(" ");
+       }
+
+       return translations;
 }
 
+int CommandParser::TranslateUIDs(TranslateType to, const std::string &source, std::string &dest)
+{
+       User* user = NULL;
+       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_END:
+               case TR_TEXT:
+               default:
+                       /* Do nothing */
+                       dest = source;
+               break;
+       }
+
+       return translations;
+}