]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/usermanager.cpp
Merge insp20
[user/henk/code/inspircd.git] / src / usermanager.cpp
index 52cb4989fbbaf199ff0eee1aa1718d27337e4aae..12ec36ec7ce16d0db4477c5978c241508c1563cd 100644 (file)
 #include "xline.h"
 #include "iohook.h"
 
+namespace
+{
+       class WriteCommonQuit : public User::ForEachNeighborHandler
+       {
+               std::string line;
+               std::string operline;
+
+               void Execute(LocalUser* user) CXX11_OVERRIDE
+               {
+                       user->Write(user->IsOper() ? operline : line);
+               }
+
+        public:
+               WriteCommonQuit(User* user, const std::string& msg, const std::string& opermsg)
+                       : line(":" + user->GetFullHost() + " QUIT :")
+                       , operline(line)
+               {
+                       line += msg;
+                       operline += opermsg;
+                       user->ForEachNeighbor(*this, false);
+               }
+       };
+}
+
 UserManager::UserManager()
-       : unregistered_count(0)
+       : already_sent_id(0)
+       , unregistered_count(0)
 {
 }
 
@@ -37,44 +62,41 @@ UserManager::~UserManager()
        }
 }
 
-/* add a client connection to the sockets list */
 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.
-        */
-       LocalUser* New = NULL;
-       try
-       {
-               New = new LocalUser(socket, client, server);
-       }
-       catch (...)
-       {
-               ServerInstance->Logs->Log("USERS", LOG_DEFAULT, "*** WTF *** Duplicated UUID! -- Crack smoking monkeys have been unleashed.");
-               ServerInstance->SNO->WriteToSnoMask('a', "WARNING *** Duplicate UUID allocated!");
-               return;
-       }
+       // User constructor allocates a new UUID for the user and inserts it into the uuidlist
+       LocalUser* const New = new LocalUser(socket, client, server);
        UserIOHandler* eh = &New->eh;
 
-       // If this listener has an IO hook provider set then tell it about the connection
-       if (via->iohookprov)
-               via->iohookprov->OnAccept(eh, client, server);
-
        ServerInstance->Logs->Log("USERS", LOG_DEBUG, "New user fd: %d", socket);
 
        this->unregistered_count++;
-
-       /* The users default nick is their UUID */
-       New->nick = New->uuid;
        this->clientlist[New->nick] = New;
+       this->AddClone(New);
+       this->local_users.push_front(New);
 
-       New->registered = REG_NONE;
-       New->signon = ServerInstance->Time() + ServerInstance->Config->dns_timeout;
-       New->lastping = 1;
+       if (!SocketEngine::AddFd(eh, FD_WANT_FAST_READ | FD_WANT_EDGE_WRITE))
+       {
+               ServerInstance->Logs->Log("USERS", LOG_DEBUG, "Internal error on new connection");
+               this->QuitUser(New, "Internal error handling connection");
+               return;
+       }
 
-       this->AddClone(New);
+       // If this listener has an IO hook provider set then tell it about the connection
+       for (ListenSocket::IOHookProvList::iterator i = via->iohookprovs.begin(); i != via->iohookprovs.end(); ++i)
+       {
+               ListenSocket::IOHookProvRef& iohookprovref = *i;
+               if (!iohookprovref)
+                       continue;
 
-       this->local_users.push_front(New);
+               iohookprovref->OnAccept(eh, client, server);
+               // IOHook could have encountered a fatal error, e.g. if the TLS ClientHello was already in the queue and there was no common TLS version
+               if (!eh->getError().empty())
+               {
+                       QuitUser(New, eh->getError());
+                       return;
+               }
+       }
 
        if (this->local_users.size() > ServerInstance->Config->SoftLimit)
        {
@@ -83,16 +105,9 @@ void UserManager::AddUser(int socket, ListenSocket* via, irc::sockets::sockaddrs
                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
-        */
+       // First class check. We do this again in LocalUser::FullConnect() after DNS is done, and NICK/USER is received.
        New->SetClass();
-
-       /*
-        * Check connect class settings and initialise settings into User.
-        * This will be done again after DNS resolution. -- w00t
-        */
+       // If the user doesn't have an acceptable connect class CheckClass() quits them
        New->CheckClass(ServerInstance->Config->CCOnConnect);
        if (New->quitting)
                return;
@@ -112,7 +127,7 @@ void UserManager::AddUser(int socket, ListenSocket* via, irc::sockets::sockaddrs
                        /* user banned */
                        ServerInstance->Logs->Log("BANCACHE", LOG_DEBUG, "BanCache: Positive hit for " + New->GetIPString());
                        if (!ServerInstance->Config->XLineMessage.empty())
-                               New->WriteNotice("*** " +  ServerInstance->Config->XLineMessage);
+                               New->WriteNumeric(ERR_YOUREBANNEDCREEP, ServerInstance->Config->XLineMessage);
                        this->QuitUser(New, b->Reason);
                        return;
                }
@@ -135,12 +150,6 @@ void UserManager::AddUser(int socket, ListenSocket* via, irc::sockets::sockaddrs
                }
        }
 
-       if (!SocketEngine::AddFd(eh, FD_WANT_FAST_READ | FD_WANT_EDGE_WRITE))
-       {
-               ServerInstance->Logs->Log("USERS", LOG_DEBUG, "Internal error on new connection");
-               this->QuitUser(New, "Internal error handling connection");
-       }
-
        if (ServerInstance->Config->RawLog)
                New->WriteNotice("*** Raw I/O logging is enabled on this server. All messages, passwords, and commands are being recorded.");
 
@@ -180,7 +189,7 @@ void UserManager::QuitUser(User* user, const std::string& quitreason, const std:
        if (user->registered == REG_ALL)
        {
                FOREACH_MOD(OnUserQuit, (user, reason, *operreason));
-               user->WriteCommonQuit(reason, *operreason);
+               WriteCommonQuit(user, reason, *operreason);
        }
        else
                unregistered_count--;
@@ -230,6 +239,18 @@ void UserManager::RemoveCloneCounts(User *user)
        }
 }
 
