feat: kick/ban by IP

Author: ThisAMJ

GhostServer/commands.cpp

@@ -43,6 +43,8 @@ std::string ssprintf(const char *fmt, ...) {
 # include <strings.h>
 #endif
 
+// TODO: Add unban, and save bans/whitelist to disk
+
 void handle_cmd(NetworkManager *network, char *line) {
     while (isspace(*line)) ++line;
 
@@ -83,8 +85,10 @@ void handle_cmd(NetworkManager *network, char *line) {
             LINE("  countdown             start a countdown");
             LINE("  disconnect            disconnect a client by name");
             LINE("  disconnect_id         disconnect a client by ID");
+            LINE("  disconnect_ip         disconnect a client by IP address");
             LINE("  ban                   ban connections from a certain IP by ghost name");
             LINE("  ban_id                ban connections from a certain IP by ghost ID");
+            LINE("  ban_ip                ban connections from a certain IP by IP address");
             LINE("  accept_players        start accepting connections from players");
             LINE("  refuse_players        stop accepting connections from players");
             LINE("  accept_spectators     start accepting connections from spectators");
@@ -151,6 +155,12 @@ void handle_cmd(NetworkManager *network, char *line) {
             return;
         }
 
+        if (!strcmp(line, "disconnect_ip")) {
+            g_current_cmd = CMD_DISCONNECT_IP;
+            LINE_NONL("IP of player to disconnect: ");
+            return;
+        }
+
         if (!strcmp(line, "ban")) {
             g_current_cmd = CMD_BAN;
             LINE_NONL("Name of player to ban: ");
@@ -163,6 +173,12 @@ void handle_cmd(NetworkManager *network, char *line) {
             return;
         }
 
+        if (!strcmp(line, "ban_ip")) {
+            g_current_cmd = CMD_BAN_IP;
+            LINE_NONL("IP of player to ban: ");
+            return;
+        }
+
         if (!strcmp(line, "accept_players")) {
             network->ScheduleServerThread([=]() {
                 network->acceptingPlayers = true;
@@ -315,6 +331,24 @@ void handle_cmd(NetworkManager *network, char *line) {
             LINE("No player ID given; not disconnecting anyone.");
         }
         return;
+    
+    case CMD_DISCONNECT_IP:
+        g_current_cmd = CMD_NONE;
+        if (len != 0) {
+            sf::IpAddress ip(_line);
+            if (ip == sf::IpAddress::None) {
+                LINE("Invalid IP address: %s", line);
+                return;
+            }
+            network->ScheduleServerThread([=]() {
+                auto clients = network->GetClientByIP(ip);
+                for (auto cl : clients) network->DisconnectPlayer(*cl, "kicked");
+            });
+            LINE("Disconnected player IP %s", line);
+        } else {
+            LINE("No player IP given; not disconnecting anyone.");
+        }
+        return;
 
     case CMD_BAN:
         g_current_cmd = CMD_NONE;
@@ -343,6 +377,25 @@ void handle_cmd(NetworkManager *network, char *line) {
         }
         return;
 
+    case CMD_BAN_IP:
+        g_current_cmd = CMD_NONE;
+        if (len != 0) {
+            sf::IpAddress ip(_line);
+            if (ip == sf::IpAddress::None) {
+                LINE("Invalid IP address: %s", line);
+                return;
+            }
+            network->ScheduleServerThread([=]() {
+                auto clients = network->GetClientByIP(ip);
+                for (auto cl : clients) network->BanClientIP(*cl);
+            });
+            network->bannedIps.push_back(ip);
+            LINE("Banned player IP %s", line);
+        } else {
+            LINE("No player IP given; not banning anyone.");
+        }
+        return;
+
     case CMD_SERVER_MSG:
         g_current_cmd = CMD_NONE;
         network->ServerMessage(line);

GhostServer/commands.h

@@ -7,8 +7,10 @@ enum CommandType {
     CMD_COUNTDOWN_SET,
     CMD_DISCONNECT,
     CMD_DISCONNECT_ID,
+    CMD_DISCONNECT_IP,
     CMD_BAN,
     CMD_BAN_ID,
+    CMD_BAN_IP,
     CMD_SERVER_MSG,
     CMD_WHITELIST_ENABLE,
     CMD_WHITELIST_ADD_NAME,

docs/commands.md

@@ -11,8 +11,10 @@
 |countdown||start a countdown|
 |disconnect|name|disconnect a client by name|
 |disconnect_id|id|disconnect a client by ID|
+|disconnect_ip|ip|disconnect a client by IP address|
 |ban|name|ban connections from a certain IP by ghost name|
 |ban_id|id|ban connections from a certain IP by ghost ID|
+|ban_ip|ip|ban connections from a certain IP by IP address|
 |accept_players||start accepting connections from players|
 |refuse_players||stop accepting connections from players|
 |accept_spectators||start accepting connections from spectators|