X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fuserprocess.cpp;h=69c31f8400898caacd9d2b1f01090aa1ac4f9f82;hb=e6601069038c35c546fd3f3dce95024b0d13f1b4;hp=0d45c1f9c5b6d792a2b3b6585eb866f430eaa763;hpb=9826d2ee0a26234a4f5421ae686b0068f3f64c57;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/userprocess.cpp b/src/userprocess.cpp index 0d45c1f9c..69c31f840 100644 --- a/src/userprocess.cpp +++ b/src/userprocess.cpp @@ -1,405 +1,126 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * Inspire is copyright (C) 2002-2005 ChatSpike-Dev. - * E-mail: - * - * + * Copyright (C) 2009 Daniel De Graaf + * Copyright (C) 2006-2008 Robin Burchell + * Copyright (C) 2005-2007 Craig Edwards + * Copyright (C) 2007 Dennis Friis + * Copyright (C) 2006 Craig McLure * - * Written by Craig Edwards, Craig McLure, and others. - * This program is free but copyrighted software; see - * the file COPYING for details. + * This file is part of InspIRCd. InspIRCd is free software: you can + * redistribute it and/or modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation, version 2. * - * --------------------------------------------------- + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ -/* Now with added unF! ;) */ -using namespace std; +/* $Core */ -#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 "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 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) { - int result = EAGAIN; - if (cu->fd == FD_MAGIC_NUMBER) - return; - log(DEBUG,"Processing user with fd %d",cu->fd); - if (Config->GetIOHook(cu->port)) + 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"); + + if (current->registered != REG_ALL) { - int result2 = 0; - int MOD_RESULT = Config->GetIOHook(cu->port)->OnRawSocketRead(cu->fd,data,65535,result2); - log(DEBUG,"Data result returned by module: %d",MOD_RESULT); - 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(data, 65535); + delete zl; } - log(DEBUG,"Read result: %d",result); - if (result) - { - 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) - { - kill_link(current,"RecvQ exceeded"); - } - else - { - WriteOpers("*** Excess flood from %s",current->ip); - log(DEFAULT,"Excess flood from: %s",current->ip); - add_zline(120,Config->ServerName,"Flood from unregistered connection",current->ip); - 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",current->ip); - log(DEFAULT,"Excess flood from: %s",current->ip); - add_zline(120,Config->ServerName,"Flood from unregistered connection",current->ip); - 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",current->ip); - 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++; - if (single_line.length()>512) - { - 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; - } - strlcpy(sanitized,single_line.c_str(),MAXBUF); - 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) - { - } - else if (result == 0) - { - log(DEBUG,"InspIRCd: Exited: %s",cu->nick); - kill_link(cu,"Client exited"); - log(DEBUG,"Bailing from client exit"); - return; - } } /** * 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. - * The function returns false when it is finished, and true if - * it needs to be run again (e.g. it has processed one of a batch of - * QUIT messages, but couldnt continue iterating because the iterator - * became invalid). This function is also responsible for checking - * if InspSocket derived classes are timed out. */ -bool DoBackgroundUserStuff(time_t TIME) +void InspIRCd::DoBackgroundUserStuff() { - 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; - } - 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 false; - - 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; - } - // It's time to PING this user. Send them a ping. - // XXX: We were checking isnick() here -- why when we check curr->registered? - Brain - if ((TIME > curr->nping) && (curr->registered == 7)) - { - // This user didn't answer the last ping, remove them - if (!curr->lastping) - { - GlobalGoners->AddItem(curr,"Ping timeout"); - continue; - } - Write(curr->fd,"PING :%s",Config->ServerName); - curr->lastping = 0; - curr->nping = TIME+curr->pingmax; - } - // XXX: 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; - } - } - } - /** Remove all the queued users who are due to be quit - */ - GlobalGoners->Apply(); - /** Free to memory used + /* + * loop over all local users.. */ - delete GlobalGoners; - /** XXX: The old system prior to 1.0RC2 would call this function - * repeatedly until everything was ship-shape, however now we are - * using CullList to avoid bailing from the loop, so this is no - * longer required. We always return false here so this only executes - * once. At some future date the while loop may be removed from - * the mainloop which calls this function. - */ - return false; -} - -void OpenLog(char** argv, int argc) -{ - std::string logpath = GetFullProgDir(argv,argc) + "/ircd.log"; - Config->log_file = fopen(logpath.c_str(),"a+"); - if (!Config->log_file) - { - printf("ERROR: Could not write to logfile %s, bailing!\n\n",logpath.c_str()); - Exit(ERROR); - } -#ifdef IS_CYGWIN - printf("Logging to ircd.log...\n"); -#else - printf("Logging to %s...\n",logpath.c_str()); -#endif -} + LocalUserList::reverse_iterator count2 = this->Users->local_users.rbegin(); + while (count2 != this->Users->local_users.rend()) + { + LocalUser *curr = *count2; + count2++; + if (curr->quitting) + continue; -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); - } -} + if (curr->CommandFloodPenalty || curr->eh.getSendQSize()) + { + unsigned int rate = curr->MyClass->GetCommandRate(); + if (curr->CommandFloodPenalty > rate) + curr->CommandFloodPenalty -= rate; + else + curr->CommandFloodPenalty = 0; + curr->eh.OnDataReady(); + } + switch (curr->registered) + { + case REG_ALL: + if (Time() > curr->nping) + { + // This user didn't answer the last ping, remove them + if (!curr->lastping) + { + 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; + } + + curr->Write("PING :%s",this->Config->ServerName.c_str()); + curr->lastping = 0; + curr->nping = Time() +curr->MyClass->GetPingTime(); + } + break; + case REG_NICKUSER: + if (AllModulesReportReady(curr) && curr->dns_done) + { + /* User has sent NICK/USER, modules are okay, DNS finished. */ + curr->FullConnect(); + continue; + } -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); - } -} + // If the user has been quit in OnCheckReady then we shouldn't + // quit them again for having a registration timeout. + if (curr->quitting) + continue; + break; + } -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); + if (curr->registered != REG_ALL && curr->MyClass && (Time() > (curr->signon + curr->MyClass->GetRegTimeout()))) + { + /* + * registration timeout -- didnt send USER/NICK/HOST + * in the time specified in their connection class. + */ + this->Users->QuitUser(curr, "Registration timeout"); + continue; + } + } } -