diff options
| -rw-r--r-- | src/base.cpp | 4 | ||||
| -rw-r--r-- | src/command_parse.cpp | 1190 |
2 files changed, 617 insertions, 577 deletions
diff --git a/src/base.cpp b/src/base.cpp index 2a2678606..fc6e6583b 100644 --- a/src/base.cpp +++ b/src/base.cpp @@ -120,6 +120,6 @@ BoolSet::BoolSet(char bitmask) bool BoolSet::operator=(BoolSet other) { - this->bits = other.bits; - return true; + this->bits = other.bits; + return true; } diff --git a/src/command_parse.cpp b/src/command_parse.cpp index 311def7d2..e5fc8fd7d 100644 --- a/src/command_parse.cpp +++ b/src/command_parse.cpp @@ -109,173 +109,181 @@ extern chan_hash chanlist; int CommandParser::LoopCall(command_t* fn, char **parameters, int pcnt, userrec *u, int start, int end, int joins) { - 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; - - for (int i = 0; i <32; i++) - *blog2[i] = 0; - - *moo = 0; - for (int i = 0; i <10; i++) - { - if (!parameters[i]) - { - parameters[i] = moo; - } - } - if (joins) - { - if (pcnt > 1) /* we have a key to copy */ - { - strlcpy(keystr,parameters[1],MAXBUF); - } - } - - if (!parameters[start]) - { - return 0; - } - if (!strchr(parameters[start],',')) - { - return 0; - } - *plist = 0; - for (int i = start; i <= end; i++) - { - if (parameters[i]) - { - strlcat(plist,parameters[i],MAXBUF); - } - } - - j = 0; - param = plist; - - t = strlen(plist); - 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; - } - } - } - strlcpy(blog[j++],param,MAXBUF); - total = j; - - if ((joins) && (keystr) && (total>0)) // more than one channel and is joining - { - strcat(keystr,","); - } - - if ((joins) && (keystr)) - { - if (strchr(keystr,',')) - { - j = 0; - param = keystr; - t2 = strlen(keystr); - for (int i = 0; i < t2; i++) - { - if (keystr[i] == ',') - { - keystr[i] = '\0'; - strlcpy(blog2[j++],param,MAXBUF); - param = keystr+i+1; - } - } - strlcpy(blog2[j++],param,MAXBUF); - total2 = j; - } - } - - for (j = 0; j < total; j++) - { - if (blog[j]) - { - pars[0] = blog[j]; - } - for (q = end; q < pcnt-1; q++) - { - if (parameters[q+1]) - { - pars[q-end+1] = parameters[q+1]; - } - } - if ((joins) && (parameters[1])) - { - if (pcnt > 1) - { - pars[1] = blog2[j]; - } - else - { - pars[1] = NULL; - } - } - /* 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); - } - } - - return 1; + 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; + } + + *moo = 0; + for (int i = 0; i <10; i++) + { + if (!parameters[i]) + { + parameters[i] = moo; + } + } + if (joins) + { + if (pcnt > 1) /* we have a key to copy */ + { + strlcpy(keystr,parameters[1],MAXBUF); + } + } + + if (!parameters[start] || (!strchr(parameters[start],','))) + { + return 0; + } + + *plist = 0; + + for (int i = start; i <= end; i++) + { + if (parameters[i]) + { + strlcat(plist,parameters[i],MAXBUF); + } + } + + j = 0; + param = plist; + + t = strlen(plist); + + 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; + } + } + } + + strlcpy(blog[j++],param,MAXBUF); + total = j; + + if ((joins) && (keystr) && (total>0)) // more than one channel and is joining + { + strcat(keystr,","); + } + + if ((joins) && (keystr)) + { + if (strchr(keystr,',')) + { + j = 0; + param = keystr; + t2 = strlen(keystr); + + for (int i = 0; i < t2; i++) + { + if (keystr[i] == ',') + { + keystr[i] = '\0'; + strlcpy(blog2[j++],param,MAXBUF); + param = keystr+i+1; + } + } + + strlcpy(blog2[j++],param,MAXBUF); + total2 = j; + } + } + + for (j = 0; j < total; j++) + { + if (blog[j]) + { + pars[0] = blog[j]; + } + + for (q = end; q < pcnt-1; q++) + { + if (parameters[q+1]) + { + pars[q-end+1] = parameters[q+1]; + } + } + + if ((joins) && (parameters[1])) + { + if (pcnt > 1) + { + pars[1] = blog2[j]; + } + else + { + pars[1] = NULL; + } + } + + /* 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); + } + } + + return 1; } bool CommandParser::IsValidCommand(std::string &commandname, int pcnt, userrec * user) { nspace::hash_map<std::string,command_t*>::iterator n = cmdlist.find(commandname); + if (n != cmdlist.end()) { - if ((pcnt>=n->second->min_params) && (n->second->source != "<core>")) - { - 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))) - { - return true; - } - else - { - return false; - } - } - return true; - } - } - } - return false; + if ((pcnt>=n->second->min_params) && (n->second->source != "<core>")) + { + 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))) + { + return true; + } + else + { + return false; + } + } + + return true; + } + } + } + + return false; } // calls a handler function for a command @@ -283,229 +291,241 @@ bool CommandParser::IsValidCommand(std::string &commandname, int pcnt, userrec * void CommandParser::CallHandler(std::string &commandname,char **parameters, int pcnt, userrec *user) { nspace::hash_map<std::string,command_t*>::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); - } - } - } - } + + 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); + } + } + } + } } 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 1; - } - } - command_p[j++] = parameters; - for (int i = 0; i <= q; i++) - { - if (parameters[i] == ' ') - { - command_p[j++] = parameters+i+1; - parameters[i] = '\0'; - if (command_p[j-1][0] == ':') - { - *command_p[j-1]++; /* remove dodgy ":" */ - break; - /* parameter like this marks end of the sequence */ - } - } - } - return j; /* returns total number of items in the list */ + 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 1; + } + } + + command_p[j++] = parameters; + + for (int i = 0; i <= q; i++) + { + if (parameters[i] == ' ') + { + command_p[j++] = parameters+i+1; + parameters[i] = '\0'; + + if (command_p[j-1][0] == ':') + { + *command_p[j-1]++; /* remove dodgy ":" */ + break; + /* parameter like this marks end of the sequence */ + } + } + } + + 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; - - for (int i = 0; i < 127; i++) - command_p[i] = NULL; - - if (!user) - { - return; - } - if (!cmd) - { - return; - } - if (!cmd[0]) - { - return; - } - - int total_params = 0; - unsigned int xl = strlen(cmd); - if (xl > 2) - { - for (unsigned int q = 0; q < xl - 1; q++) - { - if ((cmd[q] == ' ') && (cmd[q+1] == ':')) - { - total_params++; - // found a 'trailing', we dont count them after this. - break; - } - if (cmd[q] == ' ') - 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; + 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] == ':') + { + total_params++; + // found a 'trailing', we dont count them after this. + break; + } + 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; + 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)) - { - cmd[j++] = temp[i]; - cmd[j] = 0; - } - } - /* split the full string into a command plus parameters */ - parameters = p; - p[0] = ' '; + /* 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)) + { + cmd[j++] = temp[i]; + cmd[j] = 0; + } + } + + /* split the full string into a command plus parameters */ + parameters = p; + p[0] = ' '; p[1] = 0; - - command = cmd; - if (strchr(cmd,' ')) - { + + command = cmd; + + if (strchr(cmd,' ')) + { unsigned int cl = strlen(cmd); - for (unsigned int i = 0; i <= cl; i++) - { - /* 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); - } - } - - } - - if (strlen(command)>MAXCOMMAND) - { - WriteServ(user->fd,"421 %s %s :Command too long",user->nick,command); - return; - } - - 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; - } - } - } - } - - std::string xcommand = command; + + for (unsigned int i = 0; i <= cl; i++) + { + /* 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); + } + } + } + + if (strlen(command)>MAXCOMMAND) + { + WriteServ(user->fd,"421 %s %s :Command too long",user->nick,command); + return; + } + + 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; + } + } + } + } + + std::string xcommand = command; if ((user->registered != 7) && (xcommand == "SERVER")) { kill_link(user,"Server connection to non-server port"); @@ -539,173 +559,193 @@ void CommandParser::ProcessCommand(userrec *user, char* cmd) nspace::hash_map<std::string,command_t*>::iterator cm = cmdlist.find(xcommand); - if (cm != cmdlist.end()) - { - if (user) - { - /* activity resets the ping pending timer */ - user->nping = TIME + user->pingmax; - if ((items) < cm->second->min_params) - { - log(DEBUG,"not enough parameters: %s %s",user->nick,command); - WriteServ(user->fd,"461 %s %s :Not enough parameters",user->nick,command); - return; - } - if ((!strchr(user->modes,cm->second->flags_needed)) && (cm->second->flags_needed)) - { - 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; - return; - } - if ((cm->second->flags_needed) && (!user->HasPermission(xcommand))) - { - 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; - 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) && (!strchr(user->modes,'o'))) - { - std::stringstream dcmds(Config->DisabledCommands); - while (!dcmds.eof()) - { - std::string thiscmd; - 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))) - { - /* ikky /stats counters */ - if (temp) - { - cm->second->use_count++; - cm->second->total_bytes+=strlen(temp); - } - - int MOD_RESULT = 0; - FOREACH_RESULT(I_OnPreCommand,OnPreCommand(command,command_p,items,user,true)); - if (MOD_RESULT == 1) { - return; - } - - /* WARNING: nothing may come after the - * command handler call, as the handler - * may free the user structure! */ - - cm->second->Handle(command_p,items,user); - return; - } - else - { - WriteServ(user->fd,"451 %s :You have not registered",command); - return; - } - } - } + if (cm != cmdlist.end()) + { + if (user) + { + /* activity resets the ping pending timer */ + user->nping = TIME + user->pingmax; + if ((items) < cm->second->min_params) + { + log(DEBUG,"not enough parameters: %s %s",user->nick,command); + WriteServ(user->fd,"461 %s %s :Not enough parameters",user->nick,command); + return; + } + if ((!strchr(user->modes,cm->second->flags_needed)) && (cm->second->flags_needed)) + { + 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; + return; + } + if ((cm->second->flags_needed) && (!user->HasPermission(xcommand))) + { + 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; + 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) && (!strchr(user->modes,'o'))) + { + std::stringstream dcmds(Config->DisabledCommands); + while (!dcmds.eof()) + { + std::string thiscmd; + 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))) + { + /* ikky /stats counters */ + if (temp) + { + cm->second->use_count++; + cm->second->total_bytes+=strlen(temp); + } + + int MOD_RESULT = 0; + FOREACH_RESULT(I_OnPreCommand,OnPreCommand(command,command_p,items,user,true)); + if (MOD_RESULT == 1) + { + return; + } + + /* + * WARNING: nothing may come after the + * command handler call, as the handler + * may free the user structure! + */ + + cm->second->Handle(command_p,items,user); + return; + } + else + { + WriteServ(user->fd,"451 %s :You have not registered",command); + return; + } + } + } else if (user) - { - ServerInstance->stats->statsUnknown++; - WriteServ(user->fd,"421 %s %s :Unknown command",user->nick,command); - } + { + ServerInstance->stats->statsUnknown++; + WriteServ(user->fd,"421 %s %s :Unknown command",user->nick,command); + } } bool CommandParser::RemoveCommands(const char* source) { - bool go_again = true; - while (go_again) - { - go_again = false; - for (nspace::hash_map<std::string,command_t*>::iterator i = cmdlist.begin(); i != cmdlist.end(); i++) - { + bool go_again = true; + + while (go_again) + { + go_again = false; + + for (nspace::hash_map<std::string,command_t*>::iterator i = cmdlist.begin(); i != cmdlist.end(); i++) + { 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; - } - } - } - return true; + 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; + } + } + } + + return true; } void CommandParser::ProcessBuffer(const char* cmdbuf,userrec *user) { - if (!user) - { - log(DEFAULT,"*** BUG *** process_buffer was given an invalid parameter"); - return; - } - char cmd[MAXBUF]; - if (!cmdbuf) - { - log(DEFAULT,"*** BUG *** process_buffer was given an invalid parameter"); - return; - } - if (!cmdbuf[0]) - { - return; - } - while (*cmdbuf == ' ') cmdbuf++; // strip leading spaces - - strlcpy(cmd,cmdbuf,MAXBUF); - if (!cmd[0]) - { - return; - } - int sl = strlen(cmd)-1; - if ((cmd[sl] == 13) || (cmd[sl] == 10)) - { - cmd[sl] = '\0'; - } - sl = strlen(cmd)-1; - if ((cmd[sl] == 13) || (cmd[sl] == 10)) - { - cmd[sl] = '\0'; - } - sl = strlen(cmd)-1; - while (cmd[sl] == ' ') // strip trailing spaces - { - cmd[sl] = '\0'; - sl = strlen(cmd)-1; - } - - if (!cmd[0]) - { - return; - } - log(DEBUG,"CMDIN: %s %s",user->nick,cmd); - tidystring(cmd); - if ((user) && (cmd)) - { - this->ProcessCommand(user,cmd); - } + char cmd[MAXBUF]; + + if (!user) + { + log(DEFAULT,"*** BUG *** process_buffer was given an invalid parameter"); + return; + } + if (!cmdbuf) + { + log(DEFAULT,"*** BUG *** process_buffer was given an invalid parameter"); + return; + } + if (!cmdbuf[0]) + { + return; + } + + while (*cmdbuf == ' ') cmdbuf++; // strip leading spaces + + strlcpy(cmd,cmdbuf,MAXBUF); + + if (!cmd[0]) + { + return; + } + + + /* XXX - This is ugly as sin, and incomprehensible - why are we doing this twice, for instance? --w00t */ + int sl = strlen(cmd)-1; + + if ((cmd[sl] == 13) || (cmd[sl] == 10)) + { + cmd[sl] = '\0'; + } + + sl = strlen(cmd)-1; + + if ((cmd[sl] == 13) || (cmd[sl] == 10)) + { + cmd[sl] = '\0'; + } + + sl = strlen(cmd)-1; + + + while (cmd[sl] == ' ') // strip trailing spaces + { + cmd[sl] = '\0'; + sl = strlen(cmd)-1; + } + + if (!cmd[0]) + { + return; + } + + log(DEBUG,"CMDIN: %s %s",user->nick,cmd); + tidystring(cmd); + if ((user) && (cmd)) + { + this->ProcessCommand(user,cmd); + } } bool CommandParser::CreateCommand(command_t *f) { - /* create the command and push it onto the table */ - cmdlist[f->command] = f; - log(DEBUG,"Added command %s (%lu parameters)",f->command.c_str(),(unsigned long)f->min_params); + /* create the command and push it onto the table */ + cmdlist[f->command] = f; + log(DEBUG,"Added command %s (%lu parameters)",f->command.c_str(),(unsigned long)f->min_params); return true; } @@ -717,57 +757,57 @@ CommandParser::CommandParser() void CommandParser::SetupCommandTable() { 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); + 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); } |