]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/command_parse.cpp
Pedantic safe
[user/henk/code/inspircd.git] / src / command_parse.cpp
index 462b50d883ab19487e2bfa30200cd59215fe618a..6db10658bd5064350dd4a5b01c358f22dd17fffa 100644 (file)
@@ -6,11 +6,13 @@
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ *         the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
+/* $Core: libIRCDcommand_parse */
+
 #include "inspircd.h"
 #include "wildcard.h"
 #include "xline.h"
 #include <dlfcn.h>
 #endif
 
-bool InspIRCd::ULine(const char* server)
-{
-       if (!server)
-               return false;
-       if (!*server)
-               return true;
-
-       return (Config->ulines.find(server) != Config->ulines.end());
-}
-
-bool InspIRCd::SilentULine(const char* server)
-{
-       std::map<irc::string,bool>::iterator n = Config->ulines.find(server);
-       if (n != Config->ulines.end())
-               return n->second;
-       else return false;
-}
-
 int InspIRCd::OperPassCompare(const char* data,const char* input, int tagnumber)
 {
        int MOD_RESULT = 0;
@@ -54,54 +38,6 @@ int InspIRCd::OperPassCompare(const char* data,const char* input, int tagnumber)
        return strcmp(data,input);
 }
 
-std::string InspIRCd::TimeString(time_t curtime)
-{
-       return std::string(ctime(&curtime),24);
-}
-
-/** Refactored by Brain, Jun 2007. Much faster with some clever O(1) array
- * lookups and pointer maths.
- */
-long InspIRCd::Duration(const std::string &str)
-{
-       unsigned char multiplier = 0;
-       long total = 0;
-       long times = 1;
-       long subtotal = 0;
-
-       /* Iterate each item in the string, looking for number or multiplier */
-       for (std::string::const_reverse_iterator i = str.rbegin(); i != str.rend(); ++i)
-       {
-               /* Found a number, queue it onto the current number */
-               if ((*i >= '0') && (*i <= '9'))
-               {
-                       subtotal = subtotal + ((*i - '0') * times);
-                       times = times * 10;
-               }
-               else
-               {
-                       /* Found something thats not a number, find out how much
-                        * it multiplies the built up number by, multiply the total
-                        * and reset the built up number.
-                        */
-                       if (subtotal)
-                               total += subtotal * duration_multi[multiplier];
-
-                       /* Next subtotal please */
-                       subtotal = 0;
-                       multiplier = *i;
-                       times = 1;
-               }
-       }
-       if (multiplier)
-       {
-               total += subtotal * duration_multi[multiplier];
-               subtotal = 0;
-       }
-       /* Any trailing values built up are treated as raw seconds */
-       return total + subtotal;
-}
-
 /* 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,
@@ -280,7 +216,45 @@ CmdResult CommandParser::CallHandler(const std::string &commandname,const char**
        return CMD_INVALID;
 }
 
-void CommandParser::ProcessCommand(User *user, std::string &cmd)
+void CommandParser::DoLines(User* current, bool one_only)
+{
+       // while there are complete lines to process...
+       int floodlines = 0;
+
+       while (current->BufferIsReady())
+       {
+               if (ServerInstance->Time() > current->reset_due)
+               {
+                       current->reset_due = ServerInstance->Time() + current->threshold;
+                       current->lines_in = 0;
+               }
+
+               if (++current->lines_in > current->flood && current->flood)
+               {
+                       ServerInstance->FloodQuitUser(current);
+                       return;
+               }
+
+               if ((++floodlines > current->flood) && (current->flood != 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;
+       }
+}
+
+bool CommandParser::ProcessCommand(User *user, std::string &cmd)
 {
        const char *command_p[MAXPARAMETERS];
        int items = 0;
@@ -307,75 +281,97 @@ void CommandParser::ProcessCommand(User *user, std::string &cmd)
        int MOD_RESULT = 0;
        FOREACH_RESULT(I_OnPreCommand,OnPreCommand(command,command_p,items,user,false,cmd));
        if (MOD_RESULT == 1) {
-               return;
+               return true;
+       }
+
+       if (!user)
+       {
+               /*
+                * before, we went and found the command even with no user.. seems nonsensical.
+                * I'm not entirely sure when we would be passed NULL, but let's handle it
+                * anyway, by dropping it like a hot potato. -- w00t
+                */
+               return true;
        }
 
