]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/command_parse.cpp
Only assign NewServices once the duplicate check is done.
[user/henk/code/inspircd.git] / src / command_parse.cpp
index 7febff972904d059b40235ae35e101e5f6b17f27..f8dcc8755e35c3c32b9e06a71b8f449111735f2d 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) 2014, 2018-2020 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2012-2016, 2018 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2007-2009 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2006-2008, 2010 Craig Edwards <brain@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.
  *
- * ---------------------------------------------------
- */
-
-#include "inspircd.h"
-#include "configreader.h"
-#include <algorithm>
-#include "users.h"
-#include "modules.h"
-#include "wildcard.h"
-#include "xline.h"
-#include "socketengine.h"
-#include "userprocess.h"
-#include "socket.h"
-#include "command_parse.h"
-#define nspace __gnu_cxx
-
-/*       XXX Serious WTFness XXX
+ * 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.
  *
- * Well, unless someone invents a wildcard or
- * regexp #include, and makes it a standard,
- * we're stuck with this way of including all
- * the commands.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "commands/cmd_admin.h"
-#include "commands/cmd_away.h"
-#include "commands/cmd_commands.h"
-#include "commands/cmd_connect.h"
-#include "commands/cmd_die.h"
-#include "commands/cmd_eline.h"
-#include "commands/cmd_gline.h"
-#include "commands/cmd_info.h"
-#include "commands/cmd_invite.h"
-#include "commands/cmd_ison.h"
-#include "commands/cmd_join.h"
-#include "commands/cmd_kick.h"
-#include "commands/cmd_kill.h"
-#include "commands/cmd_kline.h"
-#include "commands/cmd_links.h"
-#include "commands/cmd_list.h"
-#include "commands/cmd_loadmodule.h"
-#include "commands/cmd_lusers.h"
-#include "commands/cmd_map.h"
-#include "commands/cmd_modules.h"
-#include "commands/cmd_motd.h"
-#include "commands/cmd_names.h"
-#include "commands/cmd_nick.h"
-#include "commands/cmd_notice.h"
-#include "commands/cmd_oper.h"
-#include "commands/cmd_part.h"
-#include "commands/cmd_pass.h"
-#include "commands/cmd_ping.h"
-#include "commands/cmd_pong.h"
-#include "commands/cmd_privmsg.h"
-#include "commands/cmd_qline.h"
-#include "commands/cmd_quit.h"
-#include "commands/cmd_rehash.h"
-#include "commands/cmd_restart.h"
-#include "commands/cmd_rules.h"
-#include "commands/cmd_server.h"
-#include "commands/cmd_squit.h"
-#include "commands/cmd_stats.h"
-#include "commands/cmd_summon.h"
-#include "commands/cmd_time.h"
-#include "commands/cmd_topic.h"
-#include "commands/cmd_trace.h"
-#include "commands/cmd_unloadmodule.h"
-#include "commands/cmd_user.h"
-#include "commands/cmd_userhost.h"
-#include "commands/cmd_users.h"
-#include "commands/cmd_version.h"
-#include "commands/cmd_wallops.h"
-#include "commands/cmd_who.h"
-#include "commands/cmd_whois.h"
-#include "commands/cmd_whowas.h"
-#include "commands/cmd_zline.h"
-
-bool InspIRCd::ULine(const char* server)
-{
-       if (!server)
-               return false;
-       if (!*server)
-               return true;
 
-       return (find(Config->ulines.begin(),Config->ulines.end(),server) != Config->ulines.end());
-}
-
-int InspIRCd::OperPassCompare(const char* data,const char* input)
-{
-       int MOD_RESULT = 0;
-       FOREACH_RESULT_I(this,I_OnOperCompare,OnOperCompare(data,input))
-       Log(DEBUG,"OperPassCompare: %d",MOD_RESULT);
-       if (MOD_RESULT == 1)
-               return 0;
-       if (MOD_RESULT == -1)
-               return 1;
-       Log(DEBUG,"strcmp fallback: '%s' '%s' %d",data,input,strcmp(data,input));
-       return strcmp(data,input);
-}
+#include "inspircd.h"
 
-long InspIRCd::Duration(const char* str)
+bool InspIRCd::PassCompare(Extensible* ex, const std::string& data, const std::string& input, const std::string& hashtype)
 {
-       char n_field[MAXBUF];
-       long total = 0;
-       n_field[0] = 0;
+       ModResult res;
+       FIRST_MOD_RESULT(OnPassCompare, res, (ex, data, input, hashtype));
 
-       if ((!strchr(str,'s')) && (!strchr(str,'m')) && (!strchr(str,'h')) && (!strchr(str,'d')) && (!strchr(str,'w')) && (!strchr(str,'y')))
-       {
-               std::string n = str;
-               n += 's';
-               return Duration(n.c_str());
-       }
-       
-       for (char* i = (char*)str; *i; i++)
-       {
-               // if we have digits, build up a string for the value in n_field,
-               // up to 10 digits in size.
-               if ((*i >= '0') && (*i <= '9'))
-               {
-                       strlcat(n_field,i,10);
-               }
-               else
-               {
-                       // we dont have a digit, check for numeric tokens
-                       switch (tolower(*i))
-                       {
-                               case 's':
-                                       total += atoi(n_field);
-                               break;
-
-                               case 'm':
-                                       total += (atoi(n_field)*duration_m);
-                               break;
-
-                               case 'h':
-                                       total += (atoi(n_field)*duration_h);
-                               break;
-
-                               case 'd':
-                                       total += (atoi(n_field)*duration_d);
-                               break;
-
-                               case 'w':
-                                       total += (atoi(n_field)*duration_w);
-                               break;
-
-                               case 'y':
-                                       total += (atoi(n_field)*duration_y);
-                               break;
-                       }
-                       n_field[0] = 0;
-               }
-       }
-       // add trailing seconds
-       total += atoi(n_field);
-       
-       return total;
-}
-
-/* All other ircds when doing this check usually just look for a string of *@* or *. We're smarter than that, though. */
-
-bool InspIRCd::HostMatchesEveryone(const std::string &mask, userrec* user)
-{
-       char buffer[MAXBUF];
-       char itrigger[MAXBUF];
-       long matches = 0;
-       
-       if (!Config->ConfValue(Config->config_data, "insane","trigger", 0, itrigger, MAXBUF))
-               strlcpy(itrigger,"95.5",MAXBUF);
-       
-       if (Config->ConfValueBool(Config->config_data, "insane","hostmasks", 0))
-               return false;
-       
-       for (user_hash::iterator u = clientlist.begin(); u != clientlist.end(); u++)
-       {
-               strlcpy(buffer,u->second->ident,MAXBUF);
-               charlcat(buffer,'@',MAXBUF);
-               strlcat(buffer,u->second->host,MAXBUF);
-               if (match(buffer,mask.c_str()))
-                       matches++;
-       }
-       float percent = ((float)matches / (float)clientlist.size()) * 100;
-       if (percent > (float)atof(itrigger))
-       {
-               WriteOpers("*** \2WARNING\2: %s tried to set a G/K/E line mask of %s, which covers %.2f%% of the network!",user->nick,mask.c_str(),percent);
+       /* Module matched */
+       if (res == MOD_RES_ALLOW)
                return true;
-       }
-       return false;
-}
 
