]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/command_parse.cpp
*untested* command buffering/penalty
[user/henk/code/inspircd.git] / src / command_parse.cpp
index fb89fd7ad9f988c656c24fc8f696fbad576f28a2..f3ff69c9601e1c035f8272f4eebfd71f1149ac96 100644 (file)
@@ -6,7 +6,7 @@
  * 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.
  *
  * ---------------------------------------------------
  */
 #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 +36,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,
@@ -112,7 +46,7 @@ long InspIRCd::Duration(const std::string &str)
  * 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)
+int CommandParser::LoopCall(User* user, Command* CommandObj, const char** parameters, int pcnt, unsigned int splithere, unsigned int extra)
 {
        /* 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.
@@ -161,7 +95,7 @@ int CommandParser::LoopCall(userrec* user, command_t* CommandObj, const char** p
        return 1;
 }
 
-int CommandParser::LoopCall(userrec* user, command_t* CommandObj, const char** parameters, int pcnt, unsigned int splithere)
+int CommandParser::LoopCall(User* user, Command* 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.
@@ -209,20 +143,23 @@ int CommandParser::LoopCall(userrec* user, command_t* CommandObj, const char** p
        return 1;
 }
 
-bool CommandParser::IsValidCommand(const std::string &commandname, int pcnt, userrec * user)
+bool CommandParser::IsValidCommand(const std::string &commandname, int pcnt, User * user)
 {
-       command_table::iterator n = cmdlist.find(commandname);
+       Commandable::iterator n = cmdlist.find(commandname);
 
        if (n != cmdlist.end())
        {
                if ((pcnt>=n->second->min_params) && (n->second->source != "<core>"))
                {
-                       if ((!n->second->flags_needed) || (user->IsModeSet(n->second->flags_needed)))
+                       if (IS_LOCAL(user) && n->second->flags_needed)
                        {
-                               if (n->second->flags_needed)
+                               if (user->IsModeSet(n->second->flags_needed))
                                {
-                                       return ((user->HasPermission(commandname)) || (ServerInstance->ULine(user->server)));
+                                       return (user->HasPermission(commandname));
                                }
+                       }
+                       else
+                       {
                                return true;
                        }
                }
@@ -230,9 +167,9 @@ bool CommandParser::IsValidCommand(const std::string &commandname, int pcnt, use
        return false;
 }
 
-command_t* CommandParser::GetHandler(const std::string &commandname)
+Command* CommandParser::GetHandler(const std::string &commandname)
 {
-       command_table::iterator n = cmdlist.find(commandname);
+       Commandable::iterator n = cmdlist.find(commandname);
        if (n != cmdlist.end())
                return n->second;
 
@@ -241,34 +178,81 @@ command_t* CommandParser::GetHandler(const std::string &commandname)
 
 // calls a handler function for a command
 
-CmdResult CommandParser::CallHandler(const std::string &commandname,const char** parameters, int pcnt, userrec *user)
+CmdResult CommandParser::CallHandler(const std::string &commandname,const char** parameters, int pcnt, User *user)
 {
-       command_table::iterator n = cmdlist.find(commandname);
+       Commandable::iterator n = cmdlist.find(commandname);
 
        if (n != cmdlist.end())
        {
                if (pcnt >= n->second->min_params)
                {
-                       if ((!n->second->flags_needed) || (user->IsModeSet(n->second->flags_needed)))
+                       bool bOkay = false;
+
+                       if (IS_LOCAL(user) && n->second->flags_needed)
                        {
-                               if (n->second->flags_needed)
-                               {
-                                       if ((user->HasPermission(commandname)) || (!IS_LOCAL(user)))
-                                       {
-                                               return n->second->Handle(parameters,pcnt,user);
-                                       }
-                               }
-                               else
+                               /* if user is local, and flags are needed .. */
+
+                               if (user->IsModeSet(n->second->flags_needed))
                                {
-                                       return n->second->Handle(parameters,pcnt,user);
+                                       /* 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,pcnt,user);
+                       }
                }
        }
        return CMD_INVALID;
 }
 
-void CommandParser::ProcessCommand(userrec *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;
@@ -295,82 +279,95 @@ void CommandParser::ProcessCommand(userrec *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;
        }
 
-       command_table::iterator cm = cmdlist.find(command);
+       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 */
+       user->Penalty += cm->second->Penalty;
+       bool do_more = (user->Penalty < 10);
+       if (do_more)
+               user->OverPenalty = true;
+
+       /* activity resets the ping pending timer */
+       user->nping = ServerInstance->Time() + user->pingmax;
+       if (cm->second->flags_needed)
        {
-               if (user)
+               if (!user->IsModeSet(cm->second->flags_needed))
                {
-                       /* 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: nothing should come after this, as the user may be on a cull list to
-                                * be nuked next loop iteration. be sensible.
-                                */
-                               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->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;
                }
        }
-       else if (user)
+       if ((user->registered == REG_ALL) && (!IS_OPER(user)) && (cm->second->IsDisabled()))
        {
-               ServerInstance->stats->statsUnknown++;
-               user->WriteServ("421 %s %s :Unknown command",user->nick,command.c_str());
+               /* 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;
        }
 }
 
 bool CommandParser::RemoveCommands(const char* source)
 {
-       command_table::iterator i,safei;
+       Commandable::iterator i,safei;
        for (i = cmdlist.begin(); i != cmdlist.end(); i++)
        {
                safei = i;
@@ -388,9 +385,9 @@ bool CommandParser::RemoveCommands(const char* source)
        return true;
 }
 
-void CommandParser::RemoveCommand(command_table::iterator safei, const char* source)
+void CommandParser::RemoveCommand(Commandable::iterator safei, const char* source)
 {
-       command_t* x = safei->second;
+       Command* x = safei->second;
        if (x->source == std::string(source))
        {
                cmdlist.erase(safei);
@@ -398,12 +395,12 @@ void CommandParser::RemoveCommand(command_table::iterator safei, const char* sou
        }
 }
 
-void CommandParser::ProcessBuffer(std::string &buffer,userrec *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);
@@ -414,13 +411,14 @@ void CommandParser::ProcessBuffer(std::string &buffer,userrec *user)
        {
                if (!user->muted)
                {
-                       ServerInstance->Log(DEBUG,"C[%d] -> :%s %s",user->GetFd(), user->nick, buffer.c_str());
-                       this->ProcessCommand(user,buffer);
+                       ServerInstance->Log(DEBUG,"C[%d] I :%s %s",user->GetFd(), user->nick, buffer.c_str());
+                       return this->ProcessCommand(user,buffer);
                }
        }
+       return true;
 }
 
-bool CommandParser::CreateCommand(command_t *f, void* so_handle)
+bool CommandParser::CreateCommand(Command *f, void* so_handle)
 {
        if (so_handle)
        {
@@ -447,19 +445,19 @@ CommandParser::CommandParser(InspIRCd* Instance) : ServerInstance(Instance)
        para.resize(128);
 }
 
-bool CommandParser::FindSym(void** v, void* h)
+bool CommandParser::FindSym(void** v, void* h, const std::string &name)
 {
        *v = dlsym(h, "init_command");
        const char* err = dlerror();
        if (err && !(*v))
        {
-               ServerInstance->Log(SPARSE, "Error loading core command: %s\n", err);
+               ServerInstance->Log(SPARSE, "Error loading core command %s: %s\n", name.c_str(), err);
                return false;
        }
        return true;
 }
 
-bool CommandParser::ReloadCommand(const char* cmd, userrec* user)
+bool CommandParser::ReloadCommand(const char* cmd, User* user)
 {
        char filename[MAXBUF];
        char commandname[MAXBUF];
@@ -474,7 +472,7 @@ bool CommandParser::ReloadCommand(const char* cmd, userrec* user)
 
        if (command != RFCCommands.end())
        {
-               command_t* cmdptr = cmdlist.find(commandname)->second;
+               Command* cmdptr = cmdlist.find(commandname)->second;
                cmdlist.erase(cmdlist.find(commandname));
 
                for (char* x = commandname; *x; x++)
@@ -500,7 +498,7 @@ bool CommandParser::ReloadCommand(const char* cmd, userrec* user)
        return false;
 }
 
-CmdResult cmd_reload::Handle(const char** parameters, int pcnt, userrec *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))
@@ -520,7 +518,7 @@ const char* CommandParser::LoadCommand(const char* name)
 {
        char filename[MAXBUF];
        void* h;
-       command_t* (*cmd_factory_func)(InspIRCd*);
+       Command* (*cmd_factory_func)(InspIRCd*);
 
        /* Command already exists? Succeed silently - this is needed for REHASH */
        if (RFCCommands.find(name) != RFCCommands.end())
@@ -535,19 +533,19 @@ const char* CommandParser::LoadCommand(const char* name)
        if (!h)
        {
                const char* n = dlerror();
-               ServerInstance->Log(SPARSE, "Error loading core command: %s", n);
+               ServerInstance->Log(SPARSE, "Error loading core command %s: %s", name, n);
                return n;
        }
 
-       if (this->FindSym((void **)&cmd_factory_func, h))
+       if (this->FindSym((void **)&cmd_factory_func, h, name))
        {
-               command_t* newcommand = cmd_factory_func(ServerInstance);
+               Command* newcommand = cmd_factory_func(ServerInstance);
                this->CreateCommand(newcommand, h);
        }
        return NULL;
 }
 
-void CommandParser::SetupCommandTable(userrec* user)
+void CommandParser::SetupCommandTable(User* user)
 {
        RFCCommands.clear();
 
@@ -594,3 +592,74 @@ void CommandParser::SetupCommandTable(userrec* user)
                this->CreateCommand(new cmd_reload(ServerInstance));
 }
 
+int CommandParser::TranslateUIDs(TranslateType to, const std::string &source, std::string &dest)
+{
+       User* user = NULL;
+       std::string item;
+       int translations = 0;
+       dest.clear();
+
+       switch (to)
+       {
+               case TR_NICK:
+                       /* Translate single nickname */
+                       user = ServerInstance->FindNick(source);
+                       if (user)
+                       {
+                               dest = user->uuid;
+                               translations++;
+                       }
+                       else
+                               dest = source;
+               break;
+               case TR_NICKLIST:
+               {
+                       /* Translate comma seperated list of nicknames */
+                       irc::commasepstream items(source);
+                       while (items.GetToken(item))
+                       {
+                               user = ServerInstance->FindNick(item);
+                               if (user)
+                               {
+                                       dest.append(user->uuid);
+                                       translations++;
+                               }
+                               else
+                                       dest.append(item);
+                               dest.append(",");
+                       }
+                       if (!dest.empty())
+                               dest.erase(dest.end() - 1);
+               }
+               break;
+               case TR_SPACENICKLIST:
+               {
+                       /* Translate space seperated list of nicknames */
+                       irc::spacesepstream items(source);
+                       while (items.GetToken(item))
+                       {
+                               user = ServerInstance->FindNick(item);
+                               if (user)
+                               {
+                                       dest.append(user->uuid);
+                                       translations++;
+                               }
+                               else
+                                       dest.append(item);
+                               dest.append(" ");
+                       }
+                       if (!dest.empty())
+                               dest.erase(dest.end() - 1);
+               }
+               break;
+               case TR_END:
+               case TR_TEXT:
+               default:
+                       /* Do nothing */
+                       dest = source;
+               break;
+       }
+
+       return translations;
+}
+