+       /* find the command, check it exists */
        Commandable::iterator cm = cmdlist.find(command);
        
-       if (cm != cmdlist.end())
+       if (cm == cmdlist.end())
+       {
+               ServerInstance->stats->statsUnknown++;
+               user->WriteServ("421 %s %s :Unknown command",user->nick,command.c_str());
+               return true;
+       }
+
+       /* Modify the user's penalty */
+       bool do_more = true;
+       if (!user->ExemptFromPenalty)
        {
-               if (user)
+               user->IncreasePenalty(cm->second->Penalty);
+               ServerInstance->Log(DEBUG,"Penalty for %s is now incremented to %d (%d added on)", user->nick, user->Penalty, cm->second->Penalty);
+               do_more = (user->Penalty < 10);
+               if (!do_more)
                {
-                       /* 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 privileges",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) && (!IS_OPER(user)) && (cm->second->IsDisabled()))
-                       {
-                               /* command is disabled! */
-                               user->WriteServ("421 %s %s :This command has been disabled.",user->nick,command.c_str());
-                               ServerInstance->SNO->WriteToSnoMask('d', "%s denied for %s (%s@%s)",
-                                               command.c_str(), user->nick, user->ident, user->host);
-                               return;
-                       }
-                       if (items < cm->second->min_params)
-                       {
-                               user->WriteServ("461 %s %s :Not enough parameters.", user->nick, command.c_str());
-                               if ((ServerInstance->Config->SyntaxHints) && (user->registered == REG_ALL) && (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->WorksBeforeReg()))
-                       {
-                               /* ikky /stats counters */
-                               cm->second->use_count++;
-                               cm->second->total_bytes += cmd.length();
-
-                               int MOD_RESULT = 0;
-                               FOREACH_RESULT(I_OnPreCommand,OnPreCommand(command,command_p,items,user,true,cmd));
-                               if (MOD_RESULT == 1)
-                                       return;
-
-                               /*
-                                * WARNING: be careful, the user may be deleted soon
-                                */
-                               CmdResult result = cm->second->Handle(command_p,items,user);
-
-                               FOREACH_MOD(I_OnPostCommand,OnPostCommand(command, command_p, items, user, result,cmd));
-                               return;
-                       }
-                       else
-                       {
-                               user->WriteServ("451 %s :You have not registered",command.c_str());
-                               return;
-                       }
+                       user->OverPenalty = true;
+                       ServerInstance->Log(DEBUG,"User %s now OVER penalty of 10", user->nick);
                }
        }
