X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcommand_parse.cpp;h=eeb4b3e9fb0ea2b58b05608e7523eb32893b5aac;hb=da29af8cba49d51e53d6e68237ccbf6370b6dd1f;hp=6db10658bd5064350dd4a5b01c358f22dd17fffa;hpb=d3c7457dda8555e410f4fbc36bb1b1b4cb0ae3f2;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/command_parse.cpp b/src/command_parse.cpp index 6db10658b..514394a57 100644 --- a/src/command_parse.cpp +++ b/src/command_parse.cpp @@ -1,177 +1,115 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd: (C) 2002-2007 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * Copyright (C) 2009-2010 Daniel De Graaf + * Copyright (C) 2006-2008 Robin Burchell + * Copyright (C) 2008 Thomas Stagner + * Copyright (C) 2005-2008 Craig Edwards + * Copyright (C) 2006-2007 Dennis Friis * - * This program is free but copyrighted software; see - * the file COPYING for details. + * This file is part of InspIRCd. InspIRCd is free software: you can + * redistribute it and/or modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation, version 2. * - * --------------------------------------------------- + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ -/* $Core: libIRCDcommand_parse */ #include "inspircd.h" -#include "wildcard.h" -#include "xline.h" -#include "socketengine.h" -#include "socket.h" -#include "command_parse.h" -#include "exitcodes.h" - -/* Directory Searching for Unix-Only */ -#ifndef WIN32 -#include -#include -#endif - -int InspIRCd::OperPassCompare(const char* data,const char* input, int tagnumber) -{ - int MOD_RESULT = 0; - FOREACH_RESULT_I(this,I_OnOperCompare,OnOperCompare(data, input, tagnumber)) - if (MOD_RESULT == 1) - return 0; - if (MOD_RESULT == -1) - return 1; - return strcmp(data,input); -} -/* LoopCall is used to call a command classes handler repeatedly based on the contents of a comma seperated list. - * There are two overriden versions of this method, one of which takes two potential lists and the other takes one. - * We need a version which takes two potential lists for JOIN, because a JOIN may contain two lists of items at once, - * the channel names and their keys as follows: - * JOIN #chan1,#chan2,#chan3 key1,,key3 - * Therefore, we need to deal with both lists concurrently. The first instance of this method does that by creating - * two instances of irc::commasepstream and reading them both together until the first runs out of tokens. - * 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) +bool InspIRCd::PassCompare(Extensible* ex, const std::string& data, const std::string& input, const std::string& hashtype) { - /* 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. - */ - if (!strchr(parameters[splithere],',')) - return 0; - - /** Some lame ircds will weed out dupes using some shitty O(n^2) algorithm. - * By using std::map (thanks for the idea w00t) we can cut this down a ton. - * ...VOOODOOOO! - */ - std::map dupes; + ModResult res; + FIRST_MOD_RESULT(OnPassCompare, res, (ex, data, input, hashtype)); - /* Create two lists, one for channel names, one for keys - */ - irc::commasepstream items1(parameters[splithere]); - irc::commasepstream items2(parameters[extra]); - std::string extrastuff; - std::string item; - unsigned int max = 0; - - /* Attempt to iterate these lists and call the command objech - * which called us, for every parameter pair until there are - * no more left to parse. - */ - while (items1.GetToken(item) && (max++ < ServerInstance->Config->MaxTargets)) - { - if (dupes.find(item.c_str()) == dupes.end()) - { - const char* new_parameters[MAXPARAMETERS]; - - for (int t = 0; (t < pcnt) && (t < MAXPARAMETERS); t++) - new_parameters[t] = parameters[t]; - - if (!items2.GetToken(extrastuff)) - extrastuff = ""; + /* Module matched */ + if (res == MOD_RES_ALLOW) + return true; - new_parameters[splithere] = item.c_str(); - new_parameters[extra] = extrastuff.c_str(); + /* Module explicitly didnt match */ + if (res == MOD_RES_DENY) + return false; - CommandObj->Handle(new_parameters,pcnt,user); + /* We dont handle any hash types except for plaintext - Thanks tra26 */ + if (!hashtype.empty() && hashtype != "plaintext") + return false; - dupes[item.c_str()] = true; - } - } - return 1; + return TimingSafeCompare(data, input); } -int CommandParser::LoopCall(User* user, Command* CommandObj, const char** parameters, int pcnt, unsigned int splithere) +bool CommandParser::LoopCall(User* user, Command* handler, const std::vector& parameters, unsigned int splithere, int extra, bool usemax) { - /* First check if we have more than one item in the list, if we don't we return zero here and the handler + if (splithere >= parameters.size()) + return false; + + /* First check if we have more than one item in the list, if we don't we return false here and the handler * which called us just carries on as it was. */ - if (!strchr(parameters[splithere],',')) - return 0; + if (parameters[splithere].find(',') == std::string::npos) + return false; - std::map dupes; + /** Some lame ircds will weed out dupes using some shitty O(n^2) algorithm. + * By using std::set (thanks for the idea w00t) we can cut this down a ton. + * ...VOOODOOOO! + * + * Only check for duplicates if there is one list (allow them in JOIN). + */ + insp::flat_set dupes; + bool check_dupes = (extra < 0); - /* Only one commasepstream here */ + /* Create two sepstreams, if we have only one list, then initialize the second sepstream with + * an empty string. The second parameter of the constructor of the sepstream tells whether + * or not to allow empty tokens. + * We allow empty keys, so "JOIN #a,#b ,bkey" will be interpreted as "JOIN #a", "JOIN #b bkey" + */ irc::commasepstream items1(parameters[splithere]); + irc::commasepstream items2(extra >= 0 ? parameters[extra] : "", true); std::string item; unsigned int max = 0; + LocalUser* localuser = IS_LOCAL(user); - /* Parse the commasepstream until there are no tokens remaining. - * Each token we parse out, call the command handler that called us - * with it + /* Attempt to iterate these lists and call the command handler + * for every parameter or parameter pair until there are no more + * left to parse. */ - while (items1.GetToken(item) && (max++ < ServerInstance->Config->MaxTargets)) + while (items1.GetToken(item) && (!usemax || max++ < ServerInstance->Config->MaxTargets)) { - if (dupes.find(item.c_str()) == dupes.end()) + if ((!check_dupes) || (dupes.insert(item.c_str()).second)) { - const char* new_parameters[MAXPARAMETERS]; - - for (int t = 0; (t < pcnt) && (t < MAXPARAMETERS); t++) - new_parameters[t] = parameters[t]; - - 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. - */ - CommandObj->Handle(new_parameters,pcnt,user); - - dupes[item.c_str()] = true; - } - } - /* By returning 1 we tell our caller that nothing is to be done, - * as all the previous calls handled the data. This makes the parent - * return without doing any processing. - */ - return 1; -} - -bool CommandParser::IsValidCommand(const std::string &commandname, int pcnt, User * user) -{ - Commandable::iterator n = cmdlist.find(commandname); + std::vector new_parameters(parameters); + new_parameters[splithere] = item; - if (n != cmdlist.end()) - { - if ((pcnt>=n->second->min_params) && (n->second->source != "")) - { - if (IS_LOCAL(user) && n->second->flags_needed) + if (extra >= 0) { - if (user->IsModeSet(n->second->flags_needed)) - { - return (user->HasPermission(commandname)); - } + // If we have two lists then get the next item from the second list. + // In case it runs out of elements then 'item' will be an empty string. + items2.GetToken(item); + new_parameters[extra] = item; } - else + + CmdResult result = handler->Handle(new_parameters, user); + if (localuser) { - return true; + // Run the OnPostCommand hook with the last parameter (original line) being empty + // to indicate that the command had more targets in its original form. + item.clear(); + FOREACH_MOD(OnPostCommand, (handler, new_parameters, localuser, result, item)); } } } - return false; + + return true; } Command* CommandParser::GetHandler(const std::string &commandname) { - Commandable::iterator n = cmdlist.find(commandname); + CommandMap::iterator n = cmdlist.find(commandname); if (n != cmdlist.end()) return n->second; @@ -180,13 +118,16 @@ 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 std::vector& parameters, User* user, Command** cmd) { - Commandable::iterator n = cmdlist.find(commandname); + CommandMap::iterator n = cmdlist.find(commandname); if (n != cmdlist.end()) { - if (pcnt >= n->second->min_params) + if ((!parameters.empty()) && (parameters.back().empty()) && (!n->second->allow_empty_last_param)) + return CMD_INVALID; + + if (parameters.size() >= n->second->min_params) { bool bOkay = false; @@ -209,57 +150,20 @@ CmdResult CommandParser::CallHandler(const std::string &commandname,const char** if (bOkay) { - return n->second->Handle(parameters,pcnt,user); + if (cmd) + *cmd = n->second; + return n->second->Handle(parameters,user); } } } return CMD_INVALID; } -void CommandParser::DoLines(User* current, bool one_only) -{ - // while there are complete lines to process... - int floodlines = 0; - - while (current->BufferIsReady()) - { - if (ServerInstance->Time() > current->reset_due) - { - current->reset_due = ServerInstance->Time() + current->threshold; - current->lines_in = 0; - } - - if (++current->lines_in > current->flood && current->flood) - { - ServerInstance->FloodQuitUser(current); - return; - } - - if ((++floodlines > current->flood) && (current->flood != 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) +void CommandParser::ProcessCommand(LocalUser *user, std::string &cmd) { - const char *command_p[MAXPARAMETERS]; - int items = 0; + std::vector command_p; irc::tokenstream tokens(cmd); - std::string command; + std::string command, token; tokens.GetToken(command); /* A client sent a nick prefix on their command (ick) @@ -267,409 +171,303 @@ bool CommandParser::ProcessCommand(User *user, std::string &cmd) * the rfc says they shouldnt but also says the ircd should * discard it if they do. */ - if (*command.c_str() == ':') + if (command[0] == ':') tokens.GetToken(command); - while (tokens.GetToken(para[items]) && (items < MAXPARAMETERS)) - { - command_p[items] = para[items].c_str(); - items++; - } + while (tokens.GetToken(token)) + command_p.push_back(token); std::transform(command.begin(), command.end(), command.begin(), ::toupper); - - int MOD_RESULT = 0; - FOREACH_RESULT(I_OnPreCommand,OnPreCommand(command,command_p,items,user,false,cmd)); - if (MOD_RESULT == 1) { - return true; + + /* find the command, check it exists */ + Command* handler = GetHandler(command); + + // Penalty to give if the command fails before the handler is executed + unsigned int failpenalty = 0; + + /* Modify the user's penalty regardless of whether or not the command exists */ + 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 + unsigned int penalty = (handler ? handler->Penalty * 1000 : 2000); + user->CommandFloodPenalty += penalty; + + // Increase their penalty later if we fail and the command has 0 penalty by default (i.e. in Command::Penalty) to + // throttle sending ERR_* from the command parser. If the command does have a non-zero penalty then this is not + // needed because we've increased their penalty above. + if (penalty == 0) + failpenalty = 1000; } - if (!user) + if (!handler) { + ModResult MOD_RESULT; + FIRST_MOD_RESULT(OnPreCommand, MOD_RESULT, (command, command_p, user, false, cmd)); + if (MOD_RESULT == MOD_RES_DENY) + return; + /* - * 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 + * 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 */ - return true; + handler = GetHandler(command); + if (!handler) + { + if (user->registered == REG_ALL) + user->WriteNumeric(ERR_UNKNOWNCOMMAND, command, "Unknown command"); + ServerInstance->stats.Unknown++; + return; + } } - /* find the command, check it exists */ - Commandable::iterator cm = cmdlist.find(command); - - if (cm == cmdlist.end()) + // If we were given more parameters than max_params then append the excess parameter(s) + // to command_p[maxparams-1], i.e. to the last param that is still allowed + if (handler->max_params && command_p.size() > handler->max_params) { - ServerInstance->stats->statsUnknown++; - user->WriteServ("421 %s %s :Unknown command",user->nick,command.c_str()); - return true; - } + /* + * command_p input (assuming max_params 1): + * this + * is + * a + * test + */ - /* Modify the user's penalty */ - bool do_more = true; - if (!user->ExemptFromPenalty) - { - user->IncreasePenalty(cm->second->Penalty); - ServerInstance->Log(DEBUG,"Penalty for %s is now incremented to %d (%d added on)", user->nick, user->Penalty, cm->second->Penalty); - do_more = (user->Penalty < 10); - if (!do_more) + // Iterator to the last parameter that will be kept + const std::vector::iterator lastkeep = command_p.begin() + (handler->max_params - 1); + // Iterator to the first excess parameter + const std::vector::iterator firstexcess = lastkeep + 1; + + // Append all excess parameter(s) to the last parameter, seperated by spaces + for (std::vector::const_iterator i = firstexcess; i != command_p.end(); ++i) { - user->OverPenalty = true; - ServerInstance->Log(DEBUG,"User %s now OVER penalty of 10", user->nick); + lastkeep->push_back(' '); + lastkeep->append(*i); } + + // Erase the excess parameter(s) + command_p.erase(firstexcess, command_p.end()); } + /* + * We call OnPreCommand here seperately if the command exists, so the magic above can + * truncate to max_params if necessary. -- w00t + */ + ModResult MOD_RESULT; + FIRST_MOD_RESULT(OnPreCommand, MOD_RESULT, (command, command_p, user, false, cmd)); + if (MOD_RESULT == MOD_RES_DENY) + return; + /* activity resets the ping pending timer */ - user->nping = ServerInstance->Time() + user->pingmax; - if (cm->second->flags_needed) + user->nping = ServerInstance->Time() + user->MyClass->GetPingTime(); + + if (handler->flags_needed) { - if (!user->IsModeSet(cm->second->flags_needed)) + if (!user->IsModeSet(handler->flags_needed)) { - user->WriteServ("481 %s :Permission Denied - You do not have the required operator privileges",user->nick); - return do_more; + user->CommandFloodPenalty += failpenalty; + user->WriteNumeric(ERR_NOPRIVILEGES, "Permission Denied - You do not have the required operator privileges"); + return; } + 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 do_more; + user->CommandFloodPenalty += failpenalty; + user->WriteNumeric(ERR_NOPRIVILEGES, InspIRCd::Format("Permission Denied - Oper type %s does not have access to command %s", + user->oper->name.c_str(), command.c_str())); + return; } } - if ((user->registered == REG_ALL) && (!IS_OPER(user)) && (cm->second->IsDisabled())) + + if ((user->registered == REG_ALL) && (!user->IsOper()) && (handler->IsDisabled())) { /* command is disabled! */ - 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 do_more; + user->CommandFloodPenalty += failpenalty; + if (ServerInstance->Config->DisabledDontExist) + { + user->WriteNumeric(ERR_UNKNOWNCOMMAND, command, "Unknown command"); + } + else + { + user->WriteNumeric(ERR_UNKNOWNCOMMAND, command, "This command has been disabled."); + } + + ServerInstance->SNO->WriteToSnoMask('a', "%s denied for %s (%s@%s)", + command.c_str(), user->nick.c_str(), user->ident.c_str(), user->host.c_str()); + return; } - if (items < cm->second->min_params) + + if ((!command_p.empty()) && (command_p.back().empty()) && (!handler->allow_empty_last_param)) + command_p.pop_back(); + + if (command_p.size() < handler->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 do_more; + user->CommandFloodPenalty += failpenalty; + user->WriteNumeric(ERR_NEEDMOREPARAMS, command, "Not enough parameters."); + if ((ServerInstance->Config->SyntaxHints) && (user->registered == REG_ALL) && (handler->syntax.length())) + user->WriteNumeric(RPL_SYNTAX, InspIRCd::Format("SYNTAX %s %s", handler->name.c_str(), handler->syntax.c_str())); + return; } - if ((user->registered != REG_ALL) && (!cm->second->WorksBeforeReg())) + + if ((user->registered != REG_ALL) && (!handler->WorksBeforeReg())) { - user->WriteServ("451 %s :You have not registered",command.c_str()); - return do_more; + user->CommandFloodPenalty += failpenalty; + user->WriteNumeric(ERR_NOTREGISTERED, command, "You have not registered"); } else { /* passed all checks.. first, do the (ugly) stats counters. */ - cm->second->use_count++; - cm->second->total_bytes += cmd.length(); + handler->use_count++; /* module calls too */ - int MOD_RESULT = 0; - FOREACH_RESULT(I_OnPreCommand,OnPreCommand(command,command_p,items,user,true,cmd)); - if (MOD_RESULT == 1) - return do_more; + FIRST_MOD_RESULT(OnPreCommand, MOD_RESULT, (command, command_p, user, true, cmd)); + if (MOD_RESULT == MOD_RES_DENY) + return; /* * WARNING: be careful, the user may be deleted soon */ - CmdResult result = cm->second->Handle(command_p,items,user); + CmdResult result = handler->Handle(command_p, user); - FOREACH_MOD(I_OnPostCommand,OnPostCommand(command, command_p, items, user, result,cmd)); - return do_more; + FOREACH_MOD(OnPostCommand, (handler, command_p, user, result, cmd)); } } -bool CommandParser::RemoveCommands(const char* source) +void CommandParser::RemoveCommand(Command* x) { - Commandable::iterator i,safei; - for (i = cmdlist.begin(); i != cmdlist.end(); i++) - { - safei = i; - safei++; - if (safei != cmdlist.end()) - { - RemoveCommand(safei, source); - } - } - safei = cmdlist.begin(); - if (safei != cmdlist.end()) - { - RemoveCommand(safei, source); - } - return true; + CommandMap::iterator n = cmdlist.find(x->name); + if (n != cmdlist.end() && n->second == x) + cmdlist.erase(n); } -void CommandParser::RemoveCommand(Commandable::iterator safei, const char* source) +CommandBase::CommandBase(Module* mod, const std::string& cmd, unsigned int minpara, unsigned int maxpara) + : ServiceProvider(mod, cmd, SERVICE_COMMAND) + , flags_needed(0) + , min_params(minpara) + , max_params(maxpara) + , use_count(0) + , disabled(false) + , works_before_reg(false) + , allow_empty_last_param(true) + , Penalty(1) { - Command* x = safei->second; - if (x->source == std::string(source)) - { - cmdlist.erase(safei); - delete x; - } } -bool CommandParser::ProcessBuffer(std::string &buffer,User *user) +CommandBase::~CommandBase() { - std::string::size_type a; - - if (!user) - return true; - - while ((a = buffer.rfind("\n")) != std::string::npos) - buffer.erase(a); - while ((a = buffer.rfind("\r")) != std::string::npos) - buffer.erase(a); - - if (buffer.length()) - { - if (!user->muted) - { - ServerInstance->Log(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) +void CommandBase::EncodeParameter(std::string& parameter, int index) { - if (so_handle) - { - if (RFCCommands.find(f->command) == RFCCommands.end()) - 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."); - 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; } -CommandParser::CommandParser(InspIRCd* Instance) : ServerInstance(Instance) +RouteDescriptor CommandBase::GetRouting(User* user, const std::vector& parameters) { - para.resize(128); + return ROUTE_LOCALONLY; } -bool CommandParser::FindSym(void** v, void* h, const std::string &name) +Command::Command(Module* mod, const std::string& cmd, unsigned int minpara, unsigned int maxpara) + : CommandBase(mod, cmd, minpara, maxpara) + , force_manual_route(false) { - *v = dlsym(h, "init_command"); - const char* err = dlerror(); - if (err && !(*v)) - { - ServerInstance->Log(SPARSE, "Error loading core command %s: %s\n", name.c_str(), err); - return false; - } - return true; } -bool CommandParser::ReloadCommand(const char* cmd, User* user) +Command::~Command() { - char filename[MAXBUF]; - char commandname[MAXBUF]; - int y = 0; + ServerInstance->Parser.RemoveCommand(this); +} - for (const char* x = cmd; *x; x++, y++) - commandname[y] = toupper(*x); +void Command::RegisterService() +{ + if (!ServerInstance->Parser.AddCommand(this)) + throw ModuleException("Command already exists: " + name); +} - commandname[y] = 0; +void CommandParser::ProcessBuffer(std::string &buffer,LocalUser *user) +{ + if (buffer.empty()) + return; - SharedObjectList::iterator command = RFCCommands.find(commandname); + ServerInstance->Logs->Log("USERINPUT", LOG_RAWIO, "C[%s] I :%s %s", + user->uuid.c_str(), user->nick.c_str(), buffer.c_str()); + ProcessCommand(user,buffer); +} - if (command != RFCCommands.end()) +bool CommandParser::AddCommand(Command *f) +{ + /* create the command and push it onto the table */ + if (cmdlist.find(f->name) == cmdlist.end()) { - Command* cmdptr = cmdlist.find(commandname)->second; - cmdlist.erase(cmdlist.find(commandname)); - - for (char* x = commandname; *x; x++) - *x = tolower(*x); - - - delete cmdptr; - dlclose(command->second); - RFCCommands.erase(command); - - snprintf(filename, MAXBUF, "cmd_%s.so", commandname); - const char* err = this->LoadCommand(filename); - if (err) - { - if (user) - user->WriteServ("NOTICE %s :*** Error loading 'cmd_%s.so': %s", user->nick, cmd, err); - return false; - } - + cmdlist[f->name] = f; return true; } - return false; } -CmdResult cmd_reload::Handle(const char** parameters, int /* pcnt */, User *user) +CommandParser::CommandParser() { - 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]); - return CMD_SUCCESS; - } - else - { - user->WriteServ("NOTICE %s :*** Could not reload command '%s' -- fix this problem, then /REHASH as soon as possible!", user->nick, parameters[0]); - return CMD_FAILURE; - } } -const char* CommandParser::LoadCommand(const char* name) +std::string CommandParser::TranslateUIDs(const std::vector& to, const std::vector& source, bool prefix_final, CommandBase* 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->Log(DEBUG,"Not reloading command %s/%s, it already exists", LIBRARYDIR, name); - return NULL; - } + std::vector::const_iterator types = to.begin(); + std::string dest; - snprintf(filename, MAXBUF, "%s/%s", LIBRARYDIR, name); - h = dlopen(filename, RTLD_NOW | RTLD_GLOBAL); - - if (!h) - { - const char* n = dlerror(); - ServerInstance->Log(SPARSE, "Error loading core command %s: %s", name, n); - return n; - } - - if (this->FindSym((void **)&cmd_factory_func, h, name)) + for (unsigned int i = 0; i < source.size(); i++) { - Command* newcommand = cmd_factory_func(ServerInstance); - this->CreateCommand(newcommand, h); - } - return NULL; -} + TranslateType t = TR_TEXT; + // They might supply less translation types than parameters, + // in that case pretend that all remaining types are TR_TEXT + if (types != to.end()) + { + t = *types; + types++; + } -void CommandParser::SetupCommandTable(User* user) -{ - RFCCommands.clear(); + bool last = (i == (source.size() - 1)); + if (prefix_final && last) + dest.push_back(':'); - if (!user) - { - printf("\nLoading core commands"); - fflush(stdout); - } + TranslateSingleParam(t, source[i], dest, custom_translator, i); - DIR* library = opendir(LIBRARYDIR); - if (library) - { - dirent* entry = NULL; - while ((entry = readdir(library))) - { - if (match(entry->d_name, "cmd_*.so")) - { - if (!user) - { - 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, entry->d_name, err); - } - else - { - printf("Error loading %s: %s", entry->d_name, err); - exit(EXIT_STATUS_BADHANDLER); - } - } - } - } - closedir(library); - if (!user) - printf("\n"); + if (!last) + dest.push_back(' '); } - if (cmdlist.find("RELOAD") == cmdlist.end()) - this->CreateCommand(new cmd_reload(ServerInstance)); + return dest; } -int CommandParser::TranslateUIDs(TranslateType to, const std::string &source, std::string &dest) +void CommandParser::TranslateSingleParam(TranslateType to, const std::string& item, std::string& dest, CommandBase* custom_translator, unsigned int paramnumber) { - User* user = NULL; - std::string item; - int translations = 0; - dest.clear(); - switch (to) { case TR_NICK: + { /* Translate single nickname */ - user = ServerInstance->FindNick(source); + User* user = ServerInstance->FindNick(item); if (user) - { - dest = user->uuid; - translations++; - } + dest.append(user->uuid); 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); + dest.append(item); + break; } - break; - case TR_SPACENICKLIST: + case TR_CUSTOM: { - /* Translate space seperated list of nicknames */ - irc::spacesepstream items(source); - while (items.GetToken(item)) + if (custom_translator) { - user = ServerInstance->FindNick(item); - if (user) - { - dest.append(user->uuid); - translations++; - } - else - dest.append(item); - dest.append(" "); + std::string translated = item; + custom_translator->EncodeParameter(translated, paramnumber); + dest.append(translated); + break; } - if (!dest.empty()) - dest.erase(dest.end() - 1); + // If no custom translator was given, fall through } - break; - case TR_END: case TR_TEXT: default: /* Do nothing */ - dest = source; + dest.append(item); break; } - - return translations; } -