Rename `<bind:ssl>` to `<bind:sslprofile>`.

[user/henk/code/inspircd.git] / src / usermanager.cpp

diff --git a/src/usermanager.cpp b/src/usermanager.cpp
index 6acd25ac5200eeb2860abc4969a63e5522dcb09a..c7aaa5c1134e54c9240c1ff0557bfa2112cd8d0c 100644 (file)
--- a/src/usermanager.cpp
+++ b/src/usermanager.cpp
@@ -1,10 +1,17 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
+ *   Copyright (C) 2019 iwalkalone <iwalkalone69@gmail.com>
+ *   Copyright (C) 2019 Matt Schatz <genius3000@g3k.solutions>
+ *   Copyright (C) 2013-2016, 2018 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2013, 2018-2020 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2013, 2015 Adam <Adam@anope.org>
+ *   Copyright (C) 2013 Daniel Vassdal <shutter@canternet.org>
+ *   Copyright (C) 2012, 2019 Robby <robby@chatbelgie.be>
  *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
- *   Copyright (C) 2008 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2009 Uli Schlachter <psychon@inspircd.org>
+ *   Copyright (C) 2008-2010 Craig Edwards <brain@inspircd.org>
  *   Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
- *   Copyright (C) 2008 Craig Edwards <craigedwards@brainbox.cc>
  *
  * 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
@@ -58,6 +65,16 @@ namespace
                // This user didn't answer the last ping, remove them.
                if (!user->lastping)
                {
+                       ModResult res;
+                       FIRST_MOD_RESULT(OnConnectionFail, res, (user, I_ERR_TIMEOUT));
+                       if (res == MOD_RES_ALLOW)
+                       {
+                               // A module is preventing this user from being timed out.
+                               user->lastping = 1;
+                               user->nextping = ServerInstance->Time() + user->MyClass->GetPingTime();
+                               return;
+                       }
+
                        time_t secs = ServerInstance->Time() - (user->nextping - user->MyClass->GetPingTime());
                        const std::string message = "Ping timeout: " + ConvToStr(secs) + (secs != 1 ? " seconds" : " second");
                        ServerInstance->Users.QuitUser(user, message);
@@ -139,10 +156,23 @@ void UserManager::AddUser(int socket, ListenSocket* via, irc::sockets::sockaddrs
        {
                ListenSocket::IOHookProvRef& iohookprovref = *i;
                if (!iohookprovref)
+               {
+                       if (!iohookprovref.GetProvider().empty())
+                       {
+                               ServerInstance->Logs->Log("USERS", LOG_DEBUG, "Non-existent I/O hook '%s' in <bind:%s> tag at %s",
+                                       iohookprovref.GetProvider().c_str(),
+                                       i == via->iohookprovs.begin() ? "hook" : "sslprofile",
+                                       via->bind_tag->getTagLocation().c_str());
+                               this->QuitUser(New, "Internal error handling connection");
+                               return;
+                       }
                        continue;
+               }
 
                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
+
+               // 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());
@@ -339,7 +369,7 @@ void UserManager::ServerNoticeAll(const char* text, ...)
 {
        std::string message;
        VAFORMAT(message, text, text);
-       ClientProtocol::Messages::Privmsg msg(ClientProtocol::Messages::Privmsg::nocopy, ServerInstance->FakeClient, ServerInstance->Config->ServerName, message, MSG_NOTICE);
+       ClientProtocol::Messages::Privmsg msg(ClientProtocol::Messages::Privmsg::nocopy, ServerInstance->FakeClient, ServerInstance->Config->GetServerName(), message, MSG_NOTICE);
        ClientProtocol::Event msgevent(ServerInstance->GetRFCEvents().privmsg, msg);
 
        for (LocalList::const_iterator i = local_users.begin(); i != local_users.end(); ++i)