X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcommand_parse.cpp;h=e4eb57e80bb10cad9d03dbc4d494a0d237e7c256;hb=0ed3ef9dee2cb8f4b0c37da218a2fd1eee8c31f6;hp=409444e0c3db3493b6e397f4b44e5738e0341247;hpb=408d516f781b77f66929ce3e5ca58b88888b1ede;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/command_parse.cpp b/src/command_parse.cpp index 409444e0c..e4eb57e80 100644 --- a/src/command_parse.cpp +++ b/src/command_parse.cpp @@ -28,15 +28,15 @@ int InspIRCd::PassCompare(Extensible* ex, const std::string &data, const std::string &input, const std::string &hashtype) { - int MOD_RESULT = 0; - FOREACH_RESULT_I(this,I_OnPassCompare,OnPassCompare(ex, data, input, hashtype)) + ModResult res; + FIRST_MOD_RESULT(this, OnPassCompare, res, (ex, data, input, hashtype)); /* Module matched */ - if (MOD_RESULT == 1) + if (res == MOD_RES_ALLOW) return 0; /* Module explicitly didnt match */ - if (MOD_RESULT == -1) + if (res == MOD_RES_DENY) return 1; /* We dont handle any hash types except for plaintext - Thanks tra26 */ @@ -161,7 +161,7 @@ bool CommandParser::IsValidCommand(const std::string &commandname, unsigned int if (n != cmdlist.end()) { - if ((pcnt >= n->second->min_params) && (n->second->source != "")) + if ((pcnt >= n->second->min_params)) { if (IS_LOCAL(user) && n->second->flags_needed) { @@ -266,11 +266,21 @@ bool CommandParser::ProcessCommand(User *user, std::string &cmd) /* 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; - FOREACH_RESULT(I_OnPreCommand,OnPreCommand(command, command_p, user, false, cmd)); - if (MOD_RESULT == 1) + ModResult MOD_RESULT; + FIRST_MOD_RESULT(ServerInstance, OnPreCommand, MOD_RESULT, (command, command_p, user, false, cmd)); + if (MOD_RESULT == MOD_RES_DENY) return true; /* @@ -331,19 +341,11 @@ bool CommandParser::ProcessCommand(User *user, std::string &cmd) * 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) + ModResult MOD_RESULT; + FIRST_MOD_RESULT(ServerInstance, OnPreCommand, MOD_RESULT, (command, command_p, user, false, cmd)); + if (MOD_RESULT == MOD_RES_DENY) return true; - /* Modify the user's penalty */ - bool do_more = true; - if (!user->HasPrivPermission("users/flood/no-throttle")) - { - user->IncreasePenalty(cm->second->Penalty); - do_more = (user->Penalty < 10); - } - /* activity resets the ping pending timer */ if (user->MyClass) user->nping = ServerInstance->Time() + user->MyClass->GetPingTime(); @@ -397,9 +399,8 @@ bool CommandParser::ProcessCommand(User *user, std::string &cmd) cm->second->total_bytes += cmd.length(); /* module calls too */ - MOD_RESULT = 0; - FOREACH_RESULT(I_OnPreCommand,OnPreCommand(command, command_p, user, true, cmd)); - if (MOD_RESULT == 1) + FIRST_MOD_RESULT(ServerInstance, OnPreCommand, MOD_RESULT, (command, command_p, user, true, cmd)); + if (MOD_RESULT == MOD_RES_DENY) return do_more; /* @@ -412,7 +413,7 @@ bool CommandParser::ProcessCommand(User *user, std::string &cmd) } } -void CommandParser::RemoveCommands(const char* source) +void CommandParser::RemoveCommands(Module* source) { Commandtable::iterator i,safei; for (i = cmdlist.begin(); i != cmdlist.end();) @@ -423,13 +424,12 @@ void CommandParser::RemoveCommands(const char* source) } } -void CommandParser::RemoveCommand(Commandtable::iterator safei, const char* source) +void CommandParser::RemoveCommand(Commandtable::iterator safei, Module* source) { Command* x = safei->second; - if (x->source == std::string(source)) + if (x->creator == source) { cmdlist.erase(safei); - delete x; } } @@ -454,26 +454,15 @@ bool CommandParser::ProcessBuffer(std::string &buffer,User *user) return true; } -bool CommandParser::CreateCommand(Command *f, void* so_handle) +bool CommandParser::CreateCommand(Command *f) { - if (so_handle) - { - if (RFCCommands.find(f->command) == RFCCommands.end()) - RFCCommands[f->command] = so_handle; - else - { - ServerInstance->Logs->Log("COMMAND",DEFAULT,"ERK! Somehow, we loaded a cmd_*.so file twice! Only the first instance is being recorded."); - return false; - } - } - /* create the command and push it onto the table */ if (cmdlist.find(f->command) == cmdlist.end()) { cmdlist[f->command] = f; return true; } - else return false; + return false; } CommandParser::CommandParser(InspIRCd* Instance) : ServerInstance(Instance) @@ -481,145 +470,29 @@ CommandParser::CommandParser(InspIRCd* Instance) : ServerInstance(Instance) para.resize(128); } -bool CommandParser::FindSym(void** v, void* h, const std::string &name) -{ - *v = dlsym(h, "init_command"); - const char* err = dlerror(); - if (err && !(*v)) - { - ServerInstance->Logs->Log("COMMAND",SPARSE, "Error loading core command %s: %s\n", name.c_str(), err); - return false; - } - return true; -} - -bool CommandParser::ReloadCommand(std::string cmd, User* user) -{ - char filename[MAXBUF]; - std::transform(cmd.begin(), cmd.end(), cmd.begin(), ::toupper); - - SharedObjectList::iterator command = RFCCommands.find(cmd); - - if (command != RFCCommands.end()) - { - Command* cmdptr = cmdlist.find(cmd)->second; - cmdlist.erase(cmdlist.find(cmd)); - - RFCCommands.erase(cmd); - delete cmdptr; - dlclose(command->second); - } - - 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 CommandReload::Handle(const std::vector& parameters, User *user) -{ - if (parameters.size() < 1) - return CMD_FAILURE; - - user->WriteServ("NOTICE %s :*** Reloading command '%s'",user->nick.c_str(), parameters[0].c_str()); - 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()); - return CMD_SUCCESS; - } - else - { - 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; - } -} - -const char* CommandParser::LoadCommand(const char* name) +int CommandParser::TranslateUIDs(const std::vector to, const std::vector &source, std::string &dest, bool prefix_final, Command* custom_translator) { - char filename[MAXBUF]; - void* h; - Command* (*cmd_factory_func)(InspIRCd*); - - /* Command already exists? Succeed silently - this is needed for REHASH */ - if (RFCCommands.find(name) != RFCCommands.end()) - { - ServerInstance->Logs->Log("COMMAND",DEBUG,"Not reloading command %s/%s, it already exists", LIBRARYDIR, name); - return NULL; - } - - snprintf(filename, MAXBUF, "%s/%s", LIBRARYDIR, name); - h = dlopen(filename, RTLD_NOW | RTLD_GLOBAL); - - if (!h) - { - const char* n = dlerror(); - ServerInstance->Logs->Log("COMMAND",SPARSE, "Error loading core command %s: %s", name, n); - return n; - } + std::vector::const_iterator types = to.begin(); + User* user = NULL; + unsigned int i; + int translations = 0; + dest.clear(); - if (this->FindSym((void **)&cmd_factory_func, h, name)) + for(i=0; i < source.size(); i++) { - Command* newcommand = cmd_factory_func(ServerInstance); - this->CreateCommand(newcommand, h); - } - return NULL; -} + TranslateType t; + std::string item = source[i]; -/** This is only invoked on startup - */ -void CommandParser::SetupCommandTable() -{ - printf("\nLoading core commands"); - fflush(stdout); - - DIR* library = opendir(LIBRARYDIR); - if (library) - { - dirent* entry = NULL; - while (0 != (entry = readdir(library))) + if (types == to.end()) + t = TR_TEXT; + else { - if (InspIRCd::Match(entry->d_name, "cmd_*.so", ascii_case_insensitive_map)) - { - printf("."); - fflush(stdout); - - const char* err = this->LoadCommand(entry->d_name); - if (err) - { - printf("Error loading %s: %s", entry->d_name, err); - exit(EXIT_STATUS_BADHANDLER); - } - } + t = *types; + types++; } - closedir(library); - printf("\n"); - } - - if (cmdlist.find("RELOAD") == cmdlist.end()) - this->CreateCommand(new CommandReload(ServerInstance)); -} - -int CommandParser::TranslateUIDs(const std::deque to, const std::deque &source, std::string &dest) -{ - std::deque::const_iterator items = source.begin(); - std::deque::const_iterator types = to.begin(); - User* user = NULL; - int translations = 0; - dest.clear(); - while (items != source.end() && types != to.end()) - { - TranslateType t = *types; - std::string item = *items; - types++; - items++; + if (prefix_final && i == source.size() - 1) + dest.append(":"); switch (t) { @@ -634,6 +507,10 @@ int CommandParser::TranslateUIDs(const std::deque to, const std:: 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: @@ -642,11 +519,10 @@ int CommandParser::TranslateUIDs(const std::deque to, const std:: dest.append(item); break; } - dest.append(" "); + if (i != source.size() - 1) + dest.append(" "); } - if (!dest.empty()) - dest.erase(dest.end() - 1); return translations; }