X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fuserprocess.cpp;h=469fa61d0a467e6fcc0ad2c734a9ceacb3b99f94;hb=b57c7f4e466f72fdd2ac3deca42caa1ea7748338;hp=01462d47c6c0ba977594c8abe0cee63a3527c6c9;hpb=c190d28aad7485cfc9a34d8b89beb3270720338a;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/userprocess.cpp b/src/userprocess.cpp index 01462d47c..469fa61d0 100644 --- a/src/userprocess.cpp +++ b/src/userprocess.cpp @@ -2,107 +2,56 @@ * | 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. * * --------------------------------------------------- */ -/* Now with added unF! ;) */ - -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 "ctables.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 "typedefs.h" #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; -extern std::vector factory; -extern std::vector module_sockets; -extern time_t TIME; -extern time_t OLDTIME; -extern std::vector local_users; -extern InspSocket* socket_ref[MAX_DESCRIPTORS]; -char LOG_FILE[MAXBUF]; - -extern InspIRCd* ServerInstance; -extern ServerConfig *Config; -extern userrec* fd_ref_table[MAX_DESCRIPTORS]; -char data[65536]; - -extern user_hash clientlist; -extern chan_hash chanlist; - -void ProcessUser(userrec* cu) + +void FloodQuitUserHandler::Call(User* current) +{ + Server->Log(DEFAULT,"Excess flood from: %s@%s", current->ident, current->host); + Server->SNO->WriteToSnoMask('f',"Excess flood from: %s%s%s@%s", + current->registered == REG_ALL ? current->nick : "", + current->registered == REG_ALL ? "!" : "", current->ident, current->host); + User::QuitUser(Server, current, "Excess flood"); + if (current->registered != REG_ALL) + { + Server->XLines->add_zline(120, Server->Config->ServerName, "Flood from unregistered connection", current->GetIPString()); + Server->XLines->apply_lines(APPLY_ZLINES); + } +} + +void ProcessUserHandler::Call(User* cu) { int result = EAGAIN; - if (cu->fd == FD_MAGIC_NUMBER) + if (cu->GetFd() == FD_MAGIC_NUMBER) return; - log(DEBUG,"Processing user with fd %d",cu->fd); + char* ReadBuffer = Server->GetReadBuffer(); - if (Config->GetIOHook(cu->port)) + if (Server->Config->GetIOHook(cu->GetPort())) { 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); + MOD_RESULT = Server->Config->GetIOHook(cu->GetPort())->OnRawSocketRead(cu->GetFd(),ReadBuffer,sizeof(ReadBuffer),result2); } - catch (ModuleException& modexcept) + catch (CoreException& modexcept) { - log(DEBUG,"Module exception cought: %s",modexcept.GetReason()); \ + Server->Log(DEBUG, "%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason()); } if (MOD_RESULT < 0) @@ -116,101 +65,60 @@ void ProcessUser(userrec* cu) } else { - result = cu->ReadData(data, 65535); + result = cu->ReadData(ReadBuffer, sizeof(ReadBuffer)); } - log(DEBUG,"Read result: %d",result); - if ((result) && (result != -EAGAIN)) { - userrec *current; + User *current; int currfd; - int floodlines; + int floodlines = 0; - ServerInstance->stats->statsRecv += result; + Server->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: *" - */ - - /* - * XXX - potential replacement for the below using my beloved pointers. --w00t - * - * for (char *c = data; data && *data; data++) - * { - * if (*data == 0 || *data == 7) - * data = ' '; - * } + * character 0 which is illegal in the RFC - replace them with spaces. */ for (int checker = 0; checker < result; checker++) { - if ((data[checker] == 0) || (data[checker] == 7)) - data[checker] = ' '; + if (ReadBuffer[checker] == 0) + ReadBuffer[checker] = ' '; } if (result > 0) - data[result] = '\0'; + ReadBuffer[result] = '\0'; current = cu; - currfd = current->fd; - floodlines = 0; + currfd = current->GetFd(); // add the data to the users buffer if (result > 0) { - if (!current->AddBuffer(data)) + if (!current->AddBuffer(ReadBuffer)) { // AddBuffer returned false, theres too much data in the user's buffer and theyre up to no good. - if (current->registered == 7) + if (current->registered == REG_ALL) { // Make sure they arn't flooding long lines. - if (TIME > current->reset_due) + if (Server->Time() > current->reset_due) { - current->reset_due = TIME + current->threshold; + current->reset_due = Server->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 (current->flood && current->lines_in > current->flood) + Server->FloodQuitUser(current); else { - WriteServ(currfd, "NOTICE %s :Your previous line was too long and was not delivered (Over 512chars) Please shorten it.", current->nick); - current->recvq = ""; + current->WriteServ("NOTICE %s :Your previous line was too long and was not delivered (Over %d chars) Please shorten it.", current->nick, MAXBUF-2); + current->recvq.clear(); } } 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); - } + Server->FloodQuitUser(current); return; } @@ -218,39 +126,21 @@ void ProcessUser(userrec* cu) // while there are complete lines to process... while (current->BufferIsReady()) { - char sanitized[MAXBUF]; - - floodlines++; - if (TIME > current->reset_due) + if (Server->Time() > current->reset_due) { - current->reset_due = TIME + current->threshold; + current->reset_due = Server->Time() + current->threshold; current->lines_in = 0; } - current->lines_in++; - - if (current->lines_in > current->flood) + if (++current->lines_in > current->flood && 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"); + Server->FloodQuitUser(current); return; } - if ((floodlines > current->flood) && (current->flood != 0)) + 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); - } - + Server->FloodQuitUser(current); return; } @@ -258,30 +148,10 @@ void ProcessUser(userrec* cu) std::string single_line = current->GetBuffer(); current->bytes_in += single_line.length(); current->cmds_in++; - strlcpy(sanitized,single_line.c_str(),511); + 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 */ - if (*sanitized) - { - userrec* old_comp = fd_ref_table[currfd]; - - 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(); - } - } + Server->Parser->ProcessBuffer(single_line, current); } return; @@ -289,8 +159,7 @@ void ProcessUser(userrec* cu) if ((result == -1) && (errno != EAGAIN) && (errno != EINTR)) { - log(DEBUG,"killing: %s",cu->nick); - kill_link(cu,strerror(errno)); + User::QuitUser(Server, cu, errno ? strerror(errno) : "EOF from client"); return; } } @@ -302,197 +171,113 @@ void ProcessUser(userrec* cu) } else if (result == 0) { - log(DEBUG,"InspIRCd: Exited: %s",cu->nick); - kill_link(cu,"Client exited"); - log(DEBUG,"Bailing from client exit"); + User::QuitUser(Server, cu, "Connection closed"); 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) && (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; - } -} - /** * This function is called once a second from the mainloop. * It is intended to do background checking on all the user structs, e.g. - * stuff like ping checks, registration timeouts, etc. This function is - * also responsible for checking if InspSocket derived classes are timed out. + * stuff like ping checks, registration timeouts, etc. */ -void DoBackgroundUserStuff(time_t TIME) +void InspIRCd::DoBackgroundUserStuff(time_t TIME) { - CullList GlobalGoners; - - for (std::vector::iterator count2 = local_users.begin(); count2 != local_users.end(); count2++) + /* Is it time yet? */ + if (TIME < next_call) + return; + else { - /* Sanity checks for corrupted iterators (yes, really) */ - userrec* curr = NULL; + /* Time we actually need to call this again */ + const time_t DUMMY_VALUE = 32768; + next_call = TIME + DUMMY_VALUE; - if (*count2) - curr = (userrec*)(*count2); - if ((long)curr == -1) - return; - - if (curr) + for (std::vector::iterator count2 = local_users.begin(); count2 != local_users.end(); count2++) { + User* curr = *count2; + /* * registration timeout -- didnt send USER/NICK/HOST * in the time specified in their connection class. */ - if (((unsigned)TIME > (unsigned)curr->timeout) && (curr->registered != 7)) + if ((TIME > curr->timeout) && (curr->registered != REG_ALL)) { - log(DEBUG,"InspIRCd: registration timeout: %s",curr->nick); - GlobalGoners.AddItem(curr,"Registration timeout"); + curr->muted = true; + User::QuitUser(this, curr, "Registration timeout"); continue; } - + else + { + if ((curr->registered != REG_ALL) && (next_call > (time_t)curr->timeout)) + next_call = curr->timeout; + } /* * 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))) + bool ready = AllModulesReportReady(curr); + if ((TIME > curr->signon) && (curr->registered == REG_NICKUSER) && (ready)) { - curr->dns_done = true; - ServerInstance->stats->statsDnsBad++; - FullConnectUser(curr,&GlobalGoners); + if (!curr->dns_done) + { + curr->WriteServ("NOTICE Auth :*** Could not resolve your hostname: Request timed out; using your IP address (%s) instead.", curr->GetIPString()); + curr->dns_done = true; + } + this->stats->statsDnsBad++; + curr->FullConnect(); continue; } + else + { + if ((curr->registered == REG_NICKUSER) && (ready) && (next_call > curr->signon)) + next_call = curr->signon; + } - if ((curr->dns_done) && (curr->registered == 3) && (AllModulesReportReady(curr))) + if ((curr->dns_done) && (curr->registered == REG_NICKUSER) && (ready)) { - log(DEBUG,"dns done, registered=3, and modules ready, OK"); - FullConnectUser(curr,&GlobalGoners); + curr->FullConnect(); continue; } + else + { + if ((curr->registered == REG_NICKUSER) && (ready) && (next_call > curr->signon + this->Config->dns_timeout)) + next_call = curr->signon + this->Config->dns_timeout; + } // 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"); + /* Everybody loves boobies. */ + time_t time = this->Time(false) - (curr->nping - curr->pingmax); + char message[MAXBUF]; + snprintf(message, MAXBUF, "Ping timeout: %ld second%s", (long)time, time > 1 ? "s" : ""); + curr->muted = true; + curr->lastping = 1; + curr->nping = TIME+curr->pingmax; + User::QuitUser(this, curr, message); continue; } - - Write(curr->fd,"PING :%s",Config->ServerName); + curr->Write("PING :%s",this->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. - */ - curr->FlushWriteBuf(); - - if (*curr->GetWriteError()) + else { - GlobalGoners.AddItem(curr,curr->GetWriteError()); - continue; + if ((curr->registered == REG_ALL) && (next_call > curr->nping)) + next_call = curr->nping; } } - } - - /* Remove all the queued users who are due to be quit, free memory used. */ - GlobalGoners.Apply(); -} - -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,"Uh-Oh, somebody didn't read their config file: '%s'",Config->DieValue); - Exit(ERROR); - } -} -/* We must load the modules AFTER initializing the socket engine, now */ -void LoadAllModules(InspIRCd* ServerInstance) -{ - char configToken[MAXBUF]; - Config->module_names.clear(); - - MODCOUNT = -1; - - for (int count = 0; count < Config->ConfValueEnum("module",&Config->config_f); count++) - { - Config->ConfValue("module","name",count,configToken,&Config->config_f); - printf("[\033[1;32m*\033[0m] Loading module:\t\033[1;32m%s\033[0m\n",configToken); - - if (!ServerInstance->LoadModule(configToken)) + /* If theres nothing to do, trigger in the next second, something might come up */ + time_t delta = next_call - TIME; + if (delta == DUMMY_VALUE) { - log(DEFAULT,"Exiting due to a module loader error."); - printf("\nThere was an error loading a module: %s\n\n",ServerInstance->ModuleError()); - Exit(0); + next_call = TIME + 1; + delta = 1; } } - - log(DEFAULT,"Total loaded modules: %lu",(unsigned long)MODCOUNT+1); } -