+void UserManager::RehashCloneCounts()
+{
+       clonemap.clear();
+
+       const user_hash& hash = ServerInstance->Users.GetUsers();
+       for (user_hash::const_iterator i = hash.begin(); i != hash.end(); ++i)
+       {
+               User* u = i->second;
+               AddClone(u);
+       }
+}
+
 const UserManager::CloneCounts& UserManager::GetCloneCounts(User* user) const
 {
        CloneMap::const_iterator it = clonemap.find(user->GetCIDRMask());
@@ -252,17 +273,6 @@ void UserManager::ServerNoticeAll(const char* text, ...)
        }
 }
 
-void UserManager::GarbageCollect()
-{
-       // Reset the already_sent IDs so we don't wrap it around and drop a message
-       LocalUser::already_sent_id = 0;
-       for (LocalList::const_iterator i = local_users.begin(); i != local_users.end(); ++i)
-       {
-               (**i).already_sent = 0;
-               (**i).RemoveExpiredInvites();
-       }
-}
-
 /* this returns true when all modules are satisfied that the user should be allowed onto the irc server
  * (until this returns true, a user will block in the waiting state, waiting to connect up to the
  * registration timeout maximum seconds)
@@ -276,17 +286,16 @@ bool UserManager::AllModulesReportReady(LocalUser* user)
 
 /**
  * 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.
+ * It is intended to do background checking on all the users, e.g. do
+ * ping checks, registration timeouts, etc.
  */
 void UserManager::DoBackgroundUserStuff()
 {
-       /*
-        * loop over all local users..
-        */
-       for (LocalList::iterator i = local_users.begin(); i != local_users.end(); ++i)
+       for (LocalList::iterator i = local_users.begin(); i != local_users.end(); )
        {
+               // It's possible that we quit the user below due to ping timeout etc. and QuitUser() removes it from the list
                LocalUser* curr = *i;
+               ++i;
 
                if (curr->CommandFloodPenalty || curr->eh.getSendQSize())
                {
@@ -324,10 +333,15 @@ void UserManager::DoBackgroundUserStuff()
                                        curr->FullConnect();
                                        continue;
                                }
+
+                               // 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;
                }
 
-               if (curr->registered != REG_ALL && (ServerInstance->Time() > (curr->age + curr->MyClass->GetRegTimeout())))
+               if (curr->registered != REG_ALL && curr->MyClass && (ServerInstance->Time() > (curr->signon + curr->MyClass->GetRegTimeout())))
                {
                        /*
                         * registration timeout -- didnt send USER/NICK/HOST
@@ -338,3 +352,18 @@ void UserManager::DoBackgroundUserStuff()
                }
        }
 }
+
+already_sent_t UserManager::NextAlreadySentId()
+{
+       if (++already_sent_id == 0)
+       {
+               // Wrapped around, reset the already_sent ids of all users
+               already_sent_id = 1;
+               for (LocalList::iterator i = local_users.begin(); i != local_users.end(); ++i)
+               {
+                       LocalUser* user = *i;
+                       user->already_sent = 0;
+               }
+       }
+       return already_sent_id;
+}