Allow providing reasons for IP bans

ClassiCube · Nov 22, 2022 · 1b9ef7c · 1b9ef7c
1 parent b50525e
commit 1b9ef7c
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 10 deletions.
diff --git a/MCGalaxy/CorePlugin/ConnectingHandler.cs b/MCGalaxy/CorePlugin/ConnectingHandler.cs
@@ -89,8 +89,10 @@ internal static class ConnectingHandler {
         }
 
         static bool CheckBanned(Player p) {
-            if (Server.bannedIP.Contains(p.ip)) {
-                p.Kick(null, Server.Config.DefaultBanMessage, true);
+            string ipban = Server.bannedIP.Get(p.ip);
+            if (ipban != null) {
+                ipban = ipban.Length > 0 ? ipban : Server.Config.DefaultBanMessage;
+                p.Kick(null, ipban, true);
                 return false;
             }
             if (p.Rank != LevelPermission.Banned) return true;

diff --git a/MCGalaxy/CorePlugin/ModActionHandler.cs b/MCGalaxy/CorePlugin/ModActionHandler.cs
@@ -164,14 +164,16 @@ internal static class ModActionHandler {
 
         static void DoBanIP(ModAction e) {
             LogIPAction(e, "&8IP banned");
-            Logger.Log(LogType.UserActivity, "IP-BANNED: {0} by {1}.", e.Target, e.Actor.name);
-            Server.bannedIP.Add(e.Target);
+            Logger.Log(LogType.UserActivity, "IP-BANNED: {0} by {1}.{2}", 
+                       e.Target, e.Actor.name, e.ReasonSuffixed);
+            Server.bannedIP.Update(e.Target, e.Reason);
             Server.bannedIP.Save();
         }
 
         static void DoUnbanIP(ModAction e) {
             LogIPAction(e, "&8IP unbanned");
-            Logger.Log(LogType.UserActivity, "IP-UNBANNED: {0} by {1}.", e.Target, e.Actor.name);
+            Logger.Log(LogType.UserActivity, "IP-UNBANNED: {0} by {1}.", 
+                       e.Target, e.Actor.name);
             Server.bannedIP.Remove(e.Target);
             Server.bannedIP.Save();
         }

diff --git a/MCGalaxy/Player/List/PlayerExtList.cs b/MCGalaxy/Player/List/PlayerExtList.cs
@@ -74,6 +74,7 @@ public class PlayerExtList {
 
         /// <summary> Retrieves the data associated with the given name. </summary>
         /// <remarks> Returns null if there is no data associated. </remarks>
+        [Obsolete("Use Get() instead")]
         public string FindData(string name) {
             lock (locker) {
                 int idx = names.CaselessIndexOf(name);
@@ -84,6 +85,20 @@ public class PlayerExtList {
                 return idx == -1 ? null : line.Substring(idx + 1);
             }
         }
+
+        /// <summary> Retrieves the data associated with the given name </summary>
+        /// <remarks> Returns "" if the data associated with the given name is missing </remarks>
+        /// <remarks> Returns null if the given name was not found at all </remarks>
+        public string Get(string name) {
+            lock (locker) {
+                int idx = names.CaselessIndexOf(name);
+                if (idx == -1) return null;
+
+                string line = lines[idx];
+                idx = line.IndexOf(Separator);
+                return idx == -1 ? "" : line.Substring(idx + 1);
+            }
+        }
 
 
         [Obsolete("Use Update instead")]

diff --git a/MCGalaxy/Server/Server.Fields.cs b/MCGalaxy/Server/Server.Fields.cs
@@ -56,10 +56,10 @@ public sealed partial class Server {
         //Other
         public static bool SetupFinished, CLIMode;
 
-        public static PlayerList bannedIP, whiteList, invalidIds;
+        public static PlayerList whiteList, invalidIds;
         public static PlayerList ignored, hidden, agreed, vip, noEmotes, lockdown;
         public static PlayerExtList models, skins, reach, rotations, modelScales;
-        public static PlayerExtList frozen, muted, tempBans, tempRanks;
+        public static PlayerExtList bannedIP, frozen, muted, tempBans, tempRanks;
 
         public static readonly List<string> Devs = new List<string>() { "Hetal", "UclCommander" };
         public static readonly List<string> Opstats = new List<string>() { "ban", "tempban", "xban", "banip", "kick", "warn", "mute", "freeze", "setrank" };

diff --git a/MCGalaxy/Server/Server.Init.cs b/MCGalaxy/Server/Server.Init.cs
@@ -67,7 +67,6 @@ public sealed partial class Server {
             invalidIds = PlayerList.Load("extra/invalidids.txt");
             Player.Console.DatabaseID = NameConverter.InvalidNameID("(console)");
 
-            bannedIP = PlayerList.Load("ranks/banned-ip.txt");
             hidden   = PlayerList.Load("ranks/hidden.txt");
             vip      = PlayerList.Load("text/vip.txt");
             noEmotes = PlayerList.Load("text/emotelist.txt");
@@ -79,8 +78,9 @@ public sealed partial class Server {
             rotations   = PlayerExtList.Load("extra/rotations.txt");
             modelScales = PlayerExtList.Load("extra/modelscales.txt");
 
-            muted  = PlayerExtList.Load("ranks/muted.txt");
-            frozen = PlayerExtList.Load("ranks/frozen.txt");
+            bannedIP  = PlayerExtList.Load("ranks/banned-ip.txt");
+            muted     = PlayerExtList.Load("ranks/muted.txt");
+            frozen    = PlayerExtList.Load("ranks/frozen.txt");
             tempRanks = PlayerExtList.Load(Paths.TempRanksFile);
             tempBans  = PlayerExtList.Load(Paths.TempBansFile);
             whiteList = PlayerList.Load("ranks/whitelist.txt");