X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcommand_parse.cpp;h=b483c410bbe46b4bf4087fc116e17825bb97ccb9;hb=45776df702235ec38625403778daff4c7aed4e4e;hp=e735ad828dc83f8ba3253364db39997c4a304fd6;hpb=1328556e3690aa7a6c6003373221c4cc914c1d4d;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/command_parse.cpp b/src/command_parse.cpp index e735ad828..e751db6d3 100644 --- a/src/command_parse.cpp +++ b/src/command_parse.cpp @@ -2,642 +2,372 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev. - * E-mail: - * - * + * InspIRCd: (C) 2002-2007 InspIRCd Development Team + * See: http://www.inspircd.org/wiki/index.php/Credits * - * Written by Craig Edwards, Craig McLure, and others. * This program is free but copyrighted software; see * the file COPYING for details. * * --------------------------------------------------- */ -using namespace std; - -#include "inspircd_config.h" #include "inspircd.h" -#include "inspircd_io.h" -#include -#include -#include -#include -#include -#include -#include -#ifdef GCC3 -#include -#else -#include -#endif -#include -#include -#include -#include -#include -#ifdef THREADED_DNS -#include -#endif -#include "users.h" -#include "globals.h" -#include "modules.h" -#include "dynamic.h" #include "wildcard.h" -#include "message.h" -#include "mode.h" -#include "commands.h" #include "xline.h" -#include "inspstring.h" -#include "dnsqueue.h" -#include "helperfuncs.h" -#include "hashcomp.h" #include "socketengine.h" -#include "userprocess.h" #include "socket.h" -#include "dns.h" -#include "typedefs.h" #include "command_parse.h" -#include "ctables.h" +#include "exitcodes.h" -#ifdef GCC3 -#define nspace __gnu_cxx -#else -#define nspace std +/* Directory Searching for Unix-Only */ +#ifndef WIN32 +#include +#include #endif +bool InspIRCd::ULine(const char* server) +{ + if (!server) + return false; + if (!*server) + return true; -extern InspIRCd* ServerInstance; - -extern std::vector modules; -extern std::vector factory; -extern std::vector module_sockets; -extern std::vector local_users; - -extern int MODCOUNT; -extern InspSocket* socket_ref[MAX_DESCRIPTORS]; -extern time_t TIME; + return (Config->ulines.find(server) != Config->ulines.end()); +} -// This table references users by file descriptor. -// its an array to make it VERY fast, as all lookups are referenced -// by an integer, meaning there is no need for a scan/search operation. -extern userrec* fd_ref_table[MAX_DESCRIPTORS]; +bool InspIRCd::SilentULine(const char* server) +{ + std::map::iterator n = Config->ulines.find(server); + if (n != Config->ulines.end()) + return n->second; + else return false; +} -extern Server* MyServer; -extern ServerConfig *Config; +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); +} -extern user_hash clientlist; -extern chan_hash chanlist; +std::string InspIRCd::TimeString(time_t curtime) +{ + return std::string(ctime(&curtime),24); +} -/* This function pokes and hacks at a parameter list like the following: - * - * PART #winbot,#darkgalaxy :m00! - * - * to turn it into a series of individual calls like this: - * - * PART #winbot :m00! - * PART #darkgalaxy :m00! - * - * The seperate calls are sent to a callback function provided by the caller - * (the caller will usually call itself recursively). The callback function - * must be a command handler. Calling this function on a line with no list causes - * no action to be taken. You must provide a starting and ending parameter number - * where the range of the list can be found, useful if you have a terminating - * parameter as above which is actually not part of the list, or parameters - * before the actual list as well. This code is used by many functions which - * can function as "one to list" (see the RFC) */ - -int CommandParser::LoopCall(command_t* fn, char **parameters, int pcnt, userrec *u, int start, int end, int joins) +/** Refactored by Brain, Jun 2007. Much faster with some clever O(1) array + * lookups and pointer maths. + */ +long InspIRCd::Duration(const std::string &str) { - char plist[MAXBUF]; - char *param; - char *pars[32]; - char blog[32][MAXBUF]; - char blog2[32][MAXBUF]; - int j = 0, q = 0, total = 0, t = 0, t2 = 0, total2 = 0; - char keystr[MAXBUF]; - char moo[MAXBUF]; - - for (int i = 0; i <32; i++) - { - *blog[i] = 0; - *blog2[i] = 0; - } + unsigned char multiplier = 0; + long total = 0; + long times = 1; + long subtotal = 0; - *moo = 0; - for (int i = 0; i <10; i++) + /* Iterate each item in the string, looking for number or multiplier */ + for (std::string::const_reverse_iterator i = str.rbegin(); i != str.rend(); ++i) { - if (!parameters[i]) + /* Found a number, queue it onto the current number */ + if ((*i >= '0') && (*i <= '9')) { - parameters[i] = moo; + subtotal = subtotal + ((*i - '0') * times); + times = times * 10; } - } - if (joins) - { - if (pcnt > 1) /* we have a key to copy */ + else { - strlcpy(keystr,parameters[1],MAXBUF); + /* Found something thats not a number, find out how much + * it multiplies the built up number by, multiply the total + * and reset the built up number. + */ + if (subtotal) + total += subtotal * duration_multi[multiplier]; + + /* Next subtotal please */ + subtotal = 0; + multiplier = *i; + times = 1; } } - - if (!parameters[start] || (!strchr(parameters[start],','))) + if (multiplier) { - return 0; + total += subtotal * duration_multi[multiplier]; + subtotal = 0; } + /* Any trailing values built up are treated as raw seconds */ + return total + subtotal; +} - *plist = 0; +/* 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) +{ + /* 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; - for (int i = start; i <= end; i++) - { - if (parameters[i]) + /** 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; + + /* 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()) { - strlcat(plist,parameters[i],MAXBUF); - } - } + const char* new_parameters[MAXPARAMETERS]; - j = 0; - param = plist; + for (int t = 0; (t < pcnt) && (t < MAXPARAMETERS); t++) + new_parameters[t] = parameters[t]; - t = strlen(plist); + if (!items2.GetToken(extrastuff)) + extrastuff = ""; - for (int i = 0; i < t; i++) - { - if (plist[i] == ',') - { - plist[i] = '\0'; - strlcpy(blog[j++],param,MAXBUF); - param = plist+i+1; - if ((unsigned int)j > Config->MaxTargets) - { - WriteServ(u->fd,"407 %s %s :Too many targets in list, message not delivered.",u->nick,blog[j-1]); - return 1; - } - } - } + new_parameters[splithere] = item.c_str(); + new_parameters[extra] = extrastuff.c_str(); - strlcpy(blog[j++],param,MAXBUF); - total = j; + CommandObj->Handle(new_parameters,pcnt,user); - if ((joins) && (keystr) && (total>0)) // more than one channel and is joining - { - strcat(keystr,","); + dupes[item.c_str()] = true; + } } + return 1; +} - if ((joins) && (keystr)) - { - if (strchr(keystr,',')) - { - j = 0; - param = keystr; - t2 = strlen(keystr); +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. + */ + if (!strchr(parameters[splithere],',')) + return 0; - for (int i = 0; i < t2; i++) - { - if (keystr[i] == ',') - { - keystr[i] = '\0'; - strlcpy(blog2[j++],param,MAXBUF); - param = keystr+i+1; - } - } + std::map dupes; - strlcpy(blog2[j++],param,MAXBUF); - total2 = j; - } - } + /* Only one commasepstream here */ + irc::commasepstream items1(parameters[splithere]); + std::string item; + unsigned int max = 0; - for (j = 0; j < total; j++) + /* Parse the commasepstream until there are no tokens remaining. + * Each token we parse out, call the command handler that called us + * with it + */ + while (items1.GetToken(item) && (max++ < ServerInstance->Config->MaxTargets)) { - if (blog[j]) + if (dupes.find(item.c_str()) == dupes.end()) { - pars[0] = blog[j]; - } + const char* new_parameters[MAXPARAMETERS]; - for (q = end; q < pcnt-1; q++) - { - if (parameters[q+1]) - { - pars[q-end+1] = parameters[q+1]; - } - } + for (int t = 0; (t < pcnt) && (t < MAXPARAMETERS); t++) + new_parameters[t] = parameters[t]; - if ((joins) && (parameters[1])) - { - if (pcnt > 1) - { - pars[1] = blog2[j]; - } - else - { - pars[1] = NULL; - } - } + new_parameters[splithere] = item.c_str(); - /* repeatedly call the function with the hacked parameter list */ - if ((joins) && (pcnt > 1)) - { - if (pars[1]) - { - // pars[1] already set up and containing key from blog2[j] - fn->Handle(pars,2,u); - } - else - { - pars[1] = parameters[1]; - fn->Handle(pars,2,u); - } - } - else - { - fn->Handle(pars,pcnt-(end-start),u); + 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(std::string &commandname, int pcnt, userrec * user) +bool CommandParser::IsValidCommand(const std::string &commandname, int pcnt, userrec * user) { - nspace::hash_map::iterator n = cmdlist.find(commandname); + command_table::iterator n = cmdlist.find(commandname); if (n != cmdlist.end()) { if ((pcnt>=n->second->min_params) && (n->second->source != "")) { - if ((strchr(user->modes,n->second->flags_needed)) || (!n->second->flags_needed)) + if (IS_LOCAL(user) && n->second->flags_needed) { - if (n->second->flags_needed) + if (user->IsModeSet(n->second->flags_needed)) { - if ((user->HasPermission(commandname)) || (is_uline(user->server))) - { - return true; - } - else - { - return false; - } + return (user->HasPermission(commandname)); } - + } + else + { return true; } } } - return false; } -// calls a handler function for a command - -void CommandParser::CallHandler(std::string &commandname,char **parameters, int pcnt, userrec *user) +command_t* CommandParser::GetHandler(const std::string &commandname) { - nspace::hash_map::iterator n = cmdlist.find(commandname); - + command_table::iterator n = cmdlist.find(commandname); if (n != cmdlist.end()) - { - if (pcnt >= n->second->min_params) - { - if ((strchr(user->modes,n->second->flags_needed)) || (!n->second->flags_needed)) - { - if (n->second->flags_needed) - { - if ((user->HasPermission(commandname)) || (is_uline(user->server))) - { - n->second->Handle(parameters,pcnt,user); - } - } - else - { - n->second->Handle(parameters,pcnt,user); - } - } - } - } -} + return n->second; -int CommandParser::ProcessParameters(char **command_p,char *parameters) -{ - int j = 0; - int q = strlen(parameters); - - if (!q) - { - /* no parameters, command_p invalid! */ - return 0; - } - - if (parameters[0] == ':') - { - command_p[0] = parameters+1; - return 1; - } - - if (q) - { - if ((strchr(parameters,' ')==NULL) || (parameters[0] == ':')) - { - /* only one parameter */ - command_p[0] = parameters; - if (parameters[0] == ':') - { - if (strchr(parameters,' ') != NULL) - { - command_p[0]++; - } - } + return NULL; +} - return 1; - } - } +// calls a handler function for a command - command_p[j++] = parameters; +CmdResult CommandParser::CallHandler(const std::string &commandname,const char** parameters, int pcnt, userrec *user) +{ + command_table::iterator n = cmdlist.find(commandname); - for (int i = 0; i <= q; i++) + if (n != cmdlist.end()) { - if (parameters[i] == ' ') + if (pcnt >= n->second->min_params) { - command_p[j++] = parameters+i+1; - parameters[i] = '\0'; + bool bOkay = false; - if (command_p[j-1][0] == ':') + if (IS_LOCAL(user) && n->second->flags_needed) { - *command_p[j-1]++; /* remove dodgy ":" */ - break; - /* parameter like this marks end of the sequence */ - } - } - } + /* if user is local, and flags are needed .. */ - return j; /* returns total number of items in the list */ -} - -void CommandParser::ProcessCommand(userrec *user, char* cmd) -{ - char *parameters; - char *command; - char *command_p[127]; - char p[MAXBUF], temp[MAXBUF]; - int j, items, cmd_found; - int total_params = 0; - unsigned int xl; - - for (int i = 0; i < 127; i++) - command_p[i] = NULL; - - if (!user || !cmd || !*cmd) - { - return; - } - - xl = strlen(cmd); - - if (xl > 2) - { - for (unsigned int q = 0; q < xl - 1; q++) - { - if (cmd[q] == ' ') - { - if (cmd[q+1] == ':') + if (user->IsModeSet(n->second->flags_needed)) { - total_params++; - // found a 'trailing', we dont count them after this. - break; + /* if user has the flags, and now has the permissions, go ahead */ + if (user->HasPermission(commandname)) + bOkay = true; } - else - total_params++; } - } - } - - // another phidjit bug... - if (total_params > 126) - { - *(strchr(cmd,' ')) = '\0'; - WriteServ(user->fd,"421 %s %s :Too many parameters given",user->nick,cmd); - return; - } - - strlcpy(temp,cmd,MAXBUF); - - std::string tmp = cmd; - - for (int i = 0; i <= MODCOUNT; i++) - { - std::string oldtmp = tmp; - modules[i]->OnServerRaw(tmp,true,user); - if (oldtmp != tmp) - { - log(DEBUG,"A Module changed the input string!"); - log(DEBUG,"New string: %s",tmp.c_str()); - log(DEBUG,"Old string: %s",oldtmp.c_str()); - break; - } - } - - strlcpy(cmd,tmp.c_str(),MAXBUF); - strlcpy(temp,cmd,MAXBUF); - - if (!strchr(cmd,' ')) - { - /* - * no parameters, lets skip the formalities and not chop up - * the string - */ - log(DEBUG,"About to preprocess command with no params"); - items = 0; - command_p[0] = NULL; - parameters = NULL; - unsigned int tl = strlen(cmd); - for (unsigned int i = 0; i <= tl; i++) - { - cmd[i] = toupper(cmd[i]); - } - command = cmd; - } - else - { - *cmd = 0; - j = 0; - - unsigned int vl = strlen(temp); - /* strip out extraneous linefeeds through mirc's crappy pasting (thanks Craig) */ - for (unsigned int i = 0; i < vl; i++) - { - if ((temp[i] != 10) && (temp[i] != 13) && (temp[i] != 0) && (temp[i] != 7)) + else { - cmd[j++] = temp[i]; - cmd[j] = 0; + /* remote or no flags required anyway */ + bOkay = true; } - } - - /* split the full string into a command plus parameters */ - parameters = p; - p[0] = ' '; - p[1] = 0; - - command = cmd; - if (strchr(cmd,' ')) - { - unsigned int cl = strlen(cmd); - - for (unsigned int i = 0; i <= cl; i++) + if (bOkay) { - /* capitalise the command ONLY, leave params intact */ - cmd[i] = toupper(cmd[i]); - /* are we nearly there yet?! :P */ - if (cmd[i] == ' ') - { - command = cmd; - parameters = cmd+i+1; - cmd[i] = '\0'; - break; - } - } - } - else - { - for (char* i = cmd; *i; i++) - { - *i = toupper(*i); + return n->second->Handle(parameters,pcnt,user); } } } + return CMD_INVALID; +} - if (strlen(command)>MAXCOMMAND) - { - WriteServ(user->fd,"421 %s %s :Command too long",user->nick,command); - return; - } +void CommandParser::ProcessCommand(userrec *user, std::string &cmd) +{ + const char *command_p[MAXPARAMETERS]; + int items = 0; + irc::tokenstream tokens(cmd); + std::string command; + tokens.GetToken(command); - for (char* x = command; *x; x++) - { - if (((*x < 'A') || (*x > 'Z')) && (*x != '.')) - { - if (((*x < '0') || (*x> '9')) && (*x != '-')) - { - if (strchr("@!\"$%^&*(){}[]_=+;:'#~,<>/?\\|`",*x)) - { - ServerInstance->stats->statsUnknown++; - WriteServ(user->fd,"421 %s %s :Unknown command",user->nick,command); - return; - } - } - } - } + /* 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.c_str() == ':') + tokens.GetToken(command); - std::string xcommand = command; - if ((user->registered != 7) && (xcommand == "SERVER")) + while (tokens.GetToken(para[items]) && (items < MAXPARAMETERS)) { - kill_link(user,"Server connection to non-server port"); - return; - } - - /* Tweak by brain - why was this INSIDE the mainloop? */ - if (parameters) - { - if (parameters[0]) - { - items = this->ProcessParameters(command_p,parameters); - } - else - { - items = 0; - command_p[0] = NULL; - } - } - else - { - items = 0; - command_p[0] = NULL; + command_p[items] = para[items].c_str(); + items++; } + std::transform(command.begin(), command.end(), command.begin(), ::toupper); + int MOD_RESULT = 0; - FOREACH_RESULT(I_OnPreCommand,OnPreCommand(command,command_p,items,user,false)); + FOREACH_RESULT(I_OnPreCommand,OnPreCommand(command,command_p,items,user,false,cmd)); if (MOD_RESULT == 1) { return; } - - nspace::hash_map::iterator cm = cmdlist.find(xcommand); + + command_table::iterator cm = cmdlist.find(command); if (cm != cmdlist.end()) { if (user) { /* activity resets the ping pending timer */ - user->nping = TIME + user->pingmax; - if ((items) < cm->second->min_params) + user->nping = ServerInstance->Time() + user->pingmax; + if (cm->second->flags_needed) { - log(DEBUG,"not enough parameters: %s %s",user->nick,command); - WriteServ(user->fd,"461 %s %s :Not enough parameters",user->nick,command); - return; + 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 ((!strchr(user->modes,cm->second->flags_needed)) && (cm->second->flags_needed)) + if ((user->registered == REG_ALL) && (!IS_OPER(user)) && (cm->second->IsDisabled())) { - log(DEBUG,"permission denied: %s %s",user->nick,command); - WriteServ(user->fd,"481 %s :Permission Denied- You do not have the required operator privilages",user->nick); - cmd_found = 1; + /* 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; } - if ((cm->second->flags_needed) && (!user->HasPermission(xcommand))) + if (items < cm->second->min_params) { - log(DEBUG,"permission denied: %s %s",user->nick,command); - WriteServ(user->fd,"481 %s :Permission Denied- Oper type %s does not have access to command %s",user->nick,user->oper,command); - cmd_found = 1; + 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; } - /* if the command isnt USER, PASS, or NICK, and nick is empty, - * deny command! */ - if ((strncmp(command,"USER",4)) && (strncmp(command,"NICK",4)) && (strncmp(command,"PASS",4))) - { - if ((!isnick(user->nick)) || (user->registered != 7)) - { - log(DEBUG,"not registered: %s %s",user->nick,command); - WriteServ(user->fd,"451 %s :You have not registered",command); - return; - } - } - if ((user->registered == 7) && (!*user->oper) && (*Config->DisabledCommands)) - { - std::stringstream dcmds(Config->DisabledCommands); - std::string thiscmd; - while (dcmds >> thiscmd) - { - if (!strcasecmp(thiscmd.c_str(),command)) - { - // command is disabled! - WriteServ(user->fd,"421 %s %s :This command has been disabled.",user->nick,command); - return; - } - } - } - if ((user->registered == 7) || (!strncmp(command,"USER",4)) || (!strncmp(command,"NICK",4)) || (!strncmp(command,"PASS",4))) + if ((user->registered == REG_ALL) || (cm->second->WorksBeforeReg())) { /* ikky /stats counters */ - if (temp) - { - cm->second->use_count++; - cm->second->total_bytes+=strlen(temp); - } + 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)); + 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! + * WARNING: be careful, the user may be deleted soon */ + CmdResult result = cm->second->Handle(command_p,items,user); - cm->second->Handle(command_p,items,user); + FOREACH_MOD(I_OnPostCommand,OnPostCommand(command, command_p, items, user, result,cmd)); return; } else { - WriteServ(user->fd,"451 %s :You have not registered",command); + user->WriteServ("451 %s :You have not registered",command.c_str()); return; } } @@ -645,171 +375,308 @@ void CommandParser::ProcessCommand(userrec *user, char* cmd) else if (user) { ServerInstance->stats->statsUnknown++; - WriteServ(user->fd,"421 %s %s :Unknown command",user->nick,command); + user->WriteServ("421 %s %s :Unknown command",user->nick,command.c_str()); } } bool CommandParser::RemoveCommands(const char* source) { - bool go_again = true; - - while (go_again) + command_table::iterator i,safei; + for (i = cmdlist.begin(); i != cmdlist.end(); i++) { - go_again = false; - - for (nspace::hash_map::iterator i = cmdlist.begin(); i != cmdlist.end(); i++) + safei = i; + safei++; + if (safei != cmdlist.end()) { - command_t* x = i->second; - if (x->source == std::string(source)) - { - log(DEBUG,"removecommands(%s) Removing dependent command: %s",x->source.c_str(),x->command.c_str()); - cmdlist.erase(i); - go_again = true; - break; - } + RemoveCommand(safei, source); } } - + safei = cmdlist.begin(); + if (safei != cmdlist.end()) + { + RemoveCommand(safei, source); + } return true; } -void CommandParser::ProcessBuffer(const char* cmdbuf,userrec *user) +void CommandParser::RemoveCommand(command_table::iterator safei, const char* source) +{ + command_t* x = safei->second; + if (x->source == std::string(source)) + { + cmdlist.erase(safei); + delete x; + } +} + +void CommandParser::ProcessBuffer(std::string &buffer,userrec *user) { - char cmd[MAXBUF]; + std::string::size_type a; if (!user) - { - log(DEFAULT,"*** BUG *** process_buffer was given an invalid parameter"); return; - } - if (!cmdbuf) + + 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()) { - log(DEFAULT,"*** BUG *** process_buffer was given an invalid parameter"); - return; + if (!user->muted) + { + ServerInstance->Log(DEBUG,"C[%d] I :%s %s",user->GetFd(), user->nick, buffer.c_str()); + this->ProcessCommand(user,buffer); + } } - if (!cmdbuf[0]) +} + +bool CommandParser::CreateCommand(command_t *f, void* so_handle) +{ + if (so_handle) { - return; + 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; + } } - while (*cmdbuf == ' ') cmdbuf++; // strip leading spaces + /* 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; +} - strlcpy(cmd,cmdbuf,MAXBUF); +CommandParser::CommandParser(InspIRCd* Instance) : ServerInstance(Instance) +{ + para.resize(128); +} - if (!cmd[0]) +bool CommandParser::FindSym(void** v, void* h, const std::string &name) +{ + *v = dlsym(h, "init_command"); + const char* err = dlerror(); + if (err && !(*v)) { - return; + ServerInstance->Log(SPARSE, "Error loading core command %s: %s\n", name, err); + return false; } + return true; +} + +bool CommandParser::ReloadCommand(const char* cmd, userrec* user) +{ + char filename[MAXBUF]; + char commandname[MAXBUF]; + int y = 0; + + for (const char* x = cmd; *x; x++, y++) + commandname[y] = toupper(*x); + commandname[y] = 0; - /* XXX - This is ugly as sin, and incomprehensible - why are we doing this twice, for instance? --w00t */ - int sl = strlen(cmd)-1; + SharedObjectList::iterator command = RFCCommands.find(commandname); - if ((cmd[sl] == 13) || (cmd[sl] == 10)) + if (command != RFCCommands.end()) { - cmd[sl] = '\0'; + 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); + 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; + } + + return true; } - sl = strlen(cmd)-1; + return false; +} - if ((cmd[sl] == 13) || (cmd[sl] == 10)) +CmdResult cmd_reload::Handle(const char** parameters, int pcnt, userrec *user) +{ + user->WriteServ("NOTICE %s :*** Reloading command '%s'",user->nick, parameters[0]); + if (ServerInstance->Parser->ReloadCommand(parameters[0], user)) { - cmd[sl] = '\0'; + 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; + } +} - sl = strlen(cmd)-1; - +const char* CommandParser::LoadCommand(const char* name) +{ + char filename[MAXBUF]; + void* h; + command_t* (*cmd_factory_func)(InspIRCd*); - while (cmd[sl] == ' ') // strip trailing spaces + /* Command already exists? Succeed silently - this is needed for REHASH */ + if (RFCCommands.find(name) != RFCCommands.end()) { - cmd[sl] = '\0'; - sl = strlen(cmd)-1; + ServerInstance->Log(DEBUG,"Not reloading command %s/%s, it already exists", LIBRARYDIR, name); + return NULL; } - if (!cmd[0]) + snprintf(filename, MAXBUF, "%s/%s", LIBRARYDIR, name); + h = dlopen(filename, RTLD_NOW | RTLD_GLOBAL); + + if (!h) { - return; + const char* n = dlerror(); + ServerInstance->Log(SPARSE, "Error loading core command %s: %s", name, n); + return n; } - log(DEBUG,"CMDIN: %s %s",user->nick,cmd); - tidystring(cmd); - if ((user) && (cmd)) + if (this->FindSym((void **)&cmd_factory_func, h, name)) { - this->ProcessCommand(user,cmd); + command_t* newcommand = cmd_factory_func(ServerInstance); + this->CreateCommand(newcommand, h); } + return NULL; } -bool CommandParser::CreateCommand(command_t *f) +void CommandParser::SetupCommandTable(userrec* user) { - /* create the command and push it onto the table */ - if (cmdlist.find(f->command) != cmdlist.end()) + RFCCommands.clear(); + + if (!user) { - cmdlist[f->command] = f; - log(DEBUG,"Added command %s (%lu parameters)",f->command.c_str(),(unsigned long)f->min_params); - return true; + printf("\nLoading core commands"); + fflush(stdout); } - else return false -} -CommandParser::CommandParser() -{ - this->SetupCommandTable(); + 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 (cmdlist.find("RELOAD") == cmdlist.end()) + this->CreateCommand(new cmd_reload(ServerInstance)); } -void CommandParser::SetupCommandTable() +int CommandParser::TranslateUIDs(TranslateType to, const std::string &source, std::string &dest) { - this->CreateCommand(new cmd_user); - this->CreateCommand(new cmd_nick); - this->CreateCommand(new cmd_quit); - this->CreateCommand(new cmd_version); - this->CreateCommand(new cmd_ping); - this->CreateCommand(new cmd_pong); - this->CreateCommand(new cmd_admin); - this->CreateCommand(new cmd_privmsg); - this->CreateCommand(new cmd_info); - this->CreateCommand(new cmd_time); - this->CreateCommand(new cmd_whois); - this->CreateCommand(new cmd_wallops); - this->CreateCommand(new cmd_notice); - this->CreateCommand(new cmd_join); - this->CreateCommand(new cmd_names); - this->CreateCommand(new cmd_part); - this->CreateCommand(new cmd_kick); - this->CreateCommand(new cmd_mode); - this->CreateCommand(new cmd_topic); - this->CreateCommand(new cmd_who); - this->CreateCommand(new cmd_motd); - this->CreateCommand(new cmd_rules); - this->CreateCommand(new cmd_oper); - this->CreateCommand(new cmd_list); - this->CreateCommand(new cmd_die); - this->CreateCommand(new cmd_restart); - this->CreateCommand(new cmd_kill); - this->CreateCommand(new cmd_rehash); - this->CreateCommand(new cmd_lusers); - this->CreateCommand(new cmd_stats); - this->CreateCommand(new cmd_userhost); - this->CreateCommand(new cmd_away); - this->CreateCommand(new cmd_ison); - this->CreateCommand(new cmd_summon); - this->CreateCommand(new cmd_users); - this->CreateCommand(new cmd_invite); - this->CreateCommand(new cmd_pass); - this->CreateCommand(new cmd_trace); - this->CreateCommand(new cmd_whowas); - this->CreateCommand(new cmd_connect); - this->CreateCommand(new cmd_squit); - this->CreateCommand(new cmd_modules); - this->CreateCommand(new cmd_links); - this->CreateCommand(new cmd_map); - this->CreateCommand(new cmd_kline); - this->CreateCommand(new cmd_gline); - this->CreateCommand(new cmd_zline); - this->CreateCommand(new cmd_qline); - this->CreateCommand(new cmd_eline); - this->CreateCommand(new cmd_loadmodule); - this->CreateCommand(new cmd_unloadmodule); - this->CreateCommand(new cmd_server); - this->CreateCommand(new cmd_commands); + userrec* user = NULL; + std::string item; + int translations = 0; + + switch (to) + { + case TR_NICK: + /* Translate single nickname */ + ServerInstance->Log(DEBUG,"TR_NICK"); + user = ServerInstance->FindNick(source); + if (user) + { + ServerInstance->Log(DEBUG,"Managed UUID"); + dest = user->uuid; + translations++; + } + else + { + ServerInstance->Log(DEBUG,"Had to use source.. (%s)", source.c_str()); + 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(source); + 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(source); + 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; }