X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcommand_parse.cpp;h=f8dcc8755e35c3c32b9e06a71b8f449111735f2d;hb=3151d60c1ecc9462e4c335282ee6c31672f45111;hp=0abfc5b04b606031170f3b8778d849ddd473af01;hpb=e4694e467513a7d4d298e55027e58bf9a7917958;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/command_parse.cpp b/src/command_parse.cpp index 0abfc5b04..f8dcc8755 100644 --- a/src/command_parse.cpp +++ b/src/command_parse.cpp @@ -1,329 +1,117 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev. - * E-mail: - * - * + * Copyright (C) 2014, 2018-2020 Sadie Powell + * Copyright (C) 2012-2016, 2018 Attila Molnar + * Copyright (C) 2012 Robby + * Copyright (C) 2009-2010 Daniel De Graaf + * Copyright (C) 2007-2009 Robin Burchell + * Copyright (C) 2007 Dennis Friis + * Copyright (C) 2006-2008, 2010 Craig Edwards * - * Written by Craig Edwards, Craig McLure, and others. - * 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 . */ -#include "inspircd.h" -#include "configreader.h" -#include -#include -#include -#include "users.h" -#include "modules.h" -#include "wildcard.h" -#include "xline.h" -#include "socketengine.h" -#include "socket.h" -#include "command_parse.h" - -bool InspIRCd::ULine(const char* server) -{ - if (!server) - return false; - if (!*server) - return true; - - return (find(Config->ulines.begin(),Config->ulines.end(),server) != Config->ulines.end()); -} -int InspIRCd::OperPassCompare(const char* data,const char* input) -{ - int MOD_RESULT = 0; - FOREACH_RESULT_I(this,I_OnOperCompare,OnOperCompare(data,input)) - Log(DEBUG,"OperPassCompare: %d",MOD_RESULT); - if (MOD_RESULT == 1) - return 0; - if (MOD_RESULT == -1) - return 1; - Log(DEBUG,"strcmp fallback: '%s' '%s' %d",data,input,strcmp(data,input)); - return strcmp(data,input); -} +#include "inspircd.h" -long InspIRCd::Duration(const char* str) +bool InspIRCd::PassCompare(Extensible* ex, const std::string& data, const std::string& input, const std::string& hashtype) { - char n_field[MAXBUF]; - long total = 0; - n_field[0] = 0; - - if ((!strchr(str,'s')) && (!strchr(str,'m')) && (!strchr(str,'h')) && (!strchr(str,'d')) && (!strchr(str,'w')) && (!strchr(str,'y'))) - { - std::string n = str; - n += 's'; - return Duration(n.c_str()); - } - - for (char* i = (char*)str; *i; i++) - { - // if we have digits, build up a string for the value in n_field, - // up to 10 digits in size. - if ((*i >= '0') && (*i <= '9')) - { - strlcat(n_field,i,10); - } - else - { - // we dont have a digit, check for numeric tokens - switch (tolower(*i)) - { - case 's': - total += atoi(n_field); - break; - - case 'm': - total += (atoi(n_field)*duration_m); - break; - - case 'h': - total += (atoi(n_field)*duration_h); - break; - - case 'd': - total += (atoi(n_field)*duration_d); - break; - - case 'w': - total += (atoi(n_field)*duration_w); - break; + ModResult res; + FIRST_MOD_RESULT(OnPassCompare, res, (ex, data, input, hashtype)); - case 'y': - total += (atoi(n_field)*duration_y); - break; - } - n_field[0] = 0; - } - } - // add trailing seconds - total += atoi(n_field); - - return total; -} - -/* All other ircds when doing this check usually just look for a string of *@* or *. We're smarter than that, though. */ - -bool InspIRCd::HostMatchesEveryone(const std::string &mask, userrec* user) -{ - char buffer[MAXBUF]; - char itrigger[MAXBUF]; - long matches = 0; - - if (!Config->ConfValue(Config->config_data, "insane","trigger", 0, itrigger, MAXBUF)) - strlcpy(itrigger,"95.5",MAXBUF); - - if (Config->ConfValueBool(Config->config_data, "insane","hostmasks", 0)) - return false; - - for (user_hash::iterator u = clientlist.begin(); u != clientlist.end(); u++) - { - strlcpy(buffer,u->second->ident,MAXBUF); - charlcat(buffer,'@',MAXBUF); - strlcat(buffer,u->second->host,MAXBUF); - if (match(buffer,mask.c_str())) - matches++; - } - float percent = ((float)matches / (float)clientlist.size()) * 100; - if (percent > (float)atof(itrigger)) - { - WriteOpers("*** \2WARNING\2: %s tried to set a G/K/E line mask of %s, which covers %.2f%% of the network!",user->nick,mask.c_str(),percent); + /* Module matched */ + if (res == MOD_RES_ALLOW) return true; - } - return false; -} -bool InspIRCd::IPMatchesEveryone(const std::string &ip, userrec* user) -{ - char itrigger[MAXBUF]; - long matches = 0; - - if (!Config->ConfValue(Config->config_data, "insane","trigger",0,itrigger,MAXBUF)) - strlcpy(itrigger,"95.5",MAXBUF); - - if (Config->ConfValueBool(Config->config_data, "insane","ipmasks",0)) + /* Module explicitly didnt match */ + if (res == MOD_RES_DENY) return false; - - for (user_hash::iterator u = clientlist.begin(); u != clientlist.end(); u++) - { - if (match(u->second->GetIPString(),ip.c_str(),true)) - matches++; - } - - float percent = ((float)matches / (float)clientlist.size()) * 100; - if (percent > (float)atof(itrigger)) - { - WriteOpers("*** \2WARNING\2: %s tried to set a Z line mask of %s, which covers %.2f%% of the network!",user->nick,ip.c_str(),percent); - return true; - } - return false; -} -bool InspIRCd::NickMatchesEveryone(const std::string &nick, userrec* user) -{ - char itrigger[MAXBUF]; - long matches = 0; - - if (!Config->ConfValue(Config->config_data, "insane","trigger",0,itrigger,MAXBUF)) - strlcpy(itrigger,"95.5",MAXBUF); - - if (Config->ConfValueBool(Config->config_data, "insane","nickmasks",0)) + /* We dont handle any hash types except for plaintext - Thanks tra26 */ + if (!hashtype.empty() && !stdalgo::string::equalsci(hashtype, "plaintext")) return false; - for (user_hash::iterator u = clientlist.begin(); u != clientlist.end(); u++) - { - if (match(u->second->nick,nick.c_str())) - matches++; - } - - float percent = ((float)matches / (float)clientlist.size()) * 100; - if (percent > (float)atof(itrigger)) - { - WriteOpers("*** \2WARNING\2: %s tried to set a Q line mask of %s, which covers %.2f%% of the network!",user->nick,nick.c_str(),percent); - return true; - } - return false; + return TimingSafeCompare(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(userrec* user, command_t* CommandObj, const char** parameters, int pcnt, unsigned int splithere, unsigned int extra) +bool CommandParser::LoopCall(User* user, Command* handler, const CommandBase::Params& 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; /** 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. + * 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). */ - std::map dupes; - - /* Create two lists, one for channel names, one for keys - */ - irc::commasepstream items1(parameters[splithere]); - irc::commasepstream items2(parameters[extra]); - 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 (((item = items1.GetToken()) != "") && (max++ < ServerInstance->Config->MaxTargets)) - { - if (dupes.find(item.c_str()) == dupes.end()) - { - const char* new_parameters[127]; - - for (int t = 0; (t < pcnt) && (t < 127); t++) - new_parameters[t] = parameters[t]; - - std::string extrastuff = items2.GetToken(); - - new_parameters[splithere] = item.c_str(); - new_parameters[extra] = extrastuff.c_str(); - - if (CommandObj->Handle(new_parameters,pcnt,user) == CMD_USER_DELETED) - return 1; + insp::flat_set dupes; + bool check_dupes = (extra < 0); - dupes[item.c_str()] = true; - } - } - return 1; -} - -int CommandParser::LoopCall(userrec* user, command_t* CommandObj, const char** 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. + /* 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" */ - if (!strchr(parameters[splithere],',')) - return 0; - - std::map dupes; - - /* Only one commasepstream here */ - ServerInstance->Log(DEBUG,"Splitting '%s'",parameters[splithere]); irc::commasepstream items1(parameters[splithere]); - std::string item = "*"; + 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 (((item = items1.GetToken()) != "") && (max++ < ServerInstance->Config->MaxTargets)) + CommandBase::Params splitparams(parameters); + while (items1.GetToken(item) && (!usemax || max++ < ServerInstance->Config->MaxTargets)) { - if (dupes.find(item.c_str()) == dupes.end()) + if ((!check_dupes) || (dupes.insert(item).second)) { - const char* new_parameters[127]; - - for (int t = 0; (t < pcnt) && (t < 127); t++) - new_parameters[t] = parameters[t]; - - new_parameters[splithere] = item.c_str(); + splitparams[splithere] = item; - 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. - */ - if (CommandObj->Handle(new_parameters,pcnt,user) == CMD_USER_DELETED) - return 1; - - 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, userrec * user) -{ - nspace::hash_map::iterator n = cmdlist.find(commandname); + if (extra >= 0) + { + // 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); + splitparams[extra] = item; + } - if (n != cmdlist.end()) - { - if ((pcnt>=n->second->min_params) && (n->second->source != "")) - { - if ((!n->second->flags_needed) || (user->modes[n->second->flags_needed-65])) + CmdResult result = handler->Handle(user, splitparams); + if (localuser) { - if (n->second->flags_needed) - { - return ((user->HasPermission(commandname)) || (ServerInstance->ULine(user->server))); - } - return true; + // Run the OnPostCommand hook with the last parameter being true to indicate + // that the event is being called in a loop. + item.clear(); + FOREACH_MOD(OnPostCommand, (handler, splitparams, localuser, result, true)); } } } - return false; + + return true; } -command_t* CommandParser::GetHandler(const std::string &commandname) +Command* CommandParser::GetHandler(const std::string &commandname) { - nspace::hash_map::iterator n = cmdlist.find(commandname); + CommandMap::iterator n = cmdlist.find(commandname); if (n != cmdlist.end()) return n->second; @@ -332,306 +120,295 @@ command_t* 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, userrec *user) +CmdResult CommandParser::CallHandler(const std::string& commandname, const CommandBase::Params& parameters, User* user, Command** cmd) { - nspace::hash_map::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) { - if ((!n->second->flags_needed) || (user->modes[n->second->flags_needed-65])) + bool bOkay = false; + + if (IS_LOCAL(user) && n->second->flags_needed) { - if (n->second->flags_needed) - { - if ((user->HasPermission(commandname)) || (!IS_LOCAL(user))) - { - return n->second->Handle(parameters,pcnt,user); - } - } - else + /* if user is local, and flags are needed .. */ + + if (user->IsModeSet(n->second->flags_needed)) { - return n->second->Handle(parameters,pcnt,user); + /* if user has the flags, and now has the permissions, go ahead */ + if (user->HasCommandPermission(commandname)) + bOkay = true; } } + else + { + /* remote or no flags required anyway */ + bOkay = true; + } + + if (bOkay) + { + if (cmd) + *cmd = n->second; + + ClientProtocol::TagMap tags; + return n->second->Handle(user, CommandBase::Params(parameters, tags)); + } } } return CMD_INVALID; } -void CommandParser::ProcessCommand(userrec *user, std::string &cmd) +void CommandParser::ProcessCommand(LocalUser* user, std::string& command, CommandBase::Params& command_p) { - const char *command_p[127]; - int items = 0; - irc::tokenstream tokens(cmd); - std::string command = tokens.GetToken(); + /* 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; - while (((para[items] = tokens.GetToken()) != "") && (items < 127)) + /* Modify the user's penalty regardless of whether or not the command exists */ + if (!user->HasPrivPermission("users/flood/no-throttle")) { - command_p[items] = para[items].c_str(); - items++; + // 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; } - 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; + if (!handler) + { + ModResult MOD_RESULT; + FIRST_MOD_RESULT(OnPreCommand, MOD_RESULT, (command, command_p, user, false)); + if (MOD_RESULT == MOD_RES_DENY) + { + FOREACH_MOD(OnCommandBlocked, (command, command_p, user)); + return; + } + + /* + * 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 + */ + handler = GetHandler(command); + if (!handler) + { + if (user->registered == REG_ALL) + user->WriteNumeric(ERR_UNKNOWNCOMMAND, command, "Unknown command"); + + ServerInstance->stats.Unknown++; + FOREACH_MOD(OnCommandBlocked, (command, command_p, user)); + return; + } } - nspace::hash_map::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) { - if (user) + /* + * command_p input (assuming max_params 1): + * this + * is + * a + * test + */ + + // Iterator to the last parameter that will be kept + const CommandBase::Params::iterator lastkeep = command_p.begin() + (handler->max_params - 1); + // Iterator to the first excess parameter + const CommandBase::Params::iterator firstexcess = lastkeep + 1; + + // Append all excess parameter(s) to the last parameter, separated by spaces + for (CommandBase::Params::const_iterator i = firstexcess; i != command_p.end(); ++i) { - /* activity resets the ping pending timer */ - user->nping = ServerInstance->Time() + user->pingmax; - 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 privilages",user->nick); - 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; - } - } - if ((user->registered == REG_ALL) && (!*user->oper) && (cm->second->IsDisabled())) - { - /* command is disabled! */ - user->WriteServ("421 %s %s :This command has been disabled.",user->nick,command.c_str()); - return; - } - if (items < cm->second->min_params) - { - user->WriteServ("461 %s %s :Not enough parameters.", user->nick, command.c_str()); - /* If syntax is given, display this as the 461 reply */ - if ((ServerInstance->Config->SyntaxHints) && (cm->second->syntax.length())) - user->WriteServ("304 %s :SYNTAX %s %s", user->nick, cm->second->command.c_str(), cm->second->syntax.c_str()); - return; - } - if ((user->registered == REG_ALL) || (cm->second->WorksBeforeReg())) - { - /* ikky /stats counters */ - cm->second->use_count++; - cm->second->total_bytes += cmd.length(); - - int MOD_RESULT = 0; - FOREACH_RESULT(I_OnPreCommand,OnPreCommand(command,command_p,items,user,true,cmd)); - if (MOD_RESULT == 1) - return; - - /* - * WARNING: nothing may come after the - * command handler call, as the handler - * may free the user structure! - */ - CmdResult result = cm->second->Handle(command_p,items,user); - - if (result != CMD_USER_DELETED) - { - FOREACH_MOD(I_OnPostCommand,OnPostCommand(command, command_p, items, user, result,cmd)); - } - return; - } - else - { - user->WriteServ("451 %s :You have not registered",command.c_str()); - return; - } + lastkeep->push_back(' '); + lastkeep->append(*i); } + + // Erase the excess parameter(s) + command_p.erase(firstexcess, command_p.end()); } - else if (user) + + /* + * We call OnPreCommand here separately 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)); + if (MOD_RESULT == MOD_RES_DENY) { - ServerInstance->stats->statsUnknown++; - user->WriteServ("421 %s %s :Unknown command",user->nick,command.c_str()); + FOREACH_MOD(OnCommandBlocked, (command, command_p, user)); + return; } -} -bool CommandParser::RemoveCommands(const char* source) -{ - bool go_again = true; + /* activity resets the ping pending timer */ + user->nextping = ServerInstance->Time() + user->MyClass->GetPingTime(); - while (go_again) + if (handler->flags_needed) { - go_again = false; + if (!user->IsModeSet(handler->flags_needed)) + { + user->CommandFloodPenalty += failpenalty; + user->WriteNumeric(ERR_NOPRIVILEGES, "Permission Denied - You do not have the required operator privileges"); + FOREACH_MOD(OnCommandBlocked, (command, command_p, user)); + return; + } - for (nspace::hash_map::iterator i = cmdlist.begin(); i != cmdlist.end(); i++) + if (!user->HasCommandPermission(command)) { - command_t* x = i->second; - if (x->source == std::string(source)) - { - ServerInstance->Log(DEBUG,"removecommands(%s) Removing dependent command: %s",x->source.c_str(),x->command.c_str()); - cmdlist.erase(i); - go_again = true; - break; - } + 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())); + FOREACH_MOD(OnCommandBlocked, (command, command_p, user)); + return; } } - return true; -} - -void CommandParser::ProcessBuffer(std::string &buffer,userrec *user) -{ - std::string::size_type a; + if ((!command_p.empty()) && (command_p.back().empty()) && (!handler->allow_empty_last_param)) + command_p.pop_back(); - if (!user) + if (command_p.size() < handler->min_params) + { + user->CommandFloodPenalty += failpenalty; + handler->TellNotEnoughParameters(user, command_p); + FOREACH_MOD(OnCommandBlocked, (command, command_p, user)); return; + } - 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->registered != REG_ALL) && (!handler->works_before_reg)) { - ServerInstance->Log(DEBUG,"CMDIN: %s %s",user->nick,buffer.c_str()); - this->ProcessCommand(user,buffer); + user->CommandFloodPenalty += failpenalty; + handler->TellNotRegistered(user, command_p); + FOREACH_MOD(OnCommandBlocked, (command, command_p, user)); } -} - -bool CommandParser::CreateCommand(command_t *f, void* so_handle) -{ - if (so_handle) + else { - if (RFCCommands.find(f->command) == RFCCommands.end()) - { - RFCCommands[f->command] = so_handle; - ServerInstance->Log(DEFAULT,"Monitoring RFC-specified reloadable command at %8x",so_handle); - } - else + /* passed all checks.. first, do the (ugly) stats counters. */ + handler->use_count++; + + /* module calls too */ + FIRST_MOD_RESULT(OnPreCommand, MOD_RESULT, (command, command_p, user, true)); + if (MOD_RESULT == MOD_RES_DENY) { - ServerInstance->Log(DEFAULT,"ERK! Somehow, we loaded a cmd_*.so file twice! Only the first instance is being recorded."); - return false; + FOREACH_MOD(OnCommandBlocked, (command, command_p, user)); + return; } - } - /* create the command and push it onto the table */ - if (cmdlist.find(f->command) == cmdlist.end()) - { - cmdlist[f->command] = f; - ServerInstance->Log(DEBUG,"Added command %s (%lu parameters)",f->command.c_str(),(unsigned long)f->min_params); - return true; - } - else return false; -} + /* + * WARNING: be careful, the user may be deleted soon + */ + CmdResult result = handler->Handle(user, command_p); -CommandParser::CommandParser(InspIRCd* Instance) : ServerInstance(Instance) -{ - para.resize(128); - this->SetupCommandTable(); + FOREACH_MOD(OnPostCommand, (handler, command_p, user, result, false)); + } } -bool CommandParser::FindSym(void** v, void* h) +void CommandParser::RemoveCommand(Command* x) { - *v = dlsym(h, "init_command"); - const char* err = dlerror(); - if (err) - { - ServerInstance->Log(SPARSE, "Error loading core command: %s\n", err); - return false; - } - return true; + CommandMap::iterator n = cmdlist.find(x->name); + if (n != cmdlist.end() && n->second == x) + cmdlist.erase(n); } -bool CommandParser::ReloadCommand(const char* cmd) +void CommandParser::ProcessBuffer(LocalUser* user, const std::string& buffer) { - char filename[MAXBUF]; - char commandname[MAXBUF]; - int y = 0; - - for (const char* x = cmd; *x; x++, y++) - commandname[y] = toupper(*x); + ClientProtocol::ParseOutput parseoutput; + if (!user->serializer->Parse(user, buffer, parseoutput)) + return; - commandname[y] = 0; + std::string& command = parseoutput.cmd; + std::transform(command.begin(), command.end(), command.begin(), ::toupper); - SharedObjectList::iterator command = RFCCommands.find(commandname); + CommandBase::Params parameters(parseoutput.params, parseoutput.tags); + ProcessCommand(user, command, parameters); +} - 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_t* 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); - this->LoadCommand(filename); - + cmdlist[f->name] = f; return true; } - return false; } -CmdResult cmd_reload::Handle(const char** parameters, int pcnt, userrec *user) +CommandParser::CommandParser() { - user->WriteServ("NOTICE %s :*** Reloading command '%s'",user->nick, parameters[0]); - if (ServerInstance->Parser->ReloadCommand(parameters[0])) - { - user->WriteServ("NOTICE %s :*** Successfully reloaded command '%s'", user->nick, parameters[0]); - return CMD_SUCCESS; - } - else - { - user->WriteServ("NOTICE %s :*** Could not reload command '%s'", user->nick, parameters[0]); - return CMD_FAILURE; - } } -void CommandParser::LoadCommand(const char* name) +std::string CommandParser::TranslateUIDs(const std::vector& to, const CommandBase::Params& source, bool prefix_final, CommandBase* custom_translator) { - char filename[MAXBUF]; - void* h; - command_t* (*cmd_factory_func)(InspIRCd*); + std::vector::const_iterator types = to.begin(); + std::string dest; + + for (unsigned int i = 0; i < source.size(); i++) + { + 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++; + } - snprintf(filename, MAXBUF, "%s/%s", LIBRARYDIR, name); - ServerInstance->Log(DEBUG,"Load command: %s", filename); + bool last = (i == (source.size() - 1)); + if (prefix_final && last) + dest.push_back(':'); - h = dlopen(filename, RTLD_NOW | RTLD_GLOBAL); + TranslateSingleParam(t, source[i], dest, custom_translator, i); - if (!h) - { - ServerInstance->Log(SPARSE, "Error loading core command: %s", dlerror()); - return; + if (!last) + dest.push_back(' '); } - if (this->FindSym((void **)&cmd_factory_func, h)) - { - command_t* newcommand = cmd_factory_func(ServerInstance); - this->CreateCommand(newcommand, h); - } + return dest; } -void CommandParser::SetupCommandTable() +void CommandParser::TranslateSingleParam(TranslateType to, const std::string& item, std::string& dest, CommandBase* custom_translator, unsigned int paramnumber) { - RFCCommands.clear(); - - DIR* library = opendir(LIBRARYDIR); - if (library) + switch (to) { - dirent* entry = NULL; - while ((entry = readdir(library))) + case TR_NICK: { - if (match(entry->d_name, "cmd_*.so")) + /* Translate single nickname */ + User* user = ServerInstance->FindNick(item); + if (user) + dest.append(user->uuid); + else + dest.append(item); + break; + } + case TR_CUSTOM: + { + if (custom_translator) { - this->LoadCommand(entry->d_name); + std::string translated = item; + custom_translator->EncodeParameter(translated, paramnumber); + dest.append(translated); + break; } + // If no custom translator was given, fall through } - closedir(library); + /*@fallthrough@*/ + default: + /* Do nothing */ + dest.append(item); + break; } - - this->CreateCommand(new cmd_reload(ServerInstance)); } -