X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fuserprocess.cpp;h=bc354fa6d955ab0d11341dc6e6305cf4f1c1a1f8;hb=6d03943426dcce76ba66567a9b18425a5ebb4c0c;hp=565b7df050690a01de94ec64e51b4537710d6668;hpb=fe66a14a06c5542a8b127e2f1e0a51e4dc2946dc;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/userprocess.cpp b/src/userprocess.cpp index 565b7df05..bc354fa6d 100644 --- a/src/userprocess.cpp +++ b/src/userprocess.cpp @@ -2,372 +2,111 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev. - * E-mail: - * - * + * InspIRCd: (C) 2002-2009 InspIRCd Development Team + * See: http://wiki.inspircd.org/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! ;) */ +/* $Core */ -using namespace std; - -#include "inspircd_config.h" -#include "configreader.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include "users.h" -#include "ctables.h" -#include "globals.h" -#include "modules.h" -#include "dynamic.h" -#include "wildcard.h" -#include "mode.h" -#include "commands.h" +#include "inspircd.h" #include "xline.h" -#include "inspstring.h" -#include "helperfuncs.h" -#include "hashcomp.h" #include "socketengine.h" -#include "userprocess.h" -#include "inspircd.h" -#include "typedefs.h" #include "command_parse.h" -#include "cull_list.h" -void InspIRCd::ProcessUser(userrec* cu) +void FloodQuitUserHandler::Call(User* current) { - int result = EAGAIN; - - if (cu->fd == FD_MAGIC_NUMBER) - return; + ServerInstance->Logs->Log("USERS",DEFAULT,"Excess flood from: %s@%s", current->ident.c_str(), current->host.c_str()); + ServerInstance->SNO->WriteToSnoMask('f',"Excess flood from: %s%s%s@%s", + current->registered == REG_ALL ? current->nick.c_str() : "", + current->registered == REG_ALL ? "!" : "", current->ident.c_str(), current->host.c_str()); + ServerInstance->Users->QuitUser(current, "Excess flood"); - log(DEBUG,"Processing user with fd %d",cu->fd); - - if (this->Config->GetIOHook(cu->GetPort())) + if (current->registered != REG_ALL) { - int result2 = 0; - int MOD_RESULT = 0; - - try - { - MOD_RESULT = this->Config->GetIOHook(cu->GetPort())->OnRawSocketRead(cu->fd,ReadBuffer,sizeof(ReadBuffer),result2); - log(DEBUG,"Data result returned by module: %d",MOD_RESULT); - } - catch (ModuleException& modexcept) - { - log(DEBUG,"Module exception caught: %s",modexcept.GetReason()); - } - - if (MOD_RESULT < 0) - { - result = -EAGAIN; - } + ZLine* zl = new ZLine(ServerInstance->Time(), 0, ServerInstance->Config->ServerName, "Flood from unregistered connection", current->GetIPString()); + if (ServerInstance->XLines->AddLine(zl,NULL)) + ServerInstance->XLines->ApplyLines(); else - { - result = result2; - } - } - else - { - result = cu->ReadData(ReadBuffer, sizeof(ReadBuffer)); + delete zl; } +} - log(DEBUG,"Read result: %d",result); - - if ((result) && (result != -EAGAIN)) +/** + * 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. + */ +void InspIRCd::DoBackgroundUserStuff() +{ + /* + * loop over all local users.. + */ + std::vector::reverse_iterator count2 = this->Users->local_users.rbegin(); + while (count2 != this->Users->local_users.rend()) { - userrec *current; - int currfd; - int floodlines = 0; + User *curr = *count2; + count2++; - this->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 - */ + if (curr->quitting) + continue; - for (int checker = 0; checker < result; checker++) + if (curr->Penalty) { - if (ReadBuffer[checker] == 0) - ReadBuffer[checker] = ' '; + curr->Penalty--; + curr->OnDataReady(); } - if (result > 0) - ReadBuffer[result] = '\0'; - - current = cu; - currfd = current->fd; - - // add the data to the users buffer - if (result > 0) + if (curr->getSendQSize() == 0) { - 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 == 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); - this->WriteOpers("*** Excess flood from: %s!%s@%s",current->nick,current->ident,current->host); - userrec::QuitUser(this, current,"Excess flood"); - return; - } - else - { - current->WriteServ("NOTICE %s :Your previous line was too long and was not delivered (Over 512chars) Please shorten it.", current->nick); - current->recvq = ""; - } - } - else - { - this->WriteOpers("*** Excess flood from %s",current->GetIPString()); - log(DEFAULT,"Excess flood from: %s",current->GetIPString()); - add_zline(120,this->Config->ServerName,"Flood from unregistered connection",current->GetIPString()); - apply_lines(APPLY_ZLINES); - } - - return; - } - - if (current->recvq.length() > (unsigned)this->Config->NetBufferSize) - { - if (current->registered == REG_ALL) - { - userrec::QuitUser(this, current,"RecvQ exceeded"); - } - else - { - this->WriteOpers("*** Excess flood from %s",current->GetIPString()); - log(DEFAULT,"Excess flood from: %s",current->GetIPString()); - add_zline(120,this->Config->ServerName,"Flood from unregistered connection",current->GetIPString()); - 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); - userrec::QuitUser(this, current,"Excess flood"); - return; - } + FOREACH_MOD(I_OnBufferFlushed,OnBufferFlushed(curr)); + } - if ((++floodlines > current->flood) && (current->flood != 0)) + switch (curr->registered) + { + case REG_ALL: + if (TIME > curr->nping) { - 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); - userrec::QuitUser(this, current,"Excess flood"); - } - else + // This user didn't answer the last ping, remove them + if (!curr->lastping) { - add_zline(120,this->Config->ServerName,"Flood from unregistered connection",current->GetIPString()); - apply_lines(APPLY_ZLINES); + time_t time = this->Time() - (curr->nping - curr->MyClass->GetPingTime()); + char message[MAXBUF]; + snprintf(message, MAXBUF, "Ping timeout: %ld second%s", (long)time, time > 1 ? "s" : ""); + curr->lastping = 1; + curr->nping = TIME + curr->MyClass->GetPingTime(); + this->Users->QuitUser(curr, message); + continue; } - return; + curr->Write("PING :%s",this->Config->ServerName); + curr->lastping = 0; + curr->nping = TIME +curr->MyClass->GetPingTime(); } - - // 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 = this->fd_ref_table[currfd]; - - this->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 = this->fd_ref_table[currfd]; - if ((currfd < 0) || (!this->fd_ref_table[currfd]) || (old_comp != new_comp)) + break; + case REG_NICKUSER: + if (AllModulesReportReady(curr) && curr->dns_done) { - return; - } - else - { - /* The user is still here, flush their buffer */ - current->FlushWriteBuf(); + /* User has sent NICK/USER, modules are okay, DNS finished. */ + curr->FullConnect(); + continue; } - } - - return; - } - - if ((result == -1) && (errno != EAGAIN) && (errno != EINTR)) - { - log(DEBUG,"killing: %s",cu->nick); - userrec::QuitUser(this,cu,strerror(errno)); - return; + break; } - } - // result EAGAIN means nothing read - else if ((result == EAGAIN) || (result == -EAGAIN)) - { - /* do nothing */ - } - else if (result == 0) - { - log(DEBUG,"InspIRCd: Exited: %s",cu->nick); - userrec::QuitUser(this,cu,"Client exited"); - log(DEBUG,"Bailing from client exit"); - return; - } -} - -void InspIRCd::DoSocketTimeouts(time_t TIME) -{ - unsigned int numsockets = this->module_sockets.size(); - SocketEngine* SE = this->SE; - - for (std::vector::iterator a = this->module_sockets.begin(); a < this->module_sockets.end(); a++) - { - InspSocket* s = (InspSocket*)*a; - if ((s) && (s->GetFd() >= 0) && (s->GetFd() < MAX_DESCRIPTORS) && (this->socket_ref[s->GetFd()] != NULL) && (s->Timeout(TIME))) - { - log(DEBUG,"userprocess.cpp: Socket poll returned false, close and bail"); - this->socket_ref[s->GetFd()] = NULL; - SE->DelFd(s->GetFd()); - this->module_sockets.erase(a); - s->Close(); - DELETE(s); - break; - } - - if (this->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. - */ -void InspIRCd::DoBackgroundUserStuff(time_t TIME) -{ - CullList GlobalGoners(this); - - /* XXX: IT IS NOT SAFE TO USE AN ITERATOR HERE. DON'T EVEN THINK ABOUT IT. */ - for (unsigned long count2 = 0; count2 != this->local_users.size(); count2++) - { - if (count2 >= this->local_users.size()) - break; - - userrec* curr = this->local_users[count2]; - - if (curr) + if (curr->registered != REG_ALL && (TIME > (curr->age + curr->MyClass->GetRegTimeout()))) { /* * 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); - this->stats->statsDnsBad++; - curr->FullConnect(&GlobalGoners); - continue; - } - if ((curr->dns_done) && (curr->registered == REG_NICKUSER) && (AllModulesReportReady(curr))) - { - log(DEBUG,"dns done, registered=3, and modules ready, OK"); - curr->FullConnect(&GlobalGoners); - //ZapThisDns(curr->fd); - continue; - } - // It's time to PING this user. Send them a ping. - 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"); - curr->lastping = 1; - curr->nping = TIME+curr->pingmax; - continue; - } - 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()) - { - GlobalGoners.AddItem(curr,curr->GetWriteError()); - continue; - } + this->Users->QuitUser(curr, "Registration timeout"); + continue; } - } - - - /* Remove all the queued users who are due to be quit, free memory used. */ - GlobalGoners.Apply(); } +