Allow banning by server hostname

minetest · May 14, 2017 · 828a1fd · 828a1fd
1 parent 705ea6e
commit 828a1fd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/config-example.py b/config-example.py
@@ -17,8 +17,8 @@
 # e.g. ['2620:101::44']
 BANNED_IPS = []
 
-# List of banned servers as IP/port pairs
-# e.g. ['1.2.3.4/30000']
+# List of banned servers as host/port pairs
+# e.g. ['1.2.3.4/30000', 'evil.server.ua/30001']
 BANNED_SERVERS = []
 
 # Creates server entries if a server sends an 'update' and there is no entry yet.

diff --git a/server.py b/server.py
@@ -77,6 +77,8 @@ def announce():
 
 	if "%s/%d" % (server["ip"], server["port"]) in app.config["BANNED_SERVERS"]:
 		return "Banned (Server).", 403
+	elif "address" in server and "%s/%d" % (server["address"], server["port"]) in app.config["BANNED_SERVERS"]:
+		return "Banned (Server).", 403
 
 	old = serverList.get(ip, server["port"])