X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcommand_parse.cpp;h=4c9701645fb79ab86dbf93e1420f9a4b53d21dc6;hb=ce168051e23bf7a33410ad17a4b78f5da478dbbe;hp=cb43df1a1bb15eb25896b061b450d6b03139cfbe;hpb=f5f71bdfefb84ccb69712ef6ed9f5ffc43733678;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/command_parse.cpp b/src/command_parse.cpp index cb43df1a1..4c9701645 100644 --- a/src/command_parse.cpp +++ b/src/command_parse.cpp @@ -1,194 +1,43 @@ - /* +------------------------------------+ +/* +------------------------------------+ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2007 InspIRCd Development Team + * InspIRCd: (C) 2002-2008 InspIRCd Development Team * See: http://www.inspircd.org/wiki/index.php/Credits * * This program is free but copyrighted software; see - * the file COPYING for details. + * the file COPYING for details. * * --------------------------------------------------- */ +/* $Core: libIRCDcommand_parse */ + #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" +#include "exitcodes.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()); -} +/* Directory Searching for Unix-Only */ +#ifndef WIN32 +#include +#include +#endif -int InspIRCd::OperPassCompare(const char* data,const char* input, int tagnumber) +int InspIRCd::PassCompare(Extensible* ex, const char* data,const char* input, const char* hashtype) { int MOD_RESULT = 0; - FOREACH_RESULT_I(this,I_OnOperCompare,OnOperCompare(data, input, tagnumber)) - Log(DEBUG,"OperPassCompare: %d",MOD_RESULT); + FOREACH_RESULT_I(this,I_OnPassCompare,OnPassCompare(ex, data, input, hashtype)) 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); } -long InspIRCd::Duration(const char* str) -{ - 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; - - 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); - 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)) - 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)) - 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; -} - /* 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, @@ -199,12 +48,15 @@ bool InspIRCd::NickMatchesEveryone(const std::string &nick, userrec* user) * 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) +int CommandParser::LoopCall(User* user, Command* CommandObj, const std::vector& parameters, unsigned int splithere, unsigned int extra) { + if (splithere >= parameters.size()) + return 0; + /* 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],',')) + if (parameters[splithere].find(',') == std::string::npos) return 0; /** Some lame ircds will weed out dupes using some shitty O(n^2) algorithm. @@ -217,29 +69,30 @@ int CommandParser::LoopCall(userrec* user, command_t* CommandObj, const char** p */ irc::commasepstream items1(parameters[splithere]); irc::commasepstream items2(parameters[extra]); - std::string item = "*"; + 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 (((item = items1.GetToken()) != "") && (max++ < ServerInstance->Config->MaxTargets)) + while (items1.GetToken(item) && (max++ < ServerInstance->Config->MaxTargets)) { if (dupes.find(item.c_str()) == dupes.end()) { - const char* new_parameters[127]; + std::vector new_parameters; - for (int t = 0; (t < pcnt) && (t < 127); t++) - new_parameters[t] = parameters[t]; + for (unsigned int t = 0; (t < parameters.size()) && (t < MAXPARAMETERS); t++) + new_parameters.push_back(parameters[t]); - std::string extrastuff = items2.GetToken(); + if (!items2.GetToken(extrastuff)) + extrastuff = ""; new_parameters[splithere] = item.c_str(); new_parameters[extra] = extrastuff.c_str(); - if (CommandObj->Handle(new_parameters,pcnt,user) == CMD_USER_DELETED) - return 1; + CommandObj->Handle(new_parameters, user); dupes[item.c_str()] = true; } @@ -247,45 +100,44 @@ int CommandParser::LoopCall(userrec* user, command_t* CommandObj, const char** p return 1; } -int CommandParser::LoopCall(userrec* user, command_t* CommandObj, const char** parameters, int pcnt, unsigned int splithere) +int CommandParser::LoopCall(User* user, Command* CommandObj, const std::vector& parameters, unsigned int splithere) { + if (splithere >= parameters.size()) + return 0; + /* 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],',')) + if (parameters[splithere].find(',') == std::string::npos) return 0; std::map dupes; /* Only one commasepstream here */ - ServerInstance->Log(DEBUG,"Splitting '%s'",parameters[splithere]); irc::commasepstream items1(parameters[splithere]); - std::string item = "*"; + std::string item; unsigned int max = 0; /* Parse the commasepstream until there are no tokens remaining. * Each token we parse out, call the command handler that called us * with it */ - while (((item = items1.GetToken()) != "") && (max++ < ServerInstance->Config->MaxTargets)) + while (items1.GetToken(item) && (max++ < ServerInstance->Config->MaxTargets)) { if (dupes.find(item.c_str()) == dupes.end()) { - const char* new_parameters[127]; + std::vector new_parameters; - for (int t = 0; (t < pcnt) && (t < 127); t++) - new_parameters[t] = parameters[t]; + for (unsigned int t = 0; (t < parameters.size()) && (t < MAXPARAMETERS); t++) + new_parameters.push_back(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. */ - if (CommandObj->Handle(new_parameters,pcnt,user) == CMD_USER_DELETED) - return 1; + CommandObj->Handle(new_parameters, user); dupes[item.c_str()] = true; } @@ -297,20 +149,23 @@ int CommandParser::LoopCall(userrec* user, command_t* CommandObj, const char** p return 1; } -bool CommandParser::IsValidCommand(const std::string &commandname, int pcnt, userrec * user) +bool CommandParser::IsValidCommand(const std::string &commandname, unsigned int pcnt, User * user) { - nspace::hash_map::iterator n = cmdlist.find(commandname); + Commandable::iterator n = cmdlist.find(commandname); if (n != cmdlist.end()) { - if ((pcnt>=n->second->min_params) && (n->second->source != "")) + if ((pcnt >= n->second->min_params) && (n->second->source != "")) { - if ((!n->second->flags_needed) || (user->modes[n->second->flags_needed-65])) + if (IS_LOCAL(user) && n->second->flags_needed) { - if (n->second->flags_needed) + if (user->IsModeSet(n->second->flags_needed)) { - return ((user->HasPermission(commandname)) || (ServerInstance->ULine(user->server))); + return (user->HasPermission(commandname)); } + } + else + { return true; } } @@ -318,9 +173,9 @@ bool CommandParser::IsValidCommand(const std::string &commandname, int pcnt, use return false; } -command_t* CommandParser::GetHandler(const std::string &commandname) +Command* CommandParser::GetHandler(const std::string &commandname) { - nspace::hash_map::iterator n = cmdlist.find(commandname); + Commandable::iterator n = cmdlist.find(commandname); if (n != cmdlist.end()) return n->second; @@ -329,162 +184,218 @@ 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 std::vector& parameters, User *user) { - nspace::hash_map::iterator n = cmdlist.find(commandname); + Commandable::iterator n = cmdlist.find(commandname); if (n != cmdlist.end()) { - if (pcnt >= n->second->min_params) + 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->HasPermission(commandname)) + bOkay = true; } } + else + { + /* remote or no flags required anyway */ + bOkay = true; + } + + if (bOkay) + { + return n->second->Handle(parameters,user); + } } } return CMD_INVALID; } -void CommandParser::ProcessCommand(userrec *user, std::string &cmd) +void CommandParser::DoLines(User* current, bool one_only) { - const char *command_p[127]; - int items = 0; - irc::tokenstream tokens(cmd); - std::string command = tokens.GetToken(); + // while there are complete lines to process... + unsigned int floodlines = 0; - while (((para[items] = tokens.GetToken()) != "") && (items < 127)) + while (current->BufferIsReady()) { - command_p[items] = para[items].c_str(); - items++; + 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(); + 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) +{ + std::vector command_p; + irc::tokenstream tokens(cmd); + std::string command, token; + tokens.GetToken(command); + + /* A client sent a nick prefix on their command (ick) + * rhapsody and some braindead bouncers do this -- + * the rfc says they shouldnt but also says the ircd should + * discard it if they do. + */ + if (command[0] == ':') + tokens.GetToken(command); + + while (tokens.GetToken(token) && (command_p.size() <= MAXPARAMETERS)) + 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)); + FOREACH_RESULT(I_OnPreCommand,OnPreCommand(command, command_p, user, false, cmd)); if (MOD_RESULT == 1) { - return; + return true; } - nspace::hash_map::iterator cm = cmdlist.find(command); + /* find the command, check it exists */ + Commandable::iterator cm = cmdlist.find(command); - if (cm != cmdlist.end()) + if (cm == cmdlist.end()) { - if (user) + if (user->registered == REG_ALL) { - /* 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 privileges",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; - } + user->WriteNumeric(421, "%s %s :Unknown command",user->nick,command.c_str()); } + ServerInstance->stats->statsUnknown++; + return true; } - else if (user) + + /* Modify the user's penalty */ + bool do_more = true; + if (!user->ExemptFromPenalty) { - ServerInstance->stats->statsUnknown++; - user->WriteServ("421 %s %s :Unknown command",user->nick,command.c_str()); + user->IncreasePenalty(cm->second->Penalty); + do_more = (user->Penalty < 10); + if (!do_more) + user->OverPenalty = true; } -} -bool CommandParser::RemoveCommands(const char* source) -{ - nspace::hash_map::iterator i,safei; - for (i = cmdlist.begin(); i != cmdlist.end(); i++) + /* activity resets the ping pending timer */ + if (user->MyClass) + user->nping = ServerInstance->Time() + user->MyClass->GetPingTime(); + + if (cm->second->flags_needed) { - safei = i; - safei++; - if (safei != cmdlist.end()) + if (!user->IsModeSet(cm->second->flags_needed)) + { + user->WriteNumeric(481, "%s :Permission Denied - You do not have the required operator privileges",user->nick); + return do_more; + } + if (!user->HasPermission(command)) { - RemoveCommand(safei, source); + user->WriteNumeric(481, "%s :Permission Denied - Oper type %s does not have access to command %s",user->nick,user->oper,command.c_str()); + return do_more; } } - safei = cmdlist.begin(); - if (safei != cmdlist.end()) + if ((user->registered == REG_ALL) && (!IS_OPER(user)) && (cm->second->IsDisabled())) { + /* command is disabled! */ + user->WriteNumeric(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; + } + if (command_p.size() < cm->second->min_params) + { + user->WriteNumeric(461, "%s %s :Not enough parameters.", user->nick, command.c_str()); + if ((ServerInstance->Config->SyntaxHints) && (user->registered == REG_ALL) && (cm->second->syntax.length())) + user->WriteNumeric(304, "%s :SYNTAX %s %s", user->nick, cm->second->command.c_str(), cm->second->syntax.c_str()); + return do_more; + } + if ((user->registered != REG_ALL) && (!cm->second->WorksBeforeReg())) + { + user->WriteNumeric(451, "%s :You have not registered",command.c_str()); + return do_more; + } + else + { + /* passed all checks.. first, do the (ugly) stats counters. */ + cm->second->use_count++; + 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) + return do_more; + + /* + * WARNING: be careful, the user may be deleted soon + */ + CmdResult result = cm->second->Handle(command_p, user); + + FOREACH_MOD(I_OnPostCommand,OnPostCommand(command, command_p, user, result,cmd)); + return do_more; + } +} + +void CommandParser::RemoveCommands(const char* source) +{ + Commandable::iterator i,safei; + for (i = cmdlist.begin(); i != cmdlist.end();) + { + safei = i; + i++; RemoveCommand(safei, source); } - return true; } -void CommandParser::RemoveCommand(nspace::hash_map::iterator safei, const char* source) +void CommandParser::RemoveCommand(Commandable::iterator safei, const char* source) { - command_t* x = safei->second; + Command* x = safei->second; if (x->source == std::string(source)) { cmdlist.erase(safei); + delete x; } } -void CommandParser::ProcessBuffer(std::string &buffer,userrec *user) +bool CommandParser::ProcessBuffer(std::string &buffer,User *user) { std::string::size_type a; if (!user) - return; + return true; while ((a = buffer.rfind("\n")) != std::string::npos) buffer.erase(a); @@ -493,23 +404,22 @@ void CommandParser::ProcessBuffer(std::string &buffer,userrec *user) if (buffer.length()) { - ServerInstance->Log(DEBUG,"CMDIN: %s %s",user->nick,buffer.c_str()); - this->ProcessCommand(user,buffer); + ServerInstance->Logs->Log("USERINPUT", DEBUG,"C[%d] I :%s %s",user->GetFd(), user->nick, buffer.c_str()); + return this->ProcessCommand(user,buffer); } + + return true; } -bool CommandParser::CreateCommand(command_t *f, void* so_handle) +bool CommandParser::CreateCommand(Command *f, void* so_handle) { if (so_handle) { 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 { - ServerInstance->Log(DEFAULT,"ERK! Somehow, we loaded a cmd_*.so file twice! Only the first instance is being recorded."); + ServerInstance->Logs->Log("COMMAND",DEFAULT,"ERK! Somehow, we loaded a cmd_*.so file twice! Only the first instance is being recorded."); return false; } } @@ -518,7 +428,6 @@ bool CommandParser::CreateCommand(command_t *f, void* so_handle) 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; @@ -527,49 +436,45 @@ bool CommandParser::CreateCommand(command_t *f, void* so_handle) CommandParser::CommandParser(InspIRCd* Instance) : ServerInstance(Instance) { para.resize(128); - this->SetupCommandTable(); } -bool CommandParser::FindSym(void** v, void* h) +bool CommandParser::FindSym(void** v, void* h, const std::string &name) { *v = dlsym(h, "init_command"); const char* err = dlerror(); - if (err) + if (err && !(*v)) { - ServerInstance->Log(SPARSE, "Error loading core command: %s\n", err); + ServerInstance->Logs->Log("COMMAND",SPARSE, "Error loading core command %s: %s\n", name.c_str(), err); return false; } return true; } -bool CommandParser::ReloadCommand(const char* cmd) +bool CommandParser::ReloadCommand(std::string cmd, User* user) { char filename[MAXBUF]; - char commandname[MAXBUF]; - int y = 0; - - for (const char* x = cmd; *x; x++, y++) - commandname[y] = toupper(*x); + std::transform(cmd.begin(), cmd.end(), cmd.begin(), ::toupper); - commandname[y] = 0; - - SharedObjectList::iterator command = RFCCommands.find(commandname); + SharedObjectList::iterator command = RFCCommands.find(cmd); if (command != RFCCommands.end()) { - command_t* cmdptr = cmdlist.find(commandname)->second; - cmdlist.erase(cmdlist.find(commandname)); - - for (char* x = commandname; *x; x++) - *x = tolower(*x); - + Command* cmdptr = cmdlist.find(cmd)->second; + cmdlist.erase(cmdlist.find(cmd)); + RFCCommands.erase(cmd); + std::transform(cmd.begin(), cmd.end(), cmd.begin(), ::tolower); delete cmdptr; dlclose(command->second); - RFCCommands.erase(command); - snprintf(filename, MAXBUF, "cmd_%s.so", commandname); - this->LoadCommand(filename); + 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, cmd.c_str(), err); + return false; + } return true; } @@ -577,64 +482,172 @@ bool CommandParser::ReloadCommand(const char* cmd) return false; } -CmdResult cmd_reload::Handle(const char** parameters, int pcnt, userrec *user) +CmdResult cmd_reload::Handle(const std::vector& parameters, User *user) { - user->WriteServ("NOTICE %s :*** Reloading command '%s'",user->nick, parameters[0]); - if (ServerInstance->Parser->ReloadCommand(parameters[0])) + if (parameters.size() < 1) + return CMD_FAILURE; + + user->WriteServ("NOTICE %s :*** Reloading command '%s'",user->nick, parameters[0].c_str()); + 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]); + user->WriteServ("NOTICE %s :*** Successfully reloaded command '%s'", user->nick, parameters[0].c_str()); + ServerInstance->SNO->WriteToSnoMask('A', "RELOAD: %s reloaded the '%s' command.", user->nick, parameters[0].c_str()); return CMD_SUCCESS; } else { - user->WriteServ("NOTICE %s :*** Could not reload command '%s'", user->nick, parameters[0]); + user->WriteServ("NOTICE %s :*** Could not reload command '%s' -- fix this problem, then /REHASH as soon as possible!", user->nick, parameters[0].c_str()); return CMD_FAILURE; } } -void CommandParser::LoadCommand(const char* name) +const char* CommandParser::LoadCommand(const char* name) { char filename[MAXBUF]; void* h; - command_t* (*cmd_factory_func)(InspIRCd*); + Command* (*cmd_factory_func)(InspIRCd*); - snprintf(filename, MAXBUF, "%s/%s", LIBRARYDIR, name); - ServerInstance->Log(DEBUG,"Load command: %s", filename); + /* 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) { - ServerInstance->Log(SPARSE, "Error loading core command: %s", dlerror()); - return; + const char* n = dlerror(); + ServerInstance->Logs->Log("COMMAND",SPARSE, "Error loading core command %s: %s", name, n); + return n; } - if (this->FindSym((void **)&cmd_factory_func, h)) + if (this->FindSym((void **)&cmd_factory_func, h, name)) { - command_t* newcommand = cmd_factory_func(ServerInstance); + Command* newcommand = cmd_factory_func(ServerInstance); this->CreateCommand(newcommand, h); } + return NULL; } -void CommandParser::SetupCommandTable() +void CommandParser::SetupCommandTable(User* user) { RFCCommands.clear(); + if (!user) + { + printf("\nLoading core commands"); + fflush(stdout); + } + DIR* library = opendir(LIBRARYDIR); if (library) { dirent* entry = NULL; - while ((entry = readdir(library))) + while (0 != (entry = readdir(library))) { if (match(entry->d_name, "cmd_*.so")) { - this->LoadCommand(entry->d_name); + 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"); } - this->CreateCommand(new cmd_reload(ServerInstance)); + if (cmdlist.find("RELOAD") == cmdlist.end()) + this->CreateCommand(new cmd_reload(ServerInstance)); } +int CommandParser::TranslateUIDs(TranslateType to, const std::string &source, std::string &dest) +{ + User* user = NULL; + std::string item; + int translations = 0; + dest.clear(); + + switch (to) + { + case TR_NICK: + /* Translate single nickname */ + user = ServerInstance->FindNick(source); + if (user) + { + dest = user->uuid; + translations++; + } + 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: + /* Do nothing */ + dest = source; + break; + } + + return translations; +} + +