-bool InspIRCd::IPMatchesEveryone(const std::string &ip, userrec* user)
-{
-       char itrigger[MAXBUF];
-       long matches = 0;
-       
-       if (!Config->ConfValue(Config->config_data, "insane","trigger",0,itrigger,MAXBUF))
-               strlcpy(itrigger,"95.5",MAXBUF);
-       
-       if (Config->ConfValueBool(Config->config_data, "insane","ipmasks",0))
+       /* Module explicitly didnt match */
+       if (res == MOD_RES_DENY)
                return false;
-       
-       for (user_hash::iterator u = clientlist.begin(); u != clientlist.end(); u++)
-       {
-               if (match(u->second->GetIPString(),ip.c_str(),true))
-                       matches++;
-       }
-       
-       float percent = ((float)matches / (float)clientlist.size()) * 100;
-       if (percent > (float)atof(itrigger))
-       {
-               WriteOpers("*** \2WARNING\2: %s tried to set a Z line mask of %s, which covers %.2f%% of the network!",user->nick,ip.c_str(),percent);
-               return true;
-       }
-       return false;
-}
 
-bool InspIRCd::NickMatchesEveryone(const std::string &nick, userrec* user)
-{
-       char itrigger[MAXBUF];
-       long matches = 0;
-       
-       if (!Config->ConfValue(Config->config_data, "insane","trigger",0,itrigger,MAXBUF))
-               strlcpy(itrigger,"95.5",MAXBUF);
-       
-       if (Config->ConfValueBool(Config->config_data, "insane","nickmasks",0))
+       /* We dont handle any hash types except for plaintext - Thanks tra26 */
+       if (!hashtype.empty() && !stdalgo::string::equalsci(hashtype, "plaintext"))
                return false;
 
-       for (user_hash::iterator u = clientlist.begin(); u != clientlist.end(); u++)
-       {
-               if (match(u->second->nick,nick.c_str()))
-                       matches++;
-       }
-       
-       float percent = ((float)matches / (float)clientlist.size()) * 100;
-       if (percent > (float)atof(itrigger))
-       {
-               WriteOpers("*** \2WARNING\2: %s tried to set a Q line mask of %s, which covers %.2f%% of the network!",user->nick,nick.c_str(),percent);
-               return true;
-       }
-       return false;
+       return TimingSafeCompare(data, input);
 }
 
