X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fuserprocess.cpp;h=22a48fdcce3ca4e637ba573422434b00e5f3a2bc;hb=e00b5b82db1fdffd97704ea1b43bf921476adfa1;hp=118916248d2764ac6f66dc477275568b88989f28;hpb=f9f61ff60134a00220a360794e302be9bc90c46c;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/userprocess.cpp b/src/userprocess.cpp index 118916248..22a48fdcc 100644 --- a/src/userprocess.cpp +++ b/src/userprocess.cpp @@ -20,7 +20,7 @@ using namespace std; #include "inspircd_config.h" #include "inspircd.h" -#include "inspircd_io.h" +#include "configreader.h" #include #include #include @@ -28,19 +28,11 @@ using namespace std; #include #include #include -#ifdef GCC3 #include -#else -#include -#endif #include #include #include #include -#include -#ifdef THREADED_DNS -#include -#endif #include "users.h" #include "ctables.h" #include "globals.h" @@ -52,7 +44,6 @@ using namespace std; #include "commands.h" #include "xline.h" #include "inspstring.h" -#include "dnsqueue.h" #include "helperfuncs.h" #include "hashcomp.h" #include "socketengine.h" @@ -61,7 +52,6 @@ using namespace std; #include "command_parse.h" #include "cull_list.h" -extern int MODCOUNT; extern struct sockaddr_in client,server; extern socklen_t length; extern std::vector modules; @@ -70,7 +60,7 @@ extern std::vector module_sockets; extern time_t TIME; extern time_t OLDTIME; extern std::vector local_users; -char LOG_FILE[MAXBUF]; +extern InspSocket* socket_ref[MAX_DESCRIPTORS]; extern InspIRCd* ServerInstance; extern ServerConfig *Config; @@ -82,203 +72,237 @@ extern chan_hash chanlist; void ProcessUser(userrec* cu) { - int result = EAGAIN; + int result = EAGAIN; + if (cu->fd == FD_MAGIC_NUMBER) return; - log(DEBUG,"Processing user with fd %d",cu->fd); + + log(DEBUG,"Processing user with fd %d",cu->fd); + if (Config->GetIOHook(cu->port)) { - int result2 = 0; + int result2 = 0; int MOD_RESULT = 0; + try { MOD_RESULT = Config->GetIOHook(cu->port)->OnRawSocketRead(cu->fd,data,65535,result2); - log(DEBUG,"Data result returned by module: %d",MOD_RESULT); + log(DEBUG,"Data result returned by module: %d",MOD_RESULT); } - catch (ModuleException& modexcept) - { - log(DEBUG,"Module exception cought: %s",modexcept.GetReason()); \ - } + catch (ModuleException& modexcept) + { + log(DEBUG,"Module exception caught: %s",modexcept.GetReason()); + } + if (MOD_RESULT < 0) { result = -EAGAIN; } else { - result = result2; + result = result2; } } else { result = cu->ReadData(data, 65535); } - log(DEBUG,"Read result: %d",result); - if ((result) && (result != -EAGAIN)) - { - ServerInstance->stats->statsRecv += result; - // perform a check on the raw buffer as an array (not a string!) to remove - // characters 0 and 7 which are illegal in the RFC - replace them with spaces. - // hopefully this should stop even more people whining about "Unknown command: *" - for (int checker = 0; checker < result; checker++) - { - if ((data[checker] == 0) || (data[checker] == 7)) - data[checker] = ' '; - } - if (result > 0) - data[result] = '\0'; - userrec* current = cu; - int currfd = current->fd; - int floodlines = 0; - // add the data to the users buffer - if (result > 0) - { - if (!current->AddBuffer(data)) - { - // AddBuffer returned false, theres too much data in the user's buffer and theyre up to no good. - if (current->registered == 7) + + log(DEBUG,"Read result: %d",result); + + if ((result) && (result != -EAGAIN)) + { + userrec *current; + int currfd; + int floodlines = 0; + + ServerInstance->stats->statsRecv += result; + /* + * perform a check on the raw buffer as an array (not a string!) to remove + * character 0 which is illegal in the RFC - replace them with spaces. + * XXX - no garauntee there's not \0's in the middle of the data, + * and no reason for it to be terminated either. -- Om + */ + + for (int checker = 0; checker < result; checker++) + { + if (data[checker] == 0) + data[checker] = ' '; + } + + if (result > 0) + data[result] = '\0'; + + current = cu; + currfd = current->fd; + + // add the data to the users buffer + if (result > 0) + { + if (!current->AddBuffer(data)) + { + // AddBuffer returned false, theres too much data in the user's buffer and theyre up to no good. + if (current->registered == REG_ALL) { // Make sure they arn't flooding long lines. - if (TIME > current->reset_due) - { - current->reset_due = TIME + current->threshold; - current->lines_in = 0; - } - current->lines_in++; - if (current->lines_in > current->flood) - { - log(DEFAULT,"Excess flood from: %s!%s@%s",current->nick,current->ident,current->host); - WriteOpers("*** Excess flood from: %s!%s@%s",current->nick,current->ident,current->host); - kill_link(current,"Excess flood"); - return; - } else { - WriteServ(currfd, "NOTICE %s :Your previous line was too long and was not delivered (Over 512chars) Please shorten it.", current->nick); + if (TIME > current->reset_due) + { + current->reset_due = TIME + current->threshold; + current->lines_in = 0; + } + + current->lines_in++; + + if (current->lines_in > current->flood) + { + log(DEFAULT,"Excess flood from: %s!%s@%s",current->nick,current->ident,current->host); + WriteOpers("*** Excess flood from: %s!%s@%s",current->nick,current->ident,current->host); + kill_link(current,"Excess flood"); + return; + } + else + { + WriteServ(currfd, "NOTICE %s :Your previous line was too long and was not delivered (Over 512chars) Please shorten it.", current->nick); current->recvq = ""; } - } - else - { - WriteOpers("*** Excess flood from %s",(char*)inet_ntoa(current->ip4)); - log(DEFAULT,"Excess flood from: %s",(char*)inet_ntoa(current->ip4)); - add_zline(120,Config->ServerName,"Flood from unregistered connection",(char*)inet_ntoa(current->ip4)); - apply_lines(APPLY_ZLINES); - } - return; - } - if (current->recvq.length() > (unsigned)Config->NetBufferSize) - { - if (current->registered == 7) - { - kill_link(current,"RecvQ exceeded"); - } - else - { - WriteOpers("*** Excess flood from %s",(char*)inet_ntoa(current->ip4)); - log(DEFAULT,"Excess flood from: %s",(char*)inet_ntoa(current->ip4)); - add_zline(120,Config->ServerName,"Flood from unregistered connection",(char*)inet_ntoa(current->ip4)); - apply_lines(APPLY_ZLINES); - } - return; - } - // while there are complete lines to process... - while (current->BufferIsReady()) - { - floodlines++; - if (TIME > current->reset_due) - { - current->reset_due = TIME + current->threshold; - current->lines_in = 0; - } - current->lines_in++; - if (current->lines_in > current->flood) - { - log(DEFAULT,"Excess flood from: %s!%s@%s",current->nick,current->ident,current->host); - WriteOpers("*** Excess flood from: %s!%s@%s",current->nick,current->ident,current->host); - kill_link(current,"Excess flood"); - return; - } - if ((floodlines > current->flood) && (current->flood != 0)) - { - if (current->registered == 7) - { - log(DEFAULT,"Excess flood from: %s!%s@%s",current->nick,current->ident,current->host); - WriteOpers("*** Excess flood from: %s!%s@%s",current->nick,current->ident,current->host); - kill_link(current,"Excess flood"); - } - else - { - add_zline(120,Config->ServerName,"Flood from unregistered connection",(char*)inet_ntoa(current->ip4)); - apply_lines(APPLY_ZLINES); - } - return; - } - char sanitized[MAXBUF]; - // 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++; - strlcpy(sanitized,single_line.c_str(),511); - if (*sanitized) - { - userrec* old_comp = fd_ref_table[currfd]; - // we're gonna re-scan to check if the nick is gone, after every - // command - if it has, we're gonna bail - ServerInstance->Parser->ProcessBuffer(sanitized,current); - // look for the user's record in case it's changed... if theyve quit, - // we cant do anything more with their buffer, so bail. - // there used to be an ugly, slow loop here. Now we have a reference - // table, life is much easier (and FASTER) - userrec* new_comp = fd_ref_table[currfd]; - if ((currfd < 0) || (!fd_ref_table[currfd]) || (old_comp != new_comp)) - { - return; - } - else - { - /* The user is still here, flush their buffer */ - current->FlushWriteBuf(); - } - } - } - return; - } - if ((result == -1) && (errno != EAGAIN) && (errno != EINTR)) - { - log(DEBUG,"killing: %s",cu->nick); - kill_link(cu,strerror(errno)); - return; - } - } - // result EAGAIN means nothing read - else if ((result == EAGAIN) || (result == -EAGAIN)) - { - } - else if (result == 0) - { - log(DEBUG,"InspIRCd: Exited: %s",cu->nick); - kill_link(cu,"Client exited"); - log(DEBUG,"Bailing from client exit"); - return; - } + } + else + { + WriteOpers("*** Excess flood from %s",(char*)insp_ntoa(current->ip4)); + log(DEFAULT,"Excess flood from: %s",(char*)insp_ntoa(current->ip4)); + add_zline(120,Config->ServerName,"Flood from unregistered connection",(char*)insp_ntoa(current->ip4)); + apply_lines(APPLY_ZLINES); + } + + return; + } + + if (current->recvq.length() > (unsigned)Config->NetBufferSize) + { + if (current->registered == REG_ALL) + { + kill_link(current,"RecvQ exceeded"); + } + else + { + WriteOpers("*** Excess flood from %s",(char*)insp_ntoa(current->ip4)); + log(DEFAULT,"Excess flood from: %s",(char*)insp_ntoa(current->ip4)); + add_zline(120,Config->ServerName,"Flood from unregistered connection",(char*)insp_ntoa(current->ip4)); + apply_lines(APPLY_ZLINES); + } + + return; + } + + // while there are complete lines to process... + while (current->BufferIsReady()) + { + if (TIME > current->reset_due) + { + current->reset_due = TIME + current->threshold; + current->lines_in = 0; + } + + if (++current->lines_in > current->flood) + { + log(DEFAULT,"Excess flood from: %s!%s@%s",current->nick,current->ident,current->host); + WriteOpers("*** Excess flood from: %s!%s@%s",current->nick,current->ident,current->host); + kill_link(current,"Excess flood"); + return; + } + + if ((++floodlines > current->flood) && (current->flood != 0)) + { + if (current->registered == REG_ALL) + { + log(DEFAULT,"Excess flood from: %s!%s@%s",current->nick,current->ident,current->host); + WriteOpers("*** Excess flood from: %s!%s@%s",current->nick,current->ident,current->host); + kill_link(current,"Excess flood"); + } + else + { + add_zline(120,Config->ServerName,"Flood from unregistered connection",(char*)insp_ntoa(current->ip4)); + apply_lines(APPLY_ZLINES); + } + + 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() > 512) + single_line.resize(512); + + userrec* old_comp = fd_ref_table[currfd]; + + ServerInstance->Parser->ProcessBuffer(single_line,current); + /* + * look for the user's record in case it's changed... if theyve quit, + * we cant do anything more with their buffer, so bail. + * there used to be an ugly, slow loop here. Now we have a reference + * table, life is much easier (and FASTER) + */ + userrec* new_comp = fd_ref_table[currfd]; + if ((currfd < 0) || (!fd_ref_table[currfd]) || (old_comp != new_comp)) + { + return; + } + else + { + /* The user is still here, flush their buffer */ + current->FlushWriteBuf(); + } + } + + return; + } + + if ((result == -1) && (errno != EAGAIN) && (errno != EINTR)) + { + log(DEBUG,"killing: %s",cu->nick); + kill_link(cu,strerror(errno)); + return; + } + } + + // result EAGAIN means nothing read + else if ((result == EAGAIN) || (result == -EAGAIN)) + { + /* do nothing */ + } + else if (result == 0) + { + log(DEBUG,"InspIRCd: Exited: %s",cu->nick); + kill_link(cu,"Client exited"); + log(DEBUG,"Bailing from client exit"); + return; + } } void DoSocketTimeouts(time_t TIME) { - unsigned int numsockets = module_sockets.size(); - SocketEngine* SE = ServerInstance->SE; - for (std::vector::iterator a = module_sockets.begin(); a < module_sockets.end(); a++) - { - InspSocket* s = (InspSocket*)*a; - if (s->Timeout(TIME)) - { - log(DEBUG,"Socket poll returned false, close and bail"); - SE->DelFd(s->GetFd()); - s->Close(); - module_sockets.erase(a); - delete s; - break; - } - if (module_sockets.size() != numsockets) break; - } + unsigned int numsockets = module_sockets.size(); + SocketEngine* SE = ServerInstance->SE; + + for (std::vector::iterator a = module_sockets.begin(); a < module_sockets.end(); a++) + { + InspSocket* s = (InspSocket*)*a; + if ((s) && (s->GetFd() >= 0) && (s->GetFd() < MAX_DESCRIPTORS) && (socket_ref[s->GetFd()] != NULL) && (s->Timeout(TIME))) + { + log(DEBUG,"userprocess.cpp: Socket poll returned false, close and bail"); + socket_ref[s->GetFd()] = NULL; + SE->DelFd(s->GetFd()); + module_sockets.erase(a); + s->Close(); + DELETE(s); + break; + } + + if (module_sockets.size() != numsockets) + break; + } } /** @@ -289,139 +313,80 @@ void DoSocketTimeouts(time_t TIME) */ void DoBackgroundUserStuff(time_t TIME) { - CullList* GlobalGoners = new CullList(); - for (std::vector::iterator count2 = local_users.begin(); count2 != local_users.end(); count2++) - { - /* Sanity checks for corrupted iterators (yes, really) */ - userrec* curr = NULL; - if (*count2) - curr = (userrec*)(*count2); - if ((long)curr == -1) - return; - - if (curr) - { - // registration timeout -- didnt send USER/NICK/HOST in the time specified in - // their connection class. - if (((unsigned)TIME > (unsigned)curr->timeout) && (curr->registered != 7)) - { - log(DEBUG,"InspIRCd: registration timeout: %s",curr->nick); - GlobalGoners->AddItem(curr,"Registration timeout"); - continue; - } - // user has signed on with USER/NICK/PASS, and dns has completed, all the modules - // say this user is ok to proceed, fully connect them. - if ((TIME > curr->signon) && (curr->registered == 3) && (AllModulesReportReady(curr))) - { - curr->dns_done = true; - ServerInstance->stats->statsDnsBad++; - FullConnectUser(curr,GlobalGoners); - continue; - } - if ((curr->dns_done) && (curr->registered == 3) && (AllModulesReportReady(curr))) - { - log(DEBUG,"dns done, registered=3, and modules ready, OK"); - FullConnectUser(curr,GlobalGoners); - continue; - } + CullList GlobalGoners; + + /* XXX: IT IS NOT SAFE TO USE AN ITERATOR HERE. DON'T EVEN THINK ABOUT IT. */ + for (unsigned long count2 = 0; count2 != local_users.size(); count2++) + { + if (count2 >= local_users.size()) + break; + + userrec* curr = local_users[count2]; + + if (curr) + { + /* + * registration timeout -- didnt send USER/NICK/HOST + * in the time specified in their connection class. + */ + if (((unsigned)TIME > (unsigned)curr->timeout) && (curr->registered != REG_ALL)) + { + log(DEBUG,"InspIRCd: registration timeout: %s",curr->nick); + //ZapThisDns(curr->fd); + GlobalGoners.AddItem(curr,"Registration timeout"); + continue; + } + /* + * user has signed on with USER/NICK/PASS, and dns has completed, all the modules + * say this user is ok to proceed, fully connect them. + */ + if ((TIME > curr->signon) && (curr->registered == REG_NICKUSER) && (AllModulesReportReady(curr))) + { + curr->dns_done = true; + //ZapThisDns(curr->fd); + ServerInstance->stats->statsDnsBad++; + FullConnectUser(curr,&GlobalGoners); + continue; + } + if ((curr->dns_done) && (curr->registered == REG_NICKUSER) && (AllModulesReportReady(curr))) + { + log(DEBUG,"dns done, registered=3, and modules ready, OK"); + FullConnectUser(curr,&GlobalGoners); + //ZapThisDns(curr->fd); + continue; + } // It's time to PING this user. Send them a ping. - if ((TIME > curr->nping) && (curr->registered == 7)) - { + if ((TIME > curr->nping) && (curr->registered == REG_ALL)) + { // This user didn't answer the last ping, remove them if (!curr->lastping) { - GlobalGoners->AddItem(curr,"Ping timeout"); + GlobalGoners.AddItem(curr,"Ping timeout"); + curr->lastping = 1; + curr->nping = TIME+curr->pingmax; continue; } Write(curr->fd,"PING :%s",Config->ServerName); curr->lastping = 0; curr->nping = TIME+curr->pingmax; } - // We can flush the write buffer as the last thing we do, because if they - // match any of the above conditions its no use flushing their buffer anyway. + + /* + * We can flush the write buffer as the last thing we do, because if they + * match any of the above conditions its no use flushing their buffer anyway. + */ + curr->FlushWriteBuf(); - if (curr->GetWriteError() != "") + if (*curr->GetWriteError()) { - GlobalGoners->AddItem(curr,curr->GetWriteError()); + GlobalGoners.AddItem(curr,curr->GetWriteError()); continue; } - } - } - /** Remove all the queued users who are due to be quit - */ - GlobalGoners->Apply(); - /** Free to memory used - */ - delete GlobalGoners; - return; -} - -void OpenLog(char** argv, int argc) -{ - if (!*LOG_FILE) - { - if (Config->logpath == "") - { - Config->logpath = GetFullProgDir(argv,argc) + "/ircd.log"; - } - } - else - { - Config->log_file = fopen(LOG_FILE,"a+"); - if (!Config->log_file) - { - printf("ERROR: Could not write to logfile %s, bailing!\n\n",Config->logpath.c_str()); - Exit(ERROR); } - return; - } - Config->log_file = fopen(Config->logpath.c_str(),"a+"); - if (!Config->log_file) - { - printf("ERROR: Could not write to logfile %s, bailing!\n\n",Config->logpath.c_str()); - Exit(ERROR); - } -} - - -void CheckRoot() -{ - if (geteuid() == 0) - { - printf("WARNING!!! You are running an irc server as ROOT!!! DO NOT DO THIS!!!\n\n"); - log(DEFAULT,"InspIRCd: startup: not starting with UID 0!"); - Exit(ERROR); - } -} + } -void CheckDie() -{ - if (*Config->DieValue) - { - printf("WARNING: %s\n\n",Config->DieValue); - log(DEFAULT,"Ut-Oh, somebody didn't read their config file: '%s'",Config->DieValue); - exit(0); - } -} -void LoadAllModules(InspIRCd* ServerInstance) -{ - /* We must load the modules AFTER initializing the socket engine, now */ - MODCOUNT = -1; - char configToken[MAXBUF]; - for (int count = 0; count < Config->ConfValueEnum("module",&Config->config_f); count++) - { - Config->ConfValue("module","name",count,configToken,&Config->config_f); - printf("Loading module... \033[1;32m%s\033[0m\n",configToken); - if (!ServerInstance->LoadModule(configToken)) - { - log(DEFAULT,"Exiting due to a module loader error."); - printf("\nThere was an error loading a module: %s\n\nYou might want to do './inspircd start' instead of 'bin/inspircd'\n\n",ServerInstance->ModuleError()); - Exit(0); - } - } - log(DEFAULT,"Total loaded modules: %lu",(unsigned long)MODCOUNT+1); + /* Remove all the queued users who are due to be quit, free memory used. */ + GlobalGoners.Apply(); } - -