-       else if (user)
+
+       /* activity resets the ping pending timer */
+       user->nping = ServerInstance->Time() + user->pingmax;
+       if (cm->second->flags_needed)
        {
-               ServerInstance->stats->statsUnknown++;
-               user->WriteServ("421 %s %s :Unknown command",user->nick,command.c_str());
+               if (!user->IsModeSet(cm->second->flags_needed))
+               {
+                       user->WriteServ("481 %s :Permission Denied - You do not have the required operator privileges",user->nick);
+                       return do_more;
+               }
+               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 do_more;
+               }
+       }
+       if ((user->registered == REG_ALL) && (!IS_OPER(user)) && (cm->second->IsDisabled()))
+       {
+               /* command is disabled! */
+               user->WriteServ("421 %s %s :This command has been disabled.",user->nick,command.c_str());
+               ServerInstance->SNO->WriteToSnoMask('d', "%s denied for %s (%s@%s)",
+                               command.c_str(), user->nick, user->ident, user->host);
+               return do_more;
+       }
+       if (items < cm->second->min_params)
+       {
+               user->WriteServ("461 %s %s :Not enough parameters.", user->nick, command.c_str());
+               if ((ServerInstance->Config->SyntaxHints) && (user->registered == REG_ALL) && (cm->second->syntax.length()))
+                       user->WriteServ("304 %s :SYNTAX %s %s", user->nick, cm->second->command.c_str(), cm->second->syntax.c_str());
+               return do_more;
+       }
+       if ((user->registered != REG_ALL) && (!cm->second->WorksBeforeReg()))
+       {
+               user->WriteServ("451 %s :You have not registered",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 */
+               int MOD_RESULT = 0;
+               FOREACH_RESULT(I_OnPreCommand,OnPreCommand(command,command_p,items,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,items,user);
+
+               FOREACH_MOD(I_OnPostCommand,OnPostCommand(command, command_p, items, user, result,cmd));
+               return do_more;
        }
 }
 
@@ -409,12 +405,12 @@ void CommandParser::RemoveCommand(Commandable::iterator safei, const char* sourc
        }
 }
 
-void CommandParser::ProcessBuffer(std::string &buffer,User *user)
+bool CommandParser::ProcessBuffer(std::string &buffer,User *user)
 {
        std::string::size_type a;
 
        if (!user)
-               return;
+               return true;
 
        while ((a = buffer.rfind("\n")) != std::string::npos)
                buffer.erase(a);
@@ -426,9 +422,10 @@ void CommandParser::ProcessBuffer(std::string &buffer,User *user)
                if (!user->muted)
                {
                        ServerInstance->Log(DEBUG,"C[%d] I :%s %s",user->GetFd(), user->nick, buffer.c_str());
-                       this->ProcessCommand(user,buffer);
+                       return this->ProcessCommand(user,buffer);
                }
        }
+       return true;
 }
 
 bool CommandParser::CreateCommand(Command *f, void* so_handle)
@@ -511,7 +508,7 @@ bool CommandParser::ReloadCommand(const char* cmd, User* user)
        return false;
 }
 
-CmdResult cmd_reload::Handle(const char** parameters, int pcnt, User *user)
+CmdResult cmd_reload::Handle(const char** parameters, int /* pcnt */, User *user)
 {
        user->WriteServ("NOTICE %s :*** Reloading command '%s'",user->nick, parameters[0]);
        if (ServerInstance->Parser->ReloadCommand(parameters[0], user))
@@ -610,24 +607,20 @@ int CommandParser::TranslateUIDs(TranslateType to, const std::string &source, st
        User* user = NULL;
        std::string item;
        int translations = 0;
+       dest.clear();
 
        switch (to)
        {
                case TR_NICK:
                        /* Translate single nickname */
-                       ServerInstance->Log(DEBUG,"TR_NICK");
                        user = ServerInstance->FindNick(source);
                        if (user)
                        {
-                               ServerInstance->Log(DEBUG,"Managed UUID");
                                dest = user->uuid;
                                translations++;
                        }
                        else
-                       {
-                               ServerInstance->Log(DEBUG,"Had to use source.. (%s)", source.c_str());
                                dest = source;
-                       }
                break;
                case TR_NICKLIST:
                {
@@ -642,7 +635,7 @@ int CommandParser::TranslateUIDs(TranslateType to, const std::string &source, st
                                        translations++;
                                }
                                else
-                                       dest.append(source);
+                                       dest.append(item);
                                dest.append(",");
                        }
                        if (!dest.empty())
@@ -662,7 +655,7 @@ int CommandParser::TranslateUIDs(TranslateType to, const std::string &source, st
                                        translations++;
                                }
                                else
-                                       dest.append(source);
+                                       dest.append(item);
                                dest.append(" ");
                        }
                        if (!dest.empty())