-
-
-
-
-/* Special commands which may occur without registration of the user */
-cmd_user* command_user;
-cmd_nick* command_nick;
-cmd_pass* command_pass;
-
-
-/* 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(userrec* user, command_t* CommandObj, const char** parameters, int pcnt, unsigned int splithere, unsigned int extra)
+bool CommandParser::LoopCall(User* user, Command* handler, const CommandBase::Params& parameters, unsigned int splithere, int extra, bool usemax)
 {
-       /* 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 (!strchr(parameters[splithere],','))
-               return 0;
+       if (splithere >= parameters.size())
+               return false;
 
-       /* Create two lists, one for channel names, one for keys
+       /* First check if we have more than one item in the list, if we don't we return false here and the handler
+        * which called us just carries on as it was.
         */
-       irc::commasepstream items1(parameters[splithere]);
-       irc::commasepstream items2(parameters[extra]);
-       std::string item = "";
-       unsigned int max = 0;
+       if (parameters[splithere].find(',') == std::string::npos)
+               return false;
 
-       /* 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.
+       /** 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!
+        *
+        * Only check for duplicates if there is one list (allow them in JOIN).
         */
-       while (((item = items1.GetToken()) != "") && (max++ < ServerInstance->Config->MaxTargets))
-       {
-               std::string extrastuff = items2.GetToken();
-               parameters[splithere] = item.c_str();
-               parameters[extra] = extrastuff.c_str();
-               CommandObj->Handle(parameters,pcnt,user);
-       }
-       return 1;
-}
+       insp::flat_set<std::string, irc::insensitive_swo> dupes;
+       bool check_dupes = (extra < 0);
 
