Attempt to authenticate via mppass first even when name verification …

…is disabled
ClassiCube · Jun 23, 2022 · 6dba848 · 6dba848
1 parent 454c8c8
commit 6dba848
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 12 deletions.
diff --git a/MCGalaxy/Server/Authentication/AuthService.cs b/MCGalaxy/Server/Authentication/AuthService.cs
@@ -38,8 +38,7 @@ public class AuthService
         public AuthServiceConfig Config;
 
         public virtual bool Authenticate(Player p, string mppass) {
-            bool valid = Authenticator.Current.VerifyLogin(p, mppass, this);
-            if (!valid) return false;
+            if (!VerifyLogin(p, mppass)) return false;
             AuthServiceConfig cfg = Config;
 
             p.verifiedName = true;
@@ -51,6 +50,12 @@ public virtual bool Authenticate(Player p, string mppass) {
             return true;
         }
 
+        /// <summary> Whether the given player is allowed to login with the given mppass </summary>
+        protected virtual bool VerifyLogin(Player p, string mppass) {
+            string calculated = Server.CalcMppass(p.truename, Beat.Salt);
+            return mppass.CaselessEq(calculated);
+        }
+
 
         static string lastUrls;
         /// <summary> Reloads list of authentication services from server config </summary>

diff --git a/MCGalaxy/Server/Authentication/Authenticator.cs b/MCGalaxy/Server/Authentication/Authenticator.cs
@@ -33,20 +33,12 @@ public abstract class Authenticator
 
         /// <summary> Checks if the given player is allowed to login with the given mppass </summary>
         public virtual bool VerifyLogin(Player p, string mppass) {
-            if (!Server.Config.VerifyNames) return true;
-
             foreach (AuthService auth in AuthService.Services)
             {
                 if (auth.Authenticate(p, mppass)) return true;
             }
-            return IPUtil.IsPrivate(p.IP);
-        }
-
-        /// <summary> Checks if the given player is allowed to login with the 
-        /// given mppass to the given authentication service </summary>
-        public virtual bool VerifyLogin(Player p, string mppass, AuthService service) {
-            string calculated = Server.CalcMppass(p.truename, service.Beat.Salt);
-            return mppass.CaselessEq(calculated);
+
+            return !Server.Config.VerifyNames || IPUtil.IsPrivate(p.IP);
         }
 
         /// <summary> Informs the given player that they must first