X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcommand_parse.cpp;h=fff8653b36986afa3bbed70430887ccddd936de0;hb=2fe61d7d9519056705f1eeb2842a2a0042010172;hp=f07a4ffd78aabf50676815e8e90e8d4f92acc21b;hpb=4bd22e7be8f83eefef904b775fb65d96899eb458;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/command_parse.cpp b/src/command_parse.cpp index f07a4ffd7..fff8653b3 100644 --- a/src/command_parse.cpp +++ b/src/command_parse.cpp @@ -2,15 +2,17 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2007 InspIRCd Development Team + * InspIRCd: (C) 2002-2008 InspIRCd Development Team * 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" @@ -25,10 +27,10 @@ #include #endif -int InspIRCd::OperPassCompare(const char* data,const char* input, int tagnumber) +int InspIRCd::PassCompare(Extensible* ex, const char* data,const char* input, const char* hashtype) { int MOD_RESULT = 0; - FOREACH_RESULT_I(this,I_OnOperCompare,OnOperCompare(data, input, tagnumber)) + FOREACH_RESULT_I(this,I_OnPassCompare,OnPassCompare(ex, data, input, hashtype)) if (MOD_RESULT == 1) return 0; if (MOD_RESULT == -1) @@ -46,7 +48,7 @@ int InspIRCd::OperPassCompare(const char* data,const char* input, int tagnumber) * 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 char** parameters, int pcnt, unsigned int splithere, unsigned int extra) +int CommandParser::LoopCall(User* user, Command* CommandObj, const char* const* 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. @@ -95,7 +97,7 @@ int CommandParser::LoopCall(User* user, Command* CommandObj, const char** parame return 1; } -int CommandParser::LoopCall(User* user, Command* CommandObj, const char** parameters, int pcnt, unsigned int splithere) +int CommandParser::LoopCall(User* user, Command* CommandObj, const char* const* 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. @@ -125,8 +127,6 @@ int CommandParser::LoopCall(User* user, Command* CommandObj, const char** parame new_parameters[splithere] = item.c_str(); - parameters[splithere] = item.c_str(); - /* Execute the command handler over and over. If someone pulls our user * record out from under us (e.g. if we /kill a comma sep list, and we're * in that list ourselves) abort if we're gone. @@ -178,7 +178,7 @@ Command* 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, User *user) +CmdResult CommandParser::CallHandler(const std::string &commandname,const char* const* parameters, int pcnt, User *user) { Commandable::iterator n = cmdlist.find(commandname); @@ -214,7 +214,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 +282,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 */ @@ -259,45 +290,60 @@ void CommandParser::ProcessCommand(User *user, std::string &cmd) if (cm == cmdlist.end()) { + if (user->registered == REG_ALL) + { + user->WriteNumeric(421, "%s %s :Unknown command",user->nick,command.c_str()); + } 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; + user->WriteNumeric(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; + user->WriteNumeric(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()); + user->WriteNumeric(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()); + user->WriteNumeric(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; + user->WriteNumeric(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; + user->WriteNumeric(451, "%s :You have not registered",command.c_str()); + return do_more; } else { @@ -306,10 +352,10 @@ void CommandParser::ProcessCommand(User *user, std::string &cmd) cm->second->total_bytes += cmd.length(); /* module calls too */ - int MOD_RESULT = 0; + 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 +363,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 +397,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); @@ -365,12 +411,11 @@ void CommandParser::ProcessBuffer(std::string &buffer,User *user) if (buffer.length()) { - if (!user->muted) - { - ServerInstance->Log(DEBUG,"C[%d] I :%s %s",user->GetFd(), user->nick, buffer.c_str()); - this->ProcessCommand(user,buffer); - } + ServerInstance->Logs->Log("USERINPUT", DEBUG,"C[%d] I :%s %s",user->GetFd(), user->nick, buffer.c_str()); + return this->ProcessCommand(user,buffer); } + + return true; } bool CommandParser::CreateCommand(Command *f, void* so_handle) @@ -381,7 +426,7 @@ bool CommandParser::CreateCommand(Command *f, void* so_handle) RFCCommands[f->command] = so_handle; else { - ServerInstance->Log(DEFAULT,"ERK! Somehow, we loaded a cmd_*.so file twice! Only the first instance is being recorded."); + ServerInstance->Logs->Log("COMMAND",DEFAULT,"ERK! Somehow, we loaded a cmd_*.so file twice! Only the first instance is being recorded."); return false; } } @@ -406,7 +451,7 @@ bool CommandParser::FindSym(void** v, void* h, const std::string &name) const char* err = dlerror(); if (err && !(*v)) { - ServerInstance->Log(SPARSE, "Error loading core command %s: %s\n", name.c_str(), err); + ServerInstance->Logs->Log("COMMAND",SPARSE, "Error loading core command %s: %s\n", name.c_str(), err); return false; } return true; @@ -453,13 +498,13 @@ 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* const* parameters, int /* pcnt */, User *user) { user->WriteServ("NOTICE %s :*** Reloading command '%s'",user->nick, parameters[0]); if (ServerInstance->Parser->ReloadCommand(parameters[0], user)) { user->WriteServ("NOTICE %s :*** Successfully reloaded command '%s'", user->nick, parameters[0]); - ServerInstance->WriteOpers("*** RELOAD: %s reloaded the '%s' command.", user->nick, parameters[0]); + ServerInstance->SNO->WriteToSnoMask('A', "RELOAD: %s reloaded the '%s' command.", user->nick, parameters[0]); return CMD_SUCCESS; } else @@ -478,7 +523,7 @@ const char* CommandParser::LoadCommand(const char* name) /* Command already exists? Succeed silently - this is needed for REHASH */ if (RFCCommands.find(name) != RFCCommands.end()) { - ServerInstance->Log(DEBUG,"Not reloading command %s/%s, it already exists", LIBRARYDIR, name); + ServerInstance->Logs->Log("COMMAND",DEBUG,"Not reloading command %s/%s, it already exists", LIBRARYDIR, name); return NULL; } @@ -488,7 +533,7 @@ const char* CommandParser::LoadCommand(const char* name) if (!h) { const char* n = dlerror(); - ServerInstance->Log(SPARSE, "Error loading core command %s: %s", name, n); + ServerInstance->Logs->Log("COMMAND",SPARSE, "Error loading core command %s: %s", name, n); return n; }