-int CommandParser::LoopCall(userrec* user, command_t* CommandObj, const char** parameters, int pcnt, unsigned int splithere)
-{
-       /* 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.
+       /* Create two sepstreams, if we have only one list, then initialize the second sepstream with
+        * an empty string. The second parameter of the constructor of the sepstream tells whether
+        * or not to allow empty tokens.
+        * We allow empty keys, so "JOIN #a,#b ,bkey" will be interpreted as "JOIN #a", "JOIN #b bkey"
         */
-       if (!strchr(parameters[splithere],','))
-               return 0;
-
-       /* Only one commasepstream here */
        irc::commasepstream items1(parameters[splithere]);
-       std::string item = "";
+       irc::commasepstream items2(extra >= 0 ? parameters[extra] : "", true);
+       std::string item;
        unsigned int max = 0;
+       LocalUser* localuser = IS_LOCAL(user);
 
-       /* Parse the commasepstream until there are no tokens remaining.
-        * Each token we parse out, call the command handler that called us
-        * with it
+       /* Attempt to iterate these lists and call the command handler
+        * for every parameter or parameter pair until there are no more
+        * left to parse.
         */
-       while (((item = items1.GetToken()) != "") && (max++ < ServerInstance->Config->MaxTargets))
+       CommandBase::Params splitparams(parameters);
+       while (items1.GetToken(item) && (!usemax || max++ < ServerInstance->Config->MaxTargets))
        {
-               parameters[splithere] = item.c_str();
-               CommandObj->Handle(parameters,pcnt,user);
-       }
-       /* 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;
-}
+               if ((!check_dupes) || (dupes.insert(item).second))
+               {
+                       splitparams[splithere] = item;
 
-bool CommandParser::IsValidCommand(const std::string &commandname, int pcnt, userrec * user)
-{
-       nspace::hash_map<std::string,command_t*>::iterator n = cmdlist.find(commandname);
+                       if (extra >= 0)
+                       {
+                               // If we have two lists then get the next item from the second list.
+                               // In case it runs out of elements then 'item' will be an empty string.
+                               items2.GetToken(item);
+                               splitparams[extra] = item;
+                       }
 
-       if (n != cmdlist.end())
-       {
-               if ((pcnt>=n->second->min_params) && (n->second->source != "<core>"))
-               {
-                       if ((!n->second->flags_needed) || (user->modes[n->second->flags_needed-65]))
+                       CmdResult result = handler->Handle(user, splitparams);
+                       if (localuser)
                        {
-                               if (n->second->flags_needed)
-                               {
-                                       return ((user->HasPermission(commandname)) || (ServerInstance->ULine(user->server)));
-                               }
-                               return true;
+                               // Run the OnPostCommand hook with the last parameter being true to indicate
+                               // that the event is being called in a loop.
+                               item.clear();
+                               FOREACH_MOD(OnPostCommand, (handler, splitparams, localuser, result, true));
                        }
                }
        }
-       return false;
+
+       return true;
+}
+
+Command* CommandParser::GetHandler(const std::string &commandname)
+{
+       CommandMap::iterator n = cmdlist.find(commandname);
+       if (n != cmdlist.end())
+               return n->second;
+
+       return NULL;
 }
 
 // calls a handler function for a command
 
-bool CommandParser::CallHandler(const std::string &commandname,const char** parameters, int pcnt, userrec *user)
+CmdResult CommandParser::CallHandler(const std::string& commandname, const CommandBase::Params& parameters, User* user, Command** cmd)
 {
-       nspace::hash_map<std::string,command_t*>::iterator n = cmdlist.find(commandname);
+       CommandMap::iterator n = cmdlist.find(commandname);
 
        if (n != cmdlist.end())
        {
-               if (pcnt >= n->second->min_params)
+               if ((!parameters.empty()) && (parameters.back().empty()) && (!n->second->allow_empty_last_param))
+                       return CMD_INVALID;
+
+               if (parameters.size() >= n->second->min_params)
                {
-                       if ((!n->second->flags_needed) || (user->modes[n->second->flags_needed-65]))
+                       bool bOkay = false;
+
+                       if (IS_LOCAL(user) && n->second->flags_needed)
                        {
-                               if (n->second->flags_needed)
-                               {
-                                       if ((user->HasPermission(commandname)) || (!IS_LOCAL(user)))
-                                       {
-                                               n->second->Handle(parameters,pcnt,user);
-                                               return true;
-                                       }
-                               }
-                               else
+                               /* if user is local, and flags are needed .. */
+
+                               if (user->IsModeSet(n->second->flags_needed))
                                {
-                                       n->second->Handle(parameters,pcnt,user);
-                                       return true;
+                                       /* if user has the flags, and now has the permissions, go ahead */
+                                       if (user->HasCommandPermission(commandname))
+                                               bOkay = true;
                                }
                        }
+                       else
+                       {
+                               /* remote or no flags required anyway */
+                               bOkay = true;
+                       }
+
+                       if (bOkay)
+                       {
+                               if (cmd)
+                                       *cmd = n->second;
+
+                               ClientProtocol::TagMap tags;
+                               return n->second->Handle(user, CommandBase::Params(parameters, tags));
+                       }
                }
        }
