X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcommand_parse.cpp;h=9ea7b020229569b13fd46358effdefbac880ebf1;hb=117742632909d9bfd71fc4feb3304263558101b7;hp=fd103908829c1e481abe73d24605bea743c7878e;hpb=813c8981600b440a7cf762607fa6518b9e9b3d56;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/command_parse.cpp b/src/command_parse.cpp index fd1039088..9ea7b0202 100644 --- a/src/command_parse.cpp +++ b/src/command_parse.cpp @@ -2,7 +2,7 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2008 InspIRCd Development Team + * InspIRCd: (C) 2002-2009 InspIRCd Development Team * See: http://www.inspircd.org/wiki/index.php/Credits * * This program is free but copyrighted software; see @@ -30,11 +30,21 @@ int InspIRCd::PassCompare(Extensible* ex, const std::string &data, const std::st { int MOD_RESULT = 0; FOREACH_RESULT_I(this,I_OnPassCompare,OnPassCompare(ex, data, input, hashtype)) + + /* Module matched */ if (MOD_RESULT == 1) return 0; + + /* Module explicitly didnt match */ if (MOD_RESULT == -1) return 1; - return data != input; // this seems back to front, but returns 0 if they *match*, 1 else + + /* We dont handle any hash types except for plaintext - Thanks tra26 */ + if (hashtype != "" && hashtype != "plaintext") + /* See below. 1 because they dont match */ + return 1; + + return (data != input); // this seems back to front, but returns 0 if they *match*, 1 else } /* LoopCall is used to call a command classes handler repeatedly based on the contents of a comma seperated list. @@ -59,10 +69,10 @@ int CommandParser::LoopCall(User* user, Command* CommandObj, const std::vector dupes; + std::set dupes; /* Create two lists, one for channel names, one for keys */ @@ -93,7 +103,7 @@ int CommandParser::LoopCall(User* user, Command* CommandObj, const std::vectorHandle(new_parameters, user); - dupes[item.c_str()] = true; + dupes.insert(item.c_str()); } } return 1; @@ -110,7 +120,7 @@ int CommandParser::LoopCall(User* user, Command* CommandObj, const std::vector dupes; + std::set dupes; /* Only one commasepstream here */ irc::commasepstream items1(parameters[splithere]); @@ -135,7 +145,7 @@ int CommandParser::LoopCall(User* user, Command* CommandObj, const std::vectorHandle(new_parameters, user); - dupes[item.c_str()] = true; + dupes.insert(item.c_str()); } } /* By returning 1 we tell our caller that nothing is to be done, @@ -218,32 +228,8 @@ CmdResult CommandParser::CallHandler(const std::string &commandname, const std:: 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(); @@ -287,10 +273,21 @@ bool CommandParser::ProcessCommand(User *user, std::string &cmd) if (MOD_RESULT == 1) return true; - if (user->registered == REG_ALL) - user->WriteNumeric(ERR_UNKNOWNCOMMAND, "%s %s :Unknown command",user->nick.c_str(),command.c_str()); - ServerInstance->stats->statsUnknown++; - return true; + /* + * 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 + */ + cm = cmdlist.find(command); + if (cm == cmdlist.end()) + { + if (user->registered == REG_ALL) + user->WriteNumeric(ERR_UNKNOWNCOMMAND, "%s %s :Unknown command",user->nick.c_str(),command.c_str()); + ServerInstance->stats->statsUnknown++; + return true; + } } if (cm->second->max_params && command_p.size() > cm->second->max_params) @@ -330,6 +327,10 @@ bool CommandParser::ProcessCommand(User *user, std::string &cmd) command_p.push_back(lparam); } + /* + * We call OnPreCommand here seperately if the command exists, so the magic above can + * truncate to max_params if necessary. -- w00t + */ int MOD_RESULT = 0; FOREACH_RESULT(I_OnPreCommand,OnPreCommand(command, command_p, user, false, cmd)); if (MOD_RESULT == 1) @@ -337,12 +338,10 @@ bool CommandParser::ProcessCommand(User *user, std::string &cmd) /* Modify the user's penalty */ bool do_more = true; - if (!user->ExemptFromPenalty) + if (!user->HasPrivPermission("users/flood/no-throttle")) { user->IncreasePenalty(cm->second->Penalty); do_more = (user->Penalty < 10); - if (!do_more) - user->OverPenalty = true; } /* activity resets the ping pending timer */ @@ -526,7 +525,7 @@ bool CommandParser::ReloadCommand(std::string cmd, User* user) return false; } -CmdResult cmd_reload::Handle(const std::vector& parameters, User *user) +CmdResult CommandReload::Handle(const std::vector& parameters, User *user) { if (parameters.size() < 1) return CMD_FAILURE; @@ -576,15 +575,12 @@ const char* CommandParser::LoadCommand(const char* name) return NULL; } -void CommandParser::SetupCommandTable(User* user) +/** This is only invoked on startup + */ +void CommandParser::SetupCommandTable() { - RFCCommands.clear(); - - if (!user) - { - printf("\nLoading core commands"); - fflush(stdout); - } + printf("\nLoading core commands"); + fflush(stdout); DIR* library = opendir(LIBRARYDIR); if (library) @@ -592,35 +588,25 @@ void CommandParser::SetupCommandTable(User* user) dirent* entry = NULL; while (0 != (entry = readdir(library))) { - if (InspIRCd::Match(entry->d_name, "cmd_*.so")) + if (InspIRCd::Match(entry->d_name, "cmd_*.so", ascii_case_insensitive_map)) { - if (!user) - { - printf("."); - fflush(stdout); - } + printf("."); + fflush(stdout); + const char* err = this->LoadCommand(entry->d_name); if (err) { - if (user) - { - user->WriteServ("NOTICE %s :*** Failed to load core command %s: %s", user->nick.c_str(), entry->d_name, err); - } - else - { - printf("Error loading %s: %s", entry->d_name, err); - exit(EXIT_STATUS_BADHANDLER); - } + printf("Error loading %s: %s", entry->d_name, err); + exit(EXIT_STATUS_BADHANDLER); } } } closedir(library); - if (!user) - printf("\n"); + printf("\n"); } if (cmdlist.find("RELOAD") == cmdlist.end()) - this->CreateCommand(new cmd_reload(ServerInstance)); + this->CreateCommand(new CommandReload(ServerInstance)); } int CommandParser::TranslateUIDs(TranslateType to, const std::string &source, std::string &dest)