Ported WorldSocket timeout feature to native branch

See ACE implementation: 7f01436

Author: 0blu

src/game/Protocol/WorldSocket.cpp

@@ -20,22 +20,26 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include "WorldSocket.h"
+#include "WorldSocketMgr.h"
+#include "WorldSession.h"
+
 #include "Auth/AuthCrypt.h"
 #include "World.h"
 #include "AccountMgr.h"
 #include "SharedDefines.h"
-#include "WorldSession.h"
-#include "WorldSocket.h"
-
-#include <memory>
 #include "AddonHandler.h"
 #include "Opcodes.h"
 #include "Crypto/Hash/SHA1.h"
 #include "Database/SqlPreparedStatement.h"
 #include "Database/DatabaseEnv.h"
 #include "DBCStores.h"
+#include "Config/Config.h"
+
 #include "IO/Networking/DNS.h"
-#include "WorldSocketMgr.h"
+#include "IO/Timer/AsyncSystemTimer.h"
+
+#include <memory>
 
 #if defined( __GNUC__ )
 #pragma pack(1)
@@ -78,6 +82,11 @@ WorldSocket::~WorldSocket()
 {
     CloseSocket();
     sLog.Out(LOG_NETWORK, LOG_LVL_BASIC, "[%s] Connection closed", GetRemoteIpString().c_str());
+
+    if (m_sessionNoAuthTimeout)
+    {
+        m_sessionNoAuthTimeout->Cancel();
+    }
 }
 
 void WorldSocket::DoRecvIncomingData()
@@ -412,6 +421,14 @@ WorldSocket::HandlerResult WorldSocket::_HandleAuthSession(WorldPacket& recvPack
         return HandlerResult::Fail;
     }
 
+
+    // ===== Auth was successful =====
+    if (this->m_sessionNoAuthTimeout)
+    {
+        this->m_sessionNoAuthTimeout->Cancel();
+        this->m_sessionNoAuthTimeout = nullptr;
+    }
+
     m_Session = new WorldSession(accountId, this->shared_from_this(), security, mutetime, locale);
 
     m_Crypt.SetKey(K.AsByteArray());