-       return false;
+       return CMD_INVALID;
 }
 
-void CommandParser::ProcessCommand(userrec *user, std::string &cmd)
+void CommandParser::ProcessCommand(LocalUser* user, std::string& command, CommandBase::Params& command_p)
 {
-       const char *command_p[127];
-       int items = 0;
-       std::string para[127];
-       irc::tokenstream tokens(cmd);
-       std::string command = tokens.GetToken();
+       /* find the command, check it exists */
+       Command* handler = GetHandler(command);
 
-       while (((para[items] = tokens.GetToken()) != "") && (items < 127))
-               command_p[items] = para[items++].c_str();
+       // Penalty to give if the command fails before the handler is executed
+       unsigned int failpenalty = 0;
 
-       std::transform(command.begin(), command.end(), command.begin(), ::toupper);
-               
-       int MOD_RESULT = 0;
-       FOREACH_RESULT(I_OnPreCommand,OnPreCommand(command,command_p,items,user,false));
-       if (MOD_RESULT == 1) {
-               return;
+       /* Modify the user's penalty regardless of whether or not the command exists */
+       if (!user->HasPrivPermission("users/flood/no-throttle"))
+       {
+               // If it *doesn't* exist, give it a slightly heftier penalty than normal to deter flooding us crap
+               unsigned int penalty = (handler ? handler->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;
        }
 
-       nspace::hash_map<std::string,command_t*>::iterator cm = cmdlist.find(command);
-       
-       if (cm != cmdlist.end())
+       if (!handler)
        {
-               if (user)
+               ModResult MOD_RESULT;
+               FIRST_MOD_RESULT(OnPreCommand, MOD_RESULT, (command, command_p, user, false));
+               if (MOD_RESULT == MOD_RES_DENY)
                {
-                       /* activity resets the ping pending timer */
-                       user->nping = ServerInstance->Time() + user->pingmax;
-                       if (cm->second->flags_needed)
-                       {
-                               if (!user->IsModeSet(cm->second->flags_needed))
-                               {
-                                       user->WriteServ("481 %s :Permission Denied- You do not have the required operator privilages",user->nick);
-                                       return;
-                               }
-                               if (!user->HasPermission(command))
-                               {
-                                       user->WriteServ("481 %s :Permission Denied- Oper type %s does not have access to command %s",user->nick,user->oper,command.c_str());
-                                       return;
-                               }
-                       }
-                       if ((user->registered == REG_ALL) && (!*user->oper) && (cm->second->IsDisabled()))
-                       {
-                               /* command is disabled! */
-                               user->WriteServ("421 %s %s :This command has been disabled.",user->nick,command.c_str());
-                               return;
-                       }
-                       if (items < cm->second->min_params)
-                       {
-                               user->WriteServ("461 %s %s :Not enough parameters.", user->nick, command.c_str());
-                               /* If syntax is given, display this as the 461 reply */
-                               if ((ServerInstance->Config->SyntaxHints) && (cm->second->syntax.length()))
-                                       user->WriteServ("304 %s :SYNTAX %s %s", user->nick, cm->second->command.c_str(), cm->second->syntax.c_str());
-                               return;
-                       }
-                       if ((user->registered == REG_ALL) || (cm->second == command_user) || (cm->second == command_nick) || (cm->second == command_pass))
-                       {
-                               /* ikky /stats counters */
-                               cm->second->use_count++;
-                               cm->second->total_bytes += cmd.length();
-
-                               int MOD_RESULT = 0;
-                               FOREACH_RESULT(I_OnPreCommand,OnPreCommand(command,command_p,items,user,true));
-                               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
-                       {
-                               user->WriteServ("451 %s :You have not registered",command.c_str());
-                               return;
-                       }
+                       FOREACH_MOD(OnCommandBlocked, (command, command_p, user));
+                       return;
+               }
+
+               /*
+                * 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
+                */
+               handler = GetHandler(command);
+               if (!handler)
+               {
+                       if (user->registered == REG_ALL)
+                               user->WriteNumeric(ERR_UNKNOWNCOMMAND, command, "Unknown command");
+
+                       ServerInstance->stats.Unknown++;
+                       FOREACH_MOD(OnCommandBlocked, (command, command_p, user));
+                       return;
                }
        }
-       else if (user)
+
+       // If we were given more parameters than max_params then append the excess parameter(s)
+       // to command_p[maxparams-1], i.e. to the last param that is still allowed
+       if (handler->max_params && command_p.size() > handler->max_params)
        {
-               ServerInstance->stats->statsUnknown++;
-               user->WriteServ("421 %s %s :Unknown command",user->nick,command.c_str());
+               /*
+                * command_p input (assuming max_params 1):
+                *      this
+                *      is
+                *      a
+                *      test
+                */
+
+               // Iterator to the last parameter that will be kept
+               const CommandBase::Params::iterator lastkeep = command_p.begin() + (handler->max_params - 1);
+               // Iterator to the first excess parameter
+               const CommandBase::Params::iterator firstexcess = lastkeep + 1;
+
+               // Append all excess parameter(s) to the last parameter, separated by spaces
+               for (CommandBase::Params::const_iterator i = firstexcess; i != command_p.end(); ++i)
+               {
+                       lastkeep->push_back(' ');
+                       lastkeep->append(*i);
+               }
+
+               // Erase the excess parameter(s)
+               command_p.erase(firstexcess, command_p.end());
        }
-}
 
-bool CommandParser::RemoveCommands(const char* source)
-{
-       bool go_again = true;
+       /*
+        * We call OnPreCommand here separately 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));
+       if (MOD_RESULT == MOD_RES_DENY)
+       {
+               FOREACH_MOD(OnCommandBlocked, (command, command_p, user));
+               return;
+       }
+
+       /* activity resets the ping pending timer */
+       user->nextping = ServerInstance->Time() + user->MyClass->GetPingTime();
 
-       while (go_again)
+       if (handler->flags_needed)
        {
-               go_again = false;
+               if (!user->IsModeSet(handler->flags_needed))
+               {
+                       user->CommandFloodPenalty += failpenalty;
+                       user->WriteNumeric(ERR_NOPRIVILEGES, "Permission Denied - You do not have the required operator privileges");
+                       FOREACH_MOD(OnCommandBlocked, (command, command_p, user));
+                       return;
+               }
 
-               for (nspace::hash_map<std::string,command_t*>::iterator i = cmdlist.begin(); i != cmdlist.end(); i++)
+               if (!user->HasCommandPermission(command))
                {
-                       command_t* x = i->second;
-                       if (x->source == std::string(source))
-                       {
-                               ServerInstance->Log(DEBUG,"removecommands(%s) Removing dependent command: %s",x->source.c_str(),x->command.c_str());
-                               cmdlist.erase(i);
-                               go_again = true;
-                               break;
-                       }
+                       user->CommandFloodPenalty += failpenalty;
+                       user->WriteNumeric(ERR_NOPRIVILEGES, InspIRCd::Format("Permission Denied - Oper type %s does not have access to command %s",
+                               user->oper->name.c_str(), command.c_str()));
+                       FOREACH_MOD(OnCommandBlocked, (command, command_p, user));
+                       return;
                }
        }
 
-       return true;
+       if ((!command_p.empty()) && (command_p.back().empty()) && (!handler->allow_empty_last_param))
+               command_p.pop_back();
+
+       if (command_p.size() < handler->min_params)
+       {
+               user->CommandFloodPenalty += failpenalty;
+               handler->TellNotEnoughParameters(user, command_p);
+               FOREACH_MOD(OnCommandBlocked, (command, command_p, user));
+               return;
+       }
+
+       if ((user->registered != REG_ALL) && (!handler->works_before_reg))
+       {
+               user->CommandFloodPenalty += failpenalty;
+               handler->TellNotRegistered(user, command_p);
+               FOREACH_MOD(OnCommandBlocked, (command, command_p, user));
+       }
+       else
+       {
+               /* passed all checks.. first, do the (ugly) stats counters. */
+               handler->use_count++;
+
+               /* module calls too */
+               FIRST_MOD_RESULT(OnPreCommand, MOD_RESULT, (command, command_p, user, true));
+               if (MOD_RESULT == MOD_RES_DENY)
+               {
+                       FOREACH_MOD(OnCommandBlocked, (command, command_p, user));
+                       return;
+               }
+
+               /*
+                * WARNING: be careful, the user may be deleted soon
+                */
+               CmdResult result = handler->Handle(user, command_p);
+
+               FOREACH_MOD(OnPostCommand, (handler, command_p, user, result, false));
+       }
 }
 
-void CommandParser::ProcessBuffer(std::string &buffer,userrec *user)
+void CommandParser::RemoveCommand(Command* x)
 {
-       std::string::size_type a;
+       CommandMap::iterator n = cmdlist.find(x->name);
+       if (n != cmdlist.end() && n->second == x)
+               cmdlist.erase(n);
+}
 
-       if (!user)
+void CommandParser::ProcessBuffer(LocalUser* user, const std::string& buffer)
+{
+       ClientProtocol::ParseOutput parseoutput;
+       if (!user->serializer->Parse(user, buffer, parseoutput))
                return;
 
-       while ((a = buffer.rfind("\n")) != std::string::npos)
-               buffer.erase(a);
-       while ((a = buffer.rfind("\r")) != std::string::npos)
-               buffer.erase(a);
+       std::string& command = parseoutput.cmd;
+       std::transform(command.begin(), command.end(), command.begin(), ::toupper);
 
-       if (buffer.length())
-       {
-               ServerInstance->Log(DEBUG,"CMDIN: %s %s",user->nick,buffer.c_str());
-               this->ProcessCommand(user,buffer);
-       }
+       CommandBase::Params parameters(parseoutput.params, parseoutput.tags);
+       ProcessCommand(user, command, parameters);
 }
 
-bool CommandParser::CreateCommand(command_t *f)
+bool CommandParser::AddCommand(Command *f)
 {
        /* create the command and push it onto the table */
-       if (cmdlist.find(f->command) == cmdlist.end())
+       if (cmdlist.find(f->name) == cmdlist.end())
        {
-               cmdlist[f->command] = f;
-               ServerInstance->Log(DEBUG,"Added command %s (%lu parameters)",f->command.c_str(),(unsigned long)f->min_params);
+               cmdlist[f->name] = f;
                return true;
        }
-       else return false;
+       return false;
 }
 
-CommandParser::CommandParser(InspIRCd* Instance) : ServerInstance(Instance)
+CommandParser::CommandParser()
 {
-       this->SetupCommandTable();
 }
 
-void CommandParser::SetupCommandTable()
+std::string CommandParser::TranslateUIDs(const std::vector<TranslateType>& to, const CommandBase::Params& source, bool prefix_final, CommandBase* custom_translator)
 {
-       /* These three are special (can occur without
-        * full user registration) and so are saved
-        * for later use.
-        */
-       command_user = new cmd_user(ServerInstance);
-       command_nick = new cmd_nick(ServerInstance);
-       command_pass = new cmd_pass(ServerInstance);
-       this->CreateCommand(command_user);
-       this->CreateCommand(command_nick);
-       this->CreateCommand(command_pass);
-
-       /* The rest of these arent special. boo hoo.
-        */
-       this->CreateCommand(new cmd_quit(ServerInstance));
-       this->CreateCommand(new cmd_version(ServerInstance));
-       this->CreateCommand(new cmd_ping(ServerInstance));
-       this->CreateCommand(new cmd_pong(ServerInstance));
-       this->CreateCommand(new cmd_admin(ServerInstance));
-       this->CreateCommand(new cmd_privmsg(ServerInstance));
-       this->CreateCommand(new cmd_info(ServerInstance));
-       this->CreateCommand(new cmd_time(ServerInstance));
-       this->CreateCommand(new cmd_whois(ServerInstance));
-       this->CreateCommand(new cmd_wallops(ServerInstance));
-       this->CreateCommand(new cmd_notice(ServerInstance));
-       this->CreateCommand(new cmd_join(ServerInstance));
-       this->CreateCommand(new cmd_names(ServerInstance));
-       this->CreateCommand(new cmd_part(ServerInstance));
-       this->CreateCommand(new cmd_kick(ServerInstance));
-       this->CreateCommand(new cmd_mode(ServerInstance));
-       this->CreateCommand(new cmd_topic(ServerInstance));
-       this->CreateCommand(new cmd_who(ServerInstance));
-       this->CreateCommand(new cmd_motd(ServerInstance));
-       this->CreateCommand(new cmd_rules(ServerInstance));
-       this->CreateCommand(new cmd_oper(ServerInstance));
-       this->CreateCommand(new cmd_list(ServerInstance));
-       this->CreateCommand(new cmd_die(ServerInstance));
-       this->CreateCommand(new cmd_restart(ServerInstance));
-       this->CreateCommand(new cmd_kill(ServerInstance));
-       this->CreateCommand(new cmd_rehash(ServerInstance));
-       this->CreateCommand(new cmd_lusers(ServerInstance));
-       this->CreateCommand(new cmd_stats(ServerInstance));
-       this->CreateCommand(new cmd_userhost(ServerInstance));
-       this->CreateCommand(new cmd_away(ServerInstance));
-       this->CreateCommand(new cmd_ison(ServerInstance));
-       this->CreateCommand(new cmd_summon(ServerInstance));
-       this->CreateCommand(new cmd_users(ServerInstance));
-       this->CreateCommand(new cmd_invite(ServerInstance));
-       this->CreateCommand(new cmd_trace(ServerInstance));
-       this->CreateCommand(new cmd_whowas(ServerInstance));
-       this->CreateCommand(new cmd_connect(ServerInstance));
-       this->CreateCommand(new cmd_squit(ServerInstance));
-       this->CreateCommand(new cmd_modules(ServerInstance));
-       this->CreateCommand(new cmd_links(ServerInstance));
-       this->CreateCommand(new cmd_map(ServerInstance));
-       this->CreateCommand(new cmd_kline(ServerInstance));
-       this->CreateCommand(new cmd_gline(ServerInstance));
-       this->CreateCommand(new cmd_zline(ServerInstance));
-       this->CreateCommand(new cmd_qline(ServerInstance));
-       this->CreateCommand(new cmd_eline(ServerInstance));
-       this->CreateCommand(new cmd_loadmodule(ServerInstance));
-       this->CreateCommand(new cmd_unloadmodule(ServerInstance));
-       this->CreateCommand(new cmd_server(ServerInstance));
-       this->CreateCommand(new cmd_commands(ServerInstance));
+       std::vector<TranslateType>::const_iterator types = to.begin();
+       std::string dest;
+
+       for (unsigned int i = 0; i < source.size(); i++)
+       {
+               TranslateType t = TR_TEXT;
+               // They might supply less translation types than parameters,
+               // in that case pretend that all remaining types are TR_TEXT
+               if (types != to.end())
+               {
+                       t = *types;
+                       types++;
+               }
+
+               bool last = (i == (source.size() - 1));
+               if (prefix_final && last)
+                       dest.push_back(':');
+
+               TranslateSingleParam(t, source[i], dest, custom_translator, i);
+
+               if (!last)
+                       dest.push_back(' ');
+       }
+
+       return dest;
 }
 
+void CommandParser::TranslateSingleParam(TranslateType to, const std::string& item, std::string& dest, CommandBase* custom_translator, unsigned int paramnumber)
+{
+       switch (to)
+       {
+               case TR_NICK:
+               {
+                       /* Translate single nickname */
+                       User* user = ServerInstance->FindNick(item);
+                       if (user)
+                               dest.append(user->uuid);
+                       else
+                               dest.append(item);
+                       break;
+               }
+               case TR_CUSTOM:
+               {
+                       if (custom_translator)
+                       {
+                               std::string translated = item;
+                               custom_translator->EncodeParameter(translated, paramnumber);
+                               dest.append(translated);
+                               break;
+                       }
+                       // If no custom translator was given, fall through
+               }
+               /*@fallthrough@*/
+               default:
+                       /* Do nothing */
+                       dest.append(item);
+               break;
+       }
+}