X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fusermanager.cpp;h=76446c5b57fb07371adaa9b6730e6f335d7e0805;hb=e6601069038c35c546fd3f3dce95024b0d13f1b4;hp=1cb269bdf45909b475ab255fde892cc2e0e68bc8;hpb=7a30c818ee4a5afb0aaea9adca4f2e3606b20c37;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/usermanager.cpp b/src/usermanager.cpp index 1cb269bdf..76446c5b5 100644 --- a/src/usermanager.cpp +++ b/src/usermanager.cpp @@ -1,59 +1,61 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd: (C) 2002-2008 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * Copyright (C) 2009-2010 Daniel De Graaf + * Copyright (C) 2008 Dennis Friis + * Copyright (C) 2008 Robin Burchell + * Copyright (C) 2008 Craig Edwards * - * 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 . */ -/* $Core */ #include "inspircd.h" #include "xline.h" #include "bancache.h" +UserManager::UserManager() + : unregistered_count(0), local_count(0) +{ +} + /* add a client connection to the sockets list */ -void UserManager::AddUser(InspIRCd* Instance, int socket, int port, bool iscached, int socketfamily, sockaddr* ip, const std::string &targetip) +void UserManager::AddUser(int socket, ListenSocket* via, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* server) { /* NOTE: Calling this one parameter constructor for User automatically * allocates a new UUID and places it in the hash_map. */ - User* New = NULL; + LocalUser* New = NULL; try { - New = new User(Instance); + New = new LocalUser(socket, client, server); } catch (...) { - Instance->Logs->Log("USERS", DEFAULT,"*** WTF *** Duplicated UUID! -- Crack smoking monkies have been unleashed."); - Instance->SNO->WriteToSnoMask('A', "WARNING *** Duplicate UUID allocated!"); + ServerInstance->Logs->Log("USERS", DEFAULT,"*** WTF *** Duplicated UUID! -- Crack smoking monkeys have been unleashed."); + ServerInstance->SNO->WriteToSnoMask('a', "WARNING *** Duplicate UUID allocated!"); return; } - - char ipaddr[MAXBUF]; -#ifdef IPV6 - if (socketfamily == AF_INET6) - inet_ntop(AF_INET6, &((const sockaddr_in6*)ip)->sin6_addr, ipaddr, sizeof(ipaddr)); - else -#endif - inet_ntop(AF_INET, &((const sockaddr_in*)ip)->sin_addr, ipaddr, sizeof(ipaddr)); - - New->SetFd(socket); - New->SetSockAddr(socketfamily, ipaddr, port); + UserIOHandler* eh = &New->eh; /* Give each of the modules an attempt to hook the user for I/O */ - FOREACH_MOD_I(Instance, I_OnHookUserIO, OnHookUserIO(New, targetip)); + FOREACH_MOD(I_OnHookIO, OnHookIO(eh, via)); - if (New->GetIOHook()) + if (eh->GetIOHook()) { try { - New->GetIOHook()->OnRawSocketAccept(socket, ipaddr, port); + eh->GetIOHook()->OnStreamSocketAccept(eh, client, server); } catch (CoreException& modexcept) { @@ -61,84 +63,73 @@ void UserManager::AddUser(InspIRCd* Instance, int socket, int port, bool iscache } } - Instance->Logs->Log("USERS", DEBUG,"New user fd: %d", socket); + ServerInstance->Logs->Log("USERS", DEBUG,"New user fd: %d", socket); this->unregistered_count++; - (*(this->clientlist))[New->uuid] = New; - /* The users default nick is their UUID */ - New->nick.assign(New->uuid, 0, ServerInstance->Config->Limits.NickMax); - - New->server = Instance->FindServerNamePtr(Instance->Config->ServerName); - New->ident.assign("unknown"); + New->nick = New->uuid; + (*(this->clientlist))[New->nick] = New; New->registered = REG_NONE; - New->signon = Instance->Time() + Instance->Config->dns_timeout; + New->signon = ServerInstance->Time(); New->lastping = 1; - /* Smarter than your average bear^H^H^H^Hset of strlcpys. */ - New->dhost.assign(New->GetIPString(), 0, 64); - New->host.assign(New->GetIPString(), 0, 64); + ServerInstance->Users->AddLocalClone(New); + ServerInstance->Users->AddGlobalClone(New); + + New->localuseriter = this->local_users.insert(local_users.end(), New); + local_count++; - Instance->Users->AddLocalClone(New); - Instance->Users->AddGlobalClone(New); + if ((this->local_users.size() > ServerInstance->Config->SoftLimit) || (this->local_users.size() >= (unsigned int)ServerInstance->SE->GetMaxFds())) + { + ServerInstance->SNO->WriteToSnoMask('a', "Warning: softlimit value has been reached: %d clients", ServerInstance->Config->SoftLimit); + this->QuitUser(New,"No more connections allowed"); + return; + } /* * First class check. We do this again in FullConnect after DNS is done, and NICK/USER is recieved. * See my note down there for why this is required. DO NOT REMOVE. :) -- w00t */ - ConnectClass* i = New->SetClass(); - - if (!i) - { - this->QuitUser(New, "Access denied by configuration"); - return; - } + New->SetClass(); /* * Check connect class settings and initialise settings into User. * This will be done again after DNS resolution. -- w00t */ New->CheckClass(); - - this->local_users.push_back(New); - - if ((this->local_users.size() > Instance->Config->SoftLimit) || (this->local_users.size() >= (unsigned int)Instance->SE->GetMaxFds())) - { - Instance->SNO->WriteToSnoMask('A', "Warning: softlimit value has been reached: %d clients", Instance->Config->SoftLimit); - this->QuitUser(New,"No more connections allowed"); + if (New->quitting) return; - } /* * even with bancache, we still have to keep User::exempt current. * besides that, if we get a positive bancache hit, we still won't fuck * them over if they are exempt. -- w00t */ - New->exempt = (Instance->XLines->MatchesLine("E",New) != NULL); + New->exempt = (ServerInstance->XLines->MatchesLine("E",New) != NULL); - if (BanCacheHit *b = Instance->BanCache->GetHit(New->GetIPString())) + if (BanCacheHit *b = ServerInstance->BanCache->GetHit(New->GetIPString())) { if (!b->Type.empty() && !New->exempt) { /* user banned */ - Instance->Logs->Log("BANCACHE", DEBUG, std::string("BanCache: Positive hit for ") + New->GetIPString()); - if (*Instance->Config->MoronBanner) - New->WriteServ("NOTICE %s :*** %s", New->nick.c_str(), Instance->Config->MoronBanner); + ServerInstance->Logs->Log("BANCACHE", DEBUG, std::string("BanCache: Positive hit for ") + New->GetIPString()); + if (!ServerInstance->Config->MoronBanner.empty()) + New->WriteServ("NOTICE %s :*** %s", New->nick.c_str(), ServerInstance->Config->MoronBanner.c_str()); this->QuitUser(New, b->Reason); return; } else { - Instance->Logs->Log("BANCACHE", DEBUG, std::string("BanCache: Negative hit for ") + New->GetIPString()); + ServerInstance->Logs->Log("BANCACHE", DEBUG, std::string("BanCache: Negative hit for ") + New->GetIPString()); } } else { if (!New->exempt) { - XLine* r = Instance->XLines->MatchesLine("Z",New); + XLine* r = ServerInstance->XLines->MatchesLine("Z",New); if (r) { @@ -148,9 +139,9 @@ void UserManager::AddUser(InspIRCd* Instance, int socket, int port, bool iscache } } - if (!Instance->SE->AddFd(New)) + if (!ServerInstance->SE->AddFd(eh, FD_WANT_FAST_READ | FD_WANT_EDGE_WRITE)) { - Instance->Logs->Log("USERS", DEBUG,"Internal error on new connection"); + ServerInstance->Logs->Log("USERS", DEBUG,"Internal error on new connection"); this->QuitUser(New, "Internal error handling connection"); } @@ -158,8 +149,16 @@ void UserManager::AddUser(InspIRCd* Instance, int socket, int port, bool iscache * BOPM and other stuff requires it. */ New->WriteServ("NOTICE Auth :*** Looking up your hostname..."); + if (ServerInstance->Config->RawLog) + New->WriteServ("NOTICE Auth :*** Raw I/O logging is enabled on this server. All messages, passwords, and commands are being recorded."); - if (Instance->Config->NoUserDns) + FOREACH_MOD(I_OnSetUserIP,OnSetUserIP(New)); + if (New->quitting) + return; + + FOREACH_MOD(I_OnUserInit,OnUserInit(New)); + + if (ServerInstance->Config->NoUserDns) { New->WriteServ("NOTICE %s :*** Skipping host resolution (disabled by server administrator)", New->nick.c_str()); New->dns_done = true; @@ -172,104 +171,112 @@ void UserManager::AddUser(InspIRCd* Instance, int socket, int port, bool iscache void UserManager::QuitUser(User *user, const std::string &quitreason, const char* operreason) { - ServerInstance->Logs->Log("USERS", DEBUG,"QuitUser: %s '%s'", user->nick.c_str(), quitreason.c_str()); - user->Write("ERROR :Closing link (%s@%s) [%s]", user->ident.c_str(), user->host.c_str(), *operreason ? operreason : quitreason.c_str()); - user->quietquit = false; - user->quitmsg = quitreason; + if (user->quitting) + { + ServerInstance->Logs->Log("USERS", DEFAULT, "ERROR: Tried to quit quitting user: " + user->nick); + return; + } + + if (IS_SERVER(user)) + { + ServerInstance->Logs->Log("USERS", DEFAULT, "ERROR: Tried to quit server user: " + user->nick); + return; + } + + user->quitting = true; + + ServerInstance->Logs->Log("USERS", DEBUG, "QuitUser: %s=%s '%s'", user->uuid.c_str(), user->nick.c_str(), quitreason.c_str()); + user->Write("ERROR :Closing link: (%s@%s) [%s]", user->ident.c_str(), user->host.c_str(), *operreason ? operreason : quitreason.c_str()); - if (!*operreason) - user->operquitmsg = quitreason; + std::string reason; + std::string oper_reason; + reason.assign(quitreason, 0, ServerInstance->Config->Limits.MaxQuit); + if (operreason && *operreason) + oper_reason.assign(operreason, 0, ServerInstance->Config->Limits.MaxQuit); else - user->operquitmsg = operreason; + oper_reason = quitreason; ServerInstance->GlobalCulls.AddItem(user); -} + if (user->registered == REG_ALL) + { + FOREACH_MOD(I_OnUserQuit,OnUserQuit(user, reason, oper_reason)); + user->WriteCommonQuit(reason, oper_reason); + } -void UserManager::AddLocalClone(User *user) -{ - int range = 32; - clonemap::iterator x; - switch (user->GetProtocolFamily()) + if (user->registered != REG_ALL) + if (ServerInstance->Users->unregistered_count) + ServerInstance->Users->unregistered_count--; + + if (IS_LOCAL(user)) + { + LocalUser* lu = IS_LOCAL(user); + FOREACH_MOD(I_OnUserDisconnect,OnUserDisconnect(lu)); + lu->eh.Close(); + } + + /* + * this must come before the ServerInstance->SNO->WriteToSnoMaskso that it doesnt try to fill their buffer with anything + * if they were an oper with +s +qQ. + */ + if (user->registered == REG_ALL) { -#ifdef SUPPORT_IP6LINKS - case AF_INET6: + if (IS_LOCAL(user)) { - range = ServerInstance->Config->c_ipv6_range; + if (!user->quietquit) + { + ServerInstance->SNO->WriteToSnoMask('q',"Client exiting: %s (%s) [%s]", + user->GetFullRealHost().c_str(), user->GetIPString(), oper_reason.c_str()); + } } - break; -#endif - case AF_INET: + else { - range = ServerInstance->Config->c_ipv4_range; + if ((!ServerInstance->SilentULine(user->server)) && (!user->quietquit)) + { + ServerInstance->SNO->WriteToSnoMask('Q',"Client exiting on server %s: %s (%s) [%s]", + user->server.c_str(), user->GetFullRealHost().c_str(), user->GetIPString(), oper_reason.c_str()); + } } - break; + user->AddToWhoWas(); } - x = local_clones.find(user->GetCIDRMask(range)); - if (x != local_clones.end()) - x->second++; + user_hash::iterator iter = this->clientlist->find(user->nick); + + if (iter != this->clientlist->end()) + this->clientlist->erase(iter); else - local_clones[user->GetCIDRMask(range)] = 1; + ServerInstance->Logs->Log("USERS", DEFAULT, "ERROR: Nick not found in clientlist, cannot remove: " + user->nick); + + ServerInstance->Users->uuidlist->erase(user->uuid); } -void UserManager::AddGlobalClone(User *user) + +void UserManager::AddLocalClone(User *user) { - int range = 32; - clonemap::iterator x; - switch (user->GetProtocolFamily()) - { -#ifdef SUPPORT_IP6LINKS - case AF_INET6: - { - range = ServerInstance->Config->c_ipv6_range; - } - break; -#endif - case AF_INET: - { - range = ServerInstance->Config->c_ipv4_range; - } - break; - } + local_clones[user->GetCIDRMask()]++; +} - x = global_clones.find(user->GetCIDRMask(range)); - if (x != global_clones.end()) - x->second++; - else - global_clones[user->GetCIDRMask(range)] = 1; +void UserManager::AddGlobalClone(User *user) +{ + global_clones[user->GetCIDRMask()]++; } void UserManager::RemoveCloneCounts(User *user) { - int range = 32; - switch (user->GetProtocolFamily()) + if (IS_LOCAL(user)) { -#ifdef SUPPORT_IP6LINKS - case AF_INET6: - { - range = ServerInstance->Config->c_ipv6_range; - } - break; -#endif - case AF_INET: + clonemap::iterator x = local_clones.find(user->GetCIDRMask()); + if (x != local_clones.end()) { - range = ServerInstance->Config->c_ipv4_range; + x->second--; + if (!x->second) + { + local_clones.erase(x); + } } - break; } - clonemap::iterator x = local_clones.find(user->GetCIDRMask(range)); - if (x != local_clones.end()) - { - x->second--; - if (!x->second) - { - local_clones.erase(x); - } - } - - clonemap::iterator y = global_clones.find(user->GetCIDRMask(range)); + clonemap::iterator y = global_clones.find(user->GetCIDRMask()); if (y != global_clones.end()) { y->second--; @@ -280,9 +287,25 @@ void UserManager::RemoveCloneCounts(User *user) } } +void UserManager::RehashCloneCounts() +{ + local_clones.clear(); + global_clones.clear(); + + const user_hash& hash = *ServerInstance->Users->clientlist; + for (user_hash::const_iterator i = hash.begin(); i != hash.end(); ++i) + { + User* u = i->second; + + if (IS_LOCAL(u)) + AddLocalClone(u); + AddGlobalClone(u); + } +} + unsigned long UserManager::GlobalCloneCount(User *user) { - clonemap::iterator x = global_clones.find(user->GetIPString()); + clonemap::iterator x = global_clones.find(user->GetCIDRMask()); if (x != global_clones.end()) return x->second; else @@ -291,7 +314,7 @@ unsigned long UserManager::GlobalCloneCount(User *user) unsigned long UserManager::LocalCloneCount(User *user) { - clonemap::iterator x = local_clones.find(user->GetIPString()); + clonemap::iterator x = local_clones.find(user->GetCIDRMask()); if (x != local_clones.end()) return x->second; else @@ -331,7 +354,7 @@ unsigned int UserManager::UnregisteredUserCount() unsigned int UserManager::LocalUserCount() { /* Doesnt count unregistered clients */ - return (this->local_users.size() - this->UnregisteredUserCount()); + return (this->local_count - this->UnregisteredUserCount()); } void UserManager::ServerNoticeAll(const char* text, ...) @@ -346,9 +369,9 @@ void UserManager::ServerNoticeAll(const char* text, ...) vsnprintf(textbuffer, MAXBUF, text, argsPtr); va_end(argsPtr); - snprintf(formatbuffer,MAXBUF,"NOTICE $%s :%s", ServerInstance->Config->ServerName, textbuffer); + snprintf(formatbuffer,MAXBUF,"NOTICE $%s :%s", ServerInstance->Config->ServerName.c_str(), textbuffer); - for (std::vector::const_iterator i = local_users.begin(); i != local_users.end(); i++) + for (LocalUserList::const_iterator i = local_users.begin(); i != local_users.end(); i++) { User* t = *i; t->WriteServ(std::string(formatbuffer)); @@ -367,87 +390,25 @@ void UserManager::ServerPrivmsgAll(const char* text, ...) vsnprintf(textbuffer, MAXBUF, text, argsPtr); va_end(argsPtr); - snprintf(formatbuffer,MAXBUF,"PRIVMSG $%s :%s", ServerInstance->Config->ServerName, textbuffer); + snprintf(formatbuffer,MAXBUF,"PRIVMSG $%s :%s", ServerInstance->Config->ServerName.c_str(), textbuffer); - for (std::vector::const_iterator i = local_users.begin(); i != local_users.end(); i++) + for (LocalUserList::const_iterator i = local_users.begin(); i != local_users.end(); i++) { User* t = *i; t->WriteServ(std::string(formatbuffer)); } } -void UserManager::WriteMode(const char* modes, int flags, const char* text, ...) -{ - char textbuffer[MAXBUF]; - int modelen; - va_list argsPtr; - - if (!text || !modes || !flags) - { - ServerInstance->Logs->Log("USERS", DEFAULT,"*** BUG *** WriteMode was given an invalid parameter"); - return; - } - - va_start(argsPtr, text); - vsnprintf(textbuffer, MAXBUF, text, argsPtr); - va_end(argsPtr); - modelen = strlen(modes); - - if (flags == WM_AND) - { - for (std::vector::const_iterator i = local_users.begin(); i != local_users.end(); i++) - { - User* t = *i; - bool send_to_user = true; - - for (int n = 0; n < modelen; n++) - { - if (!t->IsModeSet(modes[n])) - { - send_to_user = false; - break; - } - } - if (send_to_user) - { - t->WriteServ("NOTICE %s :%s", t->nick.c_str(), textbuffer); - } - } - } - else if (flags == WM_OR) - { - for (std::vector::const_iterator i = local_users.begin(); i != local_users.end(); i++) - { - User* t = *i; - bool send_to_user = false; - - for (int n = 0; n < modelen; n++) - { - if (t->IsModeSet(modes[n])) - { - send_to_user = true; - break; - } - } - - if (send_to_user) - { - t->WriteServ("NOTICE %s :%s", t->nick.c_str(), textbuffer); - } - } - } -} /* return how many users have a given mode e.g. 'a' */ int UserManager::ModeCount(const char mode) { - ModeHandler* mh = this->ServerInstance->Modes->FindMode(mode, MODETYPE_USER); - - if (mh) - return mh->GetCount(); - else - return 0; + int c = 0; + for(user_hash::iterator i = clientlist->begin(); i != clientlist->end(); ++i) + { + User* u = i->second; + if (u->modes[mode-65]) + c++; + } + return c; } - - -