Only localhost is exempt from IP spam checking now

ClassiCube · Aug 17, 2021 · 0afcb99 · 0afcb99
1 parent f7d5d91
commit 0afcb99
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 16 deletions.
diff --git a/MCGalaxy/Modules/Security/IPThrottler.cs b/MCGalaxy/Modules/Security/IPThrottler.cs
@@ -51,7 +51,7 @@ public sealed class IPThrottler : Plugin
 
         void HandleConnectionReceived(Socket s, ref bool cancel) {
             IPAddress ip = SocketUtil.GetIP(s);
-            if (!Server.Config.IPSpamCheck || IPUtil.IsLocal(ip)) return;
+            if (!Server.Config.IPSpamCheck || IPAddress.IsLoopback(ip)) return;
 
             DateTime now = DateTime.UtcNow;
             string ipStr = ip.ToString();
@@ -63,6 +63,7 @@ public sealed class IPThrottler : Plugin
                     ips[ipStr] = entry;
                 }
 
+                // Check if that IP is repeatedly trying to connect
                 if (entry.BlockedUntil < now) {
                     if (!entry.AddSpamEntry(Server.Config.IPSpamCount, Server.Config.IPSpamInterval)) {
                         entry.BlockedUntil = now.Add(Server.Config.IPSpamBlockTime);

diff --git a/MCGalaxy/Network/Utils/Utils.cs b/MCGalaxy/Network/Utils/Utils.cs
@@ -39,21 +39,6 @@ public static class IPUtil
             // TODO: Are there more IPv6 address ranges than just this?
             return ip.IsIPv6LinkLocal;
         }
-
-        /// <summary> Returns whether the given IP is a loopback address
-        /// or an address mapped to this computer's host </summary>
-        public static bool IsLocal(IPAddress ip) {
-            try {
-                if (IPAddress.IsLoopback(ip)) return true;
-
-                IPAddress[] localIPs = Dns.GetHostAddresses(Dns.GetHostName());
-                foreach (IPAddress localIP in localIPs) {
-                    if (ip.Equals(localIP)) return true;
-                }
-            }
-            catch { }
-            return false;
-        }
 
         /// <summary> Returns whether the given IP is an IPv4 mapped IPv6 address </summary>
         public static bool IsIPv4Mapped(IPAddress ip) {