Mirror 41

UnityProject/Assets/Mirror/Authenticators/BasicAuthenticator.cs

@@ -13,6 +13,9 @@ public class BasicAuthenticator : NetworkAuthenticator
         public string username;
         public string password;
 
+        // this is set if authentication fails to prevent garbage AuthRequestMessage spam
+        bool ServerAuthFailed;
+
         #region Messages
 
         public struct AuthRequestMessage : NetworkMessage
@@ -101,7 +104,13 @@ public void OnAuthRequestMessage(NetworkConnection conn, AuthRequestMessage msg)
                 conn.isAuthenticated = false;
 
                 // disconnect the client after 1 second so that response message gets delivered
-                StartCoroutine(DelayedDisconnect(conn, 1));
+                if (!ServerAuthFailed)
+                {
+                    // set this false so this coroutine can only be started once
+                    ServerAuthFailed = true;
+
+                    StartCoroutine(DelayedDisconnect(conn, 1));
+                }
             }
         }
 
@@ -140,22 +149,23 @@ public override void OnStopClient()
         /// <summary>
         /// Called on client from OnClientAuthenticateInternal when a client needs to authenticate
         /// </summary>
-        /// <param name="conn">Connection of the client.</param>
-        public override void OnClientAuthenticate(NetworkConnection conn)
+        public override void OnClientAuthenticate()
         {
             AuthRequestMessage authRequestMessage = new AuthRequestMessage
             {
                 authUsername = username,
                 authPassword = password
             };
 
-            conn.Send(authRequestMessage);
+            NetworkClient.connection.Send(authRequestMessage);
         }
 
+        [Obsolete("Call OnAuthResponseMessage without the NetworkConnection parameter. It always points to NetworkClient.connection anyway.")]
+        public void OnAuthResponseMessage(NetworkConnection conn, AuthResponseMessage msg) => OnAuthResponseMessage(msg);
+
         /// <summary>
         /// Called on client when the server's AuthResponseMessage arrives
         /// </summary>
-        /// <param name="conn">Connection to client.</param>
         /// <param name="msg">The message payload</param>
         public void OnAuthResponseMessage(AuthResponseMessage msg)
         {
@@ -164,20 +174,17 @@ public void OnAuthResponseMessage(AuthResponseMessage msg)
                 // Debug.LogFormat(LogType.Log, "Authentication Response: {0}", msg.message);
 
                 // Authentication has been accepted
-                ClientAccept(NetworkClient.connection);
+                ClientAccept();
             }
             else
             {
                 Debug.LogError($"Authentication Response: {msg.message}");
 
                 // Authentication has been rejected
-                ClientReject(NetworkClient.connection);
+                ClientReject();
             }
         }
 
-        [Obsolete("Call OnAuthResponseMessage without the NetworkConnection parameter. It always points to NetworkClient.connection anyway.")]
-        public void OnAuthResponseMessage(NetworkConnection conn, AuthResponseMessage msg) => OnAuthResponseMessage(msg);
-
         #endregion
     }
 }

UnityProject/Assets/Mirror/Authenticators/TimeoutAuthenticator.cs

@@ -48,23 +48,21 @@ public override void OnServerAuthenticate(NetworkConnection conn)
                 StartCoroutine(BeginAuthentication(conn));
         }
 
-        public override void OnClientAuthenticate(NetworkConnection conn)
+        public override void OnClientAuthenticate()
         {
-            authenticator.OnClientAuthenticate(conn);
+            authenticator.OnClientAuthenticate();
             if (timeout > 0)
-                StartCoroutine(BeginAuthentication(conn));
+                StartCoroutine(BeginAuthentication(NetworkClient.connection));
         }
 
         IEnumerator BeginAuthentication(NetworkConnection conn)
         {
             // Debug.Log($"Authentication countdown started {conn} {timeout}");
-
             yield return new WaitForSecondsRealtime(timeout);
 
             if (!conn.isAuthenticated)
             {
                 // Debug.Log($"Authentication Timeout {conn}");
-
                 conn.Disconnect();
             }
         }