X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcommand_parse.cpp;h=5492e26b5d54717ca44799b40f4cb2d389ab47cd;hb=21f9acdb6c5c35b26d926f75845135f16c3c54e9;hp=e2130329b2b48b37292156285274d8949e8306ba;hpb=f490d22f6745afe28dc74169f3f57eb2dfc0cf34;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/command_parse.cpp b/src/command_parse.cpp index e2130329b..5492e26b5 100644 --- a/src/command_parse.cpp +++ b/src/command_parse.cpp @@ -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" @@ -214,7 +216,48 @@ 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... + unsigned int floodlines = 0; + + while (current->BufferIsReady()) + { + if (current->MyClass) + { + if (ServerInstance->Time() > current->reset_due) + { + current->reset_due = ServerInstance->Time() + current->MyClass->GetThreshold(); + current->lines_in = 0; + } + + if (++current->lines_in > current->MyClass->GetFlood() && current->MyClass->GetFlood()) + { + ServerInstance->FloodQuitUser(current); + return; + } + + if ((++floodlines > current->MyClass->GetFlood()) && (current->MyClass->GetFlood() != 0)) + { + ServerInstance->FloodQuitUser(current); + return; + } + } + + // use GetBuffer to copy single lines into the sanitized string + std::string single_line = current->GetBuffer(); + current->bytes_in += single_line.length(); + current->cmds_in++; + if (single_line.length() > MAXBUF - 2) // MAXBUF is 514 to allow for neccessary line terminators + single_line.resize(MAXBUF - 2); // So to trim to 512 here, we use MAXBUF - 2 + + // ProcessBuffer returns false if the user has gone over penalty + if (!ServerInstance->Parser->ProcessBuffer(single_line, current) || one_only) + break; + } +} + +bool CommandParser::ProcessCommand(User *user, std::string &cmd) { const char *command_p[MAXPARAMETERS]; int items = 0; @@ -241,17 +284,7 @@ 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; - } - - 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; + return true; } /* find the command, check it exists */ @@ -261,22 +294,34 @@ void CommandParser::ProcessCommand(User *user, std::string &cmd) { ServerInstance->stats->statsUnknown++; user->WriteServ("421 %s %s :Unknown command",user->nick,command.c_str()); - return; + return true; + } + + /* Modify the user's penalty */ + bool do_more = true; + if (!user->ExemptFromPenalty) + { + user->IncreasePenalty(cm->second->Penalty); + do_more = (user->Penalty < 10); + if (!do_more) + user->OverPenalty = true; } /* activity resets the ping pending timer */ - user->nping = ServerInstance->Time() + user->pingmax; + if (user->MyClass) + user->nping = ServerInstance->Time() + user->MyClass->GetPingTime(); + 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; + 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; + return do_more; } } if ((user->registered == REG_ALL) && (!IS_OPER(user)) && (cm->second->IsDisabled())) @@ -285,19 +330,19 @@ void CommandParser::ProcessCommand(User *user, std::string &cmd) 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; + 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; + return do_more; } if ((user->registered != REG_ALL) && (!cm->second->WorksBeforeReg())) { user->WriteServ("451 %s :You have not registered",command.c_str()); - return; + return do_more; } else { @@ -309,7 +354,7 @@ void CommandParser::ProcessCommand(User *user, std::string &cmd) int MOD_RESULT = 0; FOREACH_RESULT(I_OnPreCommand,OnPreCommand(command,command_p,items,user,true,cmd)); if (MOD_RESULT == 1) - return; + return do_more; /* * WARNING: be careful, the user may be deleted soon @@ -317,7 +362,7 @@ void CommandParser::ProcessCommand(User *user, std::string &cmd) CmdResult result = cm->second->Handle(command_p,items,user); FOREACH_MOD(I_OnPostCommand,OnPostCommand(command, command_p, items, user, result,cmd)); - return; + return do_more; } } @@ -351,12 +396,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); @@ -368,9 +413,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) @@ -453,7 +499,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)) @@ -552,24 +598,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: { @@ -584,7 +626,7 @@ int CommandParser::TranslateUIDs(TranslateType to, const std::string &source, st translations++; } else - dest.append(source); + dest.append(item); dest.append(","); } if (!dest.empty()) @@ -604,7 +646,7 @@ int CommandParser::TranslateUIDs(TranslateType to, const std::string &source, st translations++; } else - dest.append(source); + dest.append(item); dest.append(" "); } if (!dest.empty())