X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcommand_parse.cpp;h=b063e392ce9293b2dbb3baf5b5e41c612ea9f6ca;hb=7c340cba11b16d3c4a95c274c22f1617ac4711f2;hp=fd103908829c1e481abe73d24605bea743c7878e;hpb=813c8981600b440a7cf762607fa6518b9e9b3d56;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/command_parse.cpp b/src/command_parse.cpp index fd1039088..b063e392c 100644 --- a/src/command_parse.cpp +++ b/src/command_parse.cpp @@ -2,8 +2,8 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2008 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * InspIRCd: (C) 2002-2009 InspIRCd Development Team + * See: http://wiki.inspircd.org/Credits * * This program is free but copyrighted software; see * the file COPYING for details. @@ -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(); @@ -276,10 +262,20 @@ bool CommandParser::ProcessCommand(User *user, std::string &cmd) command_p.push_back(token); std::transform(command.begin(), command.end(), command.begin(), ::toupper); - + /* find the command, check it exists */ Commandtable::iterator cm = cmdlist.find(command); - + + /* Modify the user's penalty regardless of whether or not the command exists */ + bool do_more = true; + if (!user->HasPrivPermission("users/flood/no-throttle")) + { + // If it *doesn't* exist, give it a slightly heftier penalty than normal to deter flooding us crap + user->IncreasePenalty(cm != cmdlist.end() ? cm->second->Penalty : 2); + do_more = (user->Penalty < 10); + } + + if (cm == cmdlist.end()) { int MOD_RESULT = 0; @@ -287,10 +283,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) @@ -313,7 +320,7 @@ bool CommandParser::ProcessCommand(User *user, std::string &cmd) { // BE CAREFUL: .end() returns past the end of the vector, hence decrement. std::vector::iterator it = --command_p.end(); - + lparam.insert(0, " " + *(it)); command_p.erase(it); // remove last element } @@ -330,21 +337,15 @@ 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) 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 */ if (user->MyClass) user->nping = ServerInstance->Time() + user->MyClass->GetPingTime(); @@ -375,7 +376,7 @@ bool CommandParser::ProcessCommand(User *user, std::string &cmd) user->nick.c_str(), command.c_str()); } - ServerInstance->SNO->WriteToSnoMask('d', "%s denied for %s (%s@%s)", + ServerInstance->SNO->WriteToSnoMask('t', "%s denied for %s (%s@%s)", command.c_str(), user->nick.c_str(), user->ident.c_str(), user->host.c_str()); return do_more; } @@ -430,7 +431,6 @@ void CommandParser::RemoveCommand(Commandtable::iterator safei, const char* sour if (x->source == std::string(source)) { cmdlist.erase(safei); - delete x; } } @@ -507,26 +507,23 @@ bool CommandParser::ReloadCommand(std::string cmd, User* user) cmdlist.erase(cmdlist.find(cmd)); RFCCommands.erase(cmd); - std::transform(cmd.begin(), cmd.end(), cmd.begin(), ::tolower); delete cmdptr; dlclose(command->second); - - snprintf(filename, MAXBUF, "cmd_%s.so", cmd.c_str()); - const char* err = this->LoadCommand(filename); - if (err) - { - if (user) - user->WriteServ("NOTICE %s :*** Error loading 'cmd_%s.so': %s", user->nick.c_str(), cmd.c_str(), err); - return false; - } - - return true; } - return false; + std::transform(cmd.begin(), cmd.end(), cmd.begin(), ::tolower); + snprintf(filename, MAXBUF, "cmd_%s.so", cmd.c_str()); + const char* err = this->LoadCommand(filename); + if (err) + { + if (user) + user->WriteServ("NOTICE %s :*** Error loading '%s': %s", user->nick.c_str(), filename, err); + return false; + } + return true; } -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; @@ -535,12 +532,12 @@ CmdResult cmd_reload::Handle(const std::vector& parameters, User *u if (ServerInstance->Parser->ReloadCommand(parameters[0], user)) { user->WriteServ("NOTICE %s :*** Successfully reloaded command '%s'", user->nick.c_str(), parameters[0].c_str()); - ServerInstance->SNO->WriteToSnoMask('A', "RELOAD: %s reloaded the '%s' command.", user->nick.c_str(), parameters[0].c_str()); + ServerInstance->SNO->WriteToSnoMask('a', "RELOAD: %s reloaded the '%s' command.", user->nick.c_str(), parameters[0].c_str()); return CMD_SUCCESS; } else { - user->WriteServ("NOTICE %s :*** Could not reload command '%s' -- fix this problem, then /REHASH as soon as possible!", user->nick.c_str(), parameters[0].c_str()); + user->WriteServ("NOTICE %s :*** Could not reload command '%s'. The command will not work until reloaded successfully.", user->nick.c_str(), parameters[0].c_str()); return CMD_FAILURE; } } @@ -576,15 +573,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 +586,81 @@ 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(const std::vector to, const std::vector &source, std::string &dest, bool prefix_final, Command* custom_translator) +{ + std::vector::const_iterator types = to.begin(); + User* user = NULL; + unsigned int i; + int translations = 0; + dest.clear(); + + for(i=0; i < source.size(); i++) + { + TranslateType t; + std::string item = source[i]; + + if (types == to.end()) + t = TR_TEXT; + else + { + t = *types; + types++; + } + + if (prefix_final && i == source.size() - 1) + dest.append(":"); + + switch (t) + { + case TR_NICK: + /* Translate single nickname */ + user = ServerInstance->FindNick(item); + if (user) + { + dest.append(user->uuid); + translations++; + } + else + dest.append(item); + break; + case TR_CUSTOM: + if (custom_translator) + custom_translator->EncodeParameter(item, i); + dest.append(item); + break; + case TR_END: + case TR_TEXT: + default: + /* Do nothing */ + dest.append(item); + break; + } + if (i != source.size() - 1) + dest.append(" "); + } + + return translations; } int CommandParser::TranslateUIDs(TranslateType to, const std::string &source, std::string &dest) @@ -643,46 +683,6 @@ int CommandParser::TranslateUIDs(TranslateType to, const std::string &source, st 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: @@ -693,5 +693,3 @@ int CommandParser::TranslateUIDs(TranslateType to, const std::string &source, st return translations; } - -