New plugin ban_ips. Fixed bug in schedule that occurs when callback registers with same key.

Author: minecraft server

plugins.py

@@ -7,7 +7,7 @@
 import acls, dotstrip
 import player_cmd as cmd
 import menu_test, testing
-import zone_create_menu, zone_cmds, acl_cmds, zone_confirm, long_operations
+import zone_create_menu, zone_cmds, acl_cmds, zone_confirm, long_operations, ban_ips
 
 # Set ordering here
 
@@ -28,6 +28,7 @@
 plugins.append(menus) # Should probably be before anything that depends on it
 
 # features
+plugins.append(ban_ips)
 plugins.append(welcome) # Has /help, so high priority. But should be after usernames (for the welcome)
 plugins.append(acls)
 plugins.append(dotstrip) # Must be before usercolors
@@ -37,7 +38,7 @@
 plugins.append(zone_confirm)
 plugins.append(acl_cmds)
 
-plugins.append(testing)
+#plugins.append(testing)
 
 # tail
 plugins.append(bad_cmd) # Always last out of chat commands

plugins/ban_ips.py

@@ -0,0 +1,47 @@
+
+AUTHOR = 'ekimekim'
+CONTACT = '[email protected]'
+DESCRIPTION = """A plugin to replicate the ban-by-ip functionality that exists
+in the basic server, which doesn't work with the proxy (as all connections come from localhost).
+Reads ban list from the server files. Refreshes every second."""
+
+
+import os, logging
+import schedule
+from helpers import send_packet
+from packet_decoder import Packet
+from config import SERVER_DIR
+
+
+bans = None
+ban_file = os.path.join(SERVER_DIR, "banned-ips.txt")
+
+INTERVAL = 1 # Seconds between refresh
+
+
+def on_start():
+	load_bans()
+
+
+def load_bans():
+	global bans
+	try:
+		new_bans = open(ban_file, 'rU').read().split('\n')
+	except IOError, ex:
+		if bans is None:
+			raise
+		logging.warning("Failed to refresh ban file:", exc_info=True)
+	else:
+		bans = new_bans
+
+	schedule.register(INTERVAL, load_bans) # Repeat self after INTERVAL
+
+
+def on_packet(packet, user, to_server):
+	if to_server and packet.name() == 'Handshake':
+		ip, port = user.addr
+		if ip in bans:
+			packet = Packet("Disconnect", reason="No U")
+			send_packet(packet, user, False)
+			return []
+	return packet

plugins/schedule.py

@@ -55,9 +55,8 @@ def on_tick(users):
 	now = time.time()
 	while events and now >= events[0][0]:
 		try:
-			events[0][1]()
+			events.pop(0)[1]()
 		except InvalidUserError, ex:
 			logging.info("User %s disconnected before packet could be sent in event: %s" % (ex.args[0], events[0]))
 		except Exception:
 			logging.exception("Error while running event: %s" % (events[0]))
-		events.pop(0)