@@ -595,6 +612,17 @@ void WorldSocket::HandleResultOfAsyncWrite(IO::NetworkError const& error, std::s
 
 void WorldSocket::Start()
 {
+    // Start auto timeout loop
+    if (int secs = sConfig.GetIntDefault("Network.TimeoutSecsIfNoAuth", 10))
+    {
+        m_sessionNoAuthTimeout = sAsyncSystemTimer.ScheduleFunctionOnce(std::chrono::seconds(secs), [this]()
+        {
+            sLog.Out(LOG_NETWORK, LOG_LVL_DETAIL, "[%s] Connection has reached TimeoutSecsIfNoAuth. Closing socket...", this->GetRemoteIpString().c_str());
+            // It's correct that we capture _this_ and not a shared_ptr, since the timer will be canceled in destructor
+            this->CloseSocket();
+        });
+    }
+
     SendInitialPacketAndStartRecvLoop();
 }
 

src/game/Protocol/WorldSocket.h

@@ -27,6 +27,7 @@
 #include "Auth/AuthCrypt.h"
 #include "WorldPacket.h"
 #include "WorldSession.h"
+#include "IO/Timer/TimerHandle.h"
 
 class WorldSocketMgr;
 
@@ -95,6 +96,8 @@ class WorldSocket final : public std::enable_shared_from_this<WorldSocket>
     /// Called by ProcessIncoming() on CMSG_PING.
     HandlerResult _HandlePing(WorldPacket& recvPacket);
 
+    std::shared_ptr<IO::Timer::TimerHandle> m_sessionNoAuthTimeout; // nullptr after auth, or if feature is disabled
+
     std::mutex m_sendQueueLock;
     std::queue<WorldPacket> m_sendQueue;
     std::atomic_flag m_sendQueueIsRunning;

src/mangosd/mangosd.conf.dist.in

@@ -3,7 +3,7 @@
 #####################################
 
 [MangosdConf]
-ConfVersion=2024091701
+ConfVersion=2025040601
 
 ###################################################################################################################
 # CONNECTIONS AND DIRECTORIES
@@ -2804,6 +2804,12 @@ LFG.MatchmakingTimer = 600
 #        Default:     ""                      - (Disabled, no proxy)
 #        Example      "10.13.37.1,10.13.37.2" - (to allow multiple proxy servers)
 #
+#    Network.TimeoutSecsIfNoAuth
+#        Description: Kicks a player if they dont auth within a certain amount of time.
+#                     (in seconds)
+#        Default: 10
+#                 0  - to disable
+#
 ###################################################################################################################
 
 Network.Threads = 1
@@ -2814,6 +2820,7 @@ Network.PacketBroadcast.Threads = 0
 Network.PacketBroadcast.Frequency = 50
 Network.PacketBroadcast.ReduceVisDistance.DiffAbove = 0
 Network.TrustedProxyServers = ""
+Network.TimeoutSecsIfNoAuth = 10
 
 ###################################################################################################################
 # CONSOLE, REMOTE ACCESS AND SOAP

src/shared/IO/Networking/AsyncSocket.h

@@ -94,7 +94,7 @@ namespace IO { namespace Networking {
             // We are doing all this atomic stuff, just so we don't have to std::mutex everything
             enum SocketStateFlags : int
             {
-                SHUTDOWN_PENDING     = (1 << 0), // stop all new transaction requests. There should never be a new _INUSE when this is present
+                SHUTDOWN_PENDING     = (1 << 0), // stop all new transaction requests. There should never be a new `*_PENDING_*` when this is present
                 IGNORE_TRANSFERS     = (1 << 1), // Like SHUTDOWN_PENDING but the event receivers `PerformNonBlockingRead` and `PerformNonBlockingWrite` will ignore the event
 
                 // PRESENT: Stuff that is present and set
@@ -127,10 +127,12 @@ namespace IO { namespace Networking {
             IO::ReadableBuffer m_writeSrc{};
 
 #if defined(WIN32)
+            // Windows IOCP stuff:
             IocpOperationTask m_currentContextTask; // <-- Internal tasks / callback to internal networking code
             IocpOperationTask m_currentWriteTask; // <-- Internal tasks / callback to internal networking code
             IocpOperationTask m_currentReadTask; // <-- Internal tasks / callback to internal networking code
 #elif defined(__linux__) || defined(__APPLE__)
+            // Unix epoll stuff:
             void PerformNonBlockingRead();
             void PerformNonBlockingWrite();
             void PerformContextSwitch();

src/shared/IO/Networking/AsyncSocket_windows.cpp

@@ -321,7 +321,10 @@ void IO::Networking::AsyncSocket::CloseSocket()
     if (m_atomicState.fetch_or(SocketStateFlags::SHUTDOWN_PENDING) & SocketStateFlags::SHUTDOWN_PENDING)
         return; // there was already a ::shutdown()
 
-    ::shutdown(m_descriptor.GetNativeSocket(), SD_BOTH); // will interrupt and fail all pending IOCP events and post them to the queue
+    // shutdown the native socket to prevent new operations
+    ::shutdown(m_descriptor.GetNativeSocket(), SD_BOTH);
+    // interrupt and fail all pending IOCP events and post them to the completion queue
+    ::CancelIoEx(reinterpret_cast<HANDLE>(m_descriptor.GetNativeSocket()), nullptr);
 }
 
 /// The callback is invoked in the IO thread

src/shared/SystemConfig.h

@@ -28,7 +28,7 @@
 // Format is YYYYMMDDRR where RR is the change in the conf file
 // for that day.
 #ifndef _MANGOSDCONFVERSION
-# define _MANGOSDCONFVERSION 2024091701
+# define _MANGOSDCONFVERSION 2025040601
 #endif
 #ifndef _REALMDCONFVERSION
 # define _REALMDCONFVERSION 2024091701