user.d: move ban check to authenticate()

Author: mathiascode

src/server/msghandler.d

@@ -44,17 +44,6 @@ final class MessageHandler
                 break;
 
             user.username = msg.username;
-            const banned_until = server.db.user_banned_until(msg.username);
-
-            if (banned_until > Clock.currTime)
-                // The official server doesn't send a response when a user
-                // is banned. We also ban users temporarily when kicking
-                // them, and simply closing the connection after some time
-                // allows the client to automatically reconnect to the
-                // server.
-                break;
-
-            if (banned_until > SysTime()) server.db.unban_user(msg.username);
             user.client_version = text(
                 msg.major_version, ".", msg.minor_version
             );

src/server/user.d

@@ -103,18 +103,6 @@ final class User
 
     void authenticate(string username, string password)
     {
-        const user_exists = server.db.user_exists(username);
-
-        if (!user_exists && server.db.server_private_mode) {
-            reject_login(LoginRejectionReason.server_private);
-            return;
-        }
-
-        if (server.num_connected_users >= server.db.server_max_users) {
-            reject_login(LoginRejectionReason.server_full);
-            return;
-        }
-
         const invalid_name_reason = check_username(username);
         if (invalid_name_reason !is null) {
             reject_login(
@@ -129,6 +117,28 @@ final class User
             return;
         }
 
+        const banned_until = server.db.user_banned_until(username);
+        if (banned_until > Clock.currTime)
+            // The official server doesn't send a response when a user
+            // is banned. We also ban users temporarily when kicking
+            // them, and simply closing the connection after some time
+            // allows the client to automatically reconnect to the
+            // server.
+            return;
+
+        if (banned_until > SysTime()) server.db.unban_user(username);
+
+        const user_exists = server.db.user_exists(username);
+        if (!user_exists && server.db.server_private_mode) {
+            reject_login(LoginRejectionReason.server_private);
+            return;
+        }
+
+        if (server.num_connected_users >= server.db.server_max_users) {
+            reject_login(LoginRejectionReason.server_full);
+            return;
+        }
+
         if (!user_exists) {
             hashing_password = true;
             const salt = create_salt();