Database backed stickybans

Supports disabling stickybans for a round, exempting a key from matching a stickyban, and it now also detects rogue stickybans before anybody currently connected even gets disconnected. (new matches trigger a 5 second sleep and abort enforcement if enough other new matches happen in that timeframe)
2026-08-24 13:38:41 +01:00 · 2019-03-16 00:23:37 -07:00
parent 5a13b58272
commit 2e757683ab
8 changed files with 497 additions and 75 deletions
@@ -2,12 +2,12 @@

 //How many new ckey matches before we revert the stickyban to it's roundstart state
 //These are exclusive, so once it goes over one of these numbers, it reverts the ban
-#define STICKYBAN_MAX_MATCHES 20
-#define STICKYBAN_MAX_EXISTING_USER_MATCHES 5 //ie, users who were connected before the ban triggered
-#define STICKYBAN_MAX_ADMIN_MATCHES 2
+#define STICKYBAN_MAX_MATCHES 15
+#define STICKYBAN_MAX_EXISTING_USER_MATCHES 3 //ie, users who were connected before the ban triggered
+#define STICKYBAN_MAX_ADMIN_MATCHES 1

-/world/IsBanned(key,address,computer_id,type,real_bans_only=FALSE)
-	if (!key || !address || !computer_id)
+/world/IsBanned(key, address, computer_id, type, real_bans_only=FALSE)
+	if (!key || (!real_bans_only && (!address || !computer_id)))
 		if(real_bans_only)
 			return FALSE
 		log_access("Failed Login (invalid data): [key] [address]-[computer_id]")
@@ -82,10 +82,32 @@

 		var/newmatch = FALSE
 		var/client/C = GLOB.directory[ckey]
-		var/cachedban = SSstickyban.cache[bannedckey]
+		var/list/cachedban = SSstickyban.cache[bannedckey]
+		if (!CONFIG_GET(flag/ban_legacy_system) && (SSdbcore.Connect() || length(SSstickyban.dbcache)))
+			ban = get_stickyban_from_ckey(bannedckey)
+			var/list/bancache = list()
+			while (ban["ckey"] && ban["keys"] && ban["keys"][ckey] && ban["keys"][ckey]["exempt"])
+				if (C || SSstickyban.confirmed_exempt[ckey]) //modifing/re-adding a stickyban makes it re-match everybody
+					return
+				bancache[ban["ckey"]] = world.GetConfig("ban", ban["ckey"])
+				//Hacky way to ensure somebody exempt from one stickyban doesn't get exempt from all stickybans
+				world.SetConfig("ban", bannedckey, null)
+				var/list/newban = ..()
+				if (!newban || newban["ckey"] == ban["ckey"])
+					SSstickyban.confirmed_exempt[ckey] = TRUE
+					return
+				if (!newban["ckey"])
+					ban = newban
+					break
+				ban = get_stickyban_from_ckey(ban["ckey"])
+
+			spawn()
+				for(var/bancacheckey in bancache)
+					world.SetConfig("ban", bancacheckey, bancache[bancacheckey])

 		//rogue ban in the process of being reverted.
-		if (cachedban && cachedban["reverting"])
+		if (cachedban && cachedban["reverting"] || cachedban["timeout"])
+			world.SetConfig("ban", bannedckey, null)
 			return null

 		if (cachedban && ckey != bannedckey)
@@ -98,40 +120,66 @@

 		if (newmatch && cachedban)
 			var/list/newmatches = cachedban["matches_this_round"]
+			var/list/pendingmatches = cachedban["matches_this_round"]
 			var/list/newmatches_connected = cachedban["existing_user_matches_this_round"]
 			var/list/newmatches_admin = cachedban["admin_matches_this_round"]

-			newmatches[ckey] = ckey
+			pendingmatches[ckey] = ckey
+
 			if (C)
 				newmatches_connected[ckey] = ckey
+				newmatches_connected = cachedban["existing_user_matches_this_round"]
 			if (admin)
 				newmatches_admin[ckey] = ckey

+			sleep(STICKYBAN_ROGUE_CHECK_TIME)
+
+			pendingmatches -= ckey
+
+			if (cachedban["reverting"] || cachedban["timeout"])
+				return null
+
+			newmatches[ckey] = ckey
+
+
 			if (\
-				newmatches.len > STICKYBAN_MAX_MATCHES || \
+				newmatches.len+pendingmatches.len > STICKYBAN_MAX_MATCHES || \
 				newmatches_connected.len > STICKYBAN_MAX_EXISTING_USER_MATCHES || \
 				newmatches_admin.len > STICKYBAN_MAX_ADMIN_MATCHES \
 				)
-				if (cachedban["reverting"])
-					return null
-				cachedban["reverting"] = TRUE
+
+				var/action
+				if (ban["fromdb"])
+					cachedban["timeout"] = TRUE
+					action = "putting it on timeout for the remainder of the round"
+				else
+					cachedban["reverting"] = TRUE
+					action = "reverting to its roundstart state"

 				world.SetConfig("ban", bannedckey, null)

-				log_game("Stickyban on [bannedckey] detected as rogue, reverting to its roundstart state")
-				message_admins("Stickyban on [bannedckey] detected as rogue, reverting to its roundstart state")
+				log_game("Stickyban on [bannedckey] detected as rogue, [action]")
+				message_admins("Stickyban on [bannedckey] detected as rogue, [action]")
 				//do not convert to timer.
 				spawn (5)
 					world.SetConfig("ban", bannedckey, null)
 					sleep(1)
 					world.SetConfig("ban", bannedckey, null)
-					cachedban["matches_this_round"] = list()
-					cachedban["existing_user_matches_this_round"] = list()
-					cachedban["admin_matches_this_round"] = list()
-					cachedban -= "reverting"
-					world.SetConfig("ban", bannedckey, list2stickyban(cachedban))
+					if (!ban["fromdb"])
+						cachedban = cachedban.Copy() //so old references to the list still see the ban as reverting
+						cachedban["matches_this_round"] = list()
+						cachedban["existing_user_matches_this_round"] = list()
+						cachedban["admin_matches_this_round"] = list()
+						cachedban -= "reverting"
+						SSstickyban.cache[bannedckey] = cachedban
+						world.SetConfig("ban", bannedckey, list2stickyban(cachedban))
 				return null

+			if (ban["fromdb"])
+				if(!CONFIG_GET(flag/ban_legacy_system) && SSdbcore.Connect())
+					var/datum/DBQuery/query_add_match = SSdbcore.NewQuery("INSERT IGNORE INTO [format_table_name("stickyban_matched_ckey")] (matchedckey, stickyban) VALUES ('[sanitizeSQL(ckey)]', '[sanitizeSQL(bannedckey)]')")
+					query_add_match.warn_execute()
+
 		//byond will not trigger isbanned() for "global" host bans,
 		//ie, ones where the "apply to this game only" checkbox is not checked (defaults to not checked)
 		//So it's safe to let admins walk thru host/sticky bans here
@@ -142,7 +190,7 @@
 			return null

 		if (C) //user is already connected!.
-			to_chat(C, "You are about to get disconnected for matching a sticky ban after you connected. If this turns out to be the ban evasion detection system going haywire, we will automatically detect this and revert the matches. if you feel that this is the case, please wait EXACTLY 6 seconds then reconnect using file -> reconnect to see if the match was reversed.")
+			to_chat(C, "You are about to get disconnected for matching a sticky ban after you connected. If this turns out to be the ban evasion detection system going haywire, we will automatically detect this and revert the matches. if you feel that this is the case, please wait EXACTLY 6 seconds then reconnect using file -> reconnect to see if the match was automatically reversed.")

 		var/desc = "\nReason:(StickyBan) You, or another user of this computer or connection ([bannedckey]) is banned from playing here. The ban reason is:\n[ban["message"]]\nThis ban was applied by [ban["admin"]]\nThis is a BanEvasion Detection System ban, if you think this ban is a mistake, please wait EXACTLY 6 seconds, then try again before filing an appeal.\n"
 		. = list("reason" = "Stickyban", "desc" = desc)
@@ -7,7 +7,7 @@
 		if ("add")
 			var/list/ban = list()
 			var/ckey
-			ban["admin"] = usr.key
+			ban["admin"] = usr.ckey
 			ban["type"] = list("sticky")
 			ban["reason"] = "(InGameBan)([usr.key])" //this will be displayed in dd only

@@ -22,6 +22,7 @@

 			if (get_stickyban_from_ckey(ckey))
 				to_chat(usr, "<span class='adminnotice'>Error: Can not add a stickyban: User already has a current sticky ban</span>")
+				return

 			if (data["reason"])
 				ban["message"] = data["reason"]
@@ -32,6 +33,11 @@
 				ban["message"] = "[reason]"

 			world.SetConfig("ban",ckey,list2stickyban(ban))
+			SSstickyban.cache[ckey] = ban
+
+			if(!CONFIG_GET(flag/ban_legacy_system) && SSdbcore.Connect())
+				var/datum/DBQuery/query_create_stickyban = SSdbcore.NewQuery("INSERT INTO [format_table_name("stickyban")] (ckey, reason, banning_admin) VALUES ('[sanitizeSQL(ckey)]', '[sanitizeSQL(ban["message"])]', '[sanitizeSQL(usr.ckey)]')")
+				query_create_stickyban.warn_execute()

 			log_admin_private("[key_name(usr)] has stickybanned [ckey].\nReason: [ban["message"]]")
 			message_admins("<span class='adminnotice'>[key_name_admin(usr)] has stickybanned [ckey].\nReason: [ban["message"]]</span>")
@@ -51,6 +57,11 @@
 				to_chat(usr, "<span class='adminnotice'>Error: The ban disappeared.</span>")
 				return
 			world.SetConfig("ban",ckey, null)
+			SSstickyban.cache -= ckey
+
+			if (!CONFIG_GET(flag/ban_legacy_system) && SSdbcore.Connect())
+				var/datum/DBQuery/query_remove_stickyban = SSdbcore.NewQuery("DELETE FROM [format_table_name("stickyban")] WHERE ckey = '[sanitizeSQL(ckey)]'")
+				query_remove_stickyban.warn_execute()

 			log_admin_private("[key_name(usr)] removed [ckey]'s stickyban")
 			message_admins("<span class='adminnotice'>[key_name_admin(usr)] removed [ckey]'s stickyban</span>")
@@ -67,18 +78,12 @@
 				to_chat(usr, "<span class='adminnotice'>Error: No sticky ban for [ckey] found!</span>")
 				return

-			var/found = 0
-			//we have to do it this way because byond keeps the case in its sticky ban matches WHY!!!
-			for (var/key in ban["keys"])
-				if (ckey(key) == alt)
-					found = 1
-					break
-
-			if (!found)
+			var/key = ban["keys"][alt]
+			if (!key)
 				to_chat(usr, "<span class='adminnotice'>Error: [alt] is not linked to [ckey]'s sticky ban!</span>")
 				return

-			if (alert("Are you sure you want to disassociate [alt] from [ckey]'s sticky ban? \nNote: Nothing stops byond from re-linking them","Are you sure","Yes","No") == "No")
+			if (alert("Are you sure you want to disassociate [alt] from [ckey]'s sticky ban? \nNote: Nothing stops byond from re-linking them, Use \[E] to exempt them","Are you sure","Yes","No") == "No")
 				return

 			//we have to do this again incase something changes
@@ -87,19 +92,20 @@
 				to_chat(usr, "<span class='adminnotice'>Error: The ban disappeared.</span>")
 				return

-			found = 0
-			for (var/key in ban["keys"])
-				if (ckey(key) == alt)
-					ban["keys"] -= key
-					found = 1
-					break
-
-			if (!found)
+			key = ban["keys"][alt]
+			if (!key)
 				to_chat(usr, "<span class='adminnotice'>Error: [alt] link to [ckey]'s sticky ban disappeared.</span>")
 				return

+			ban["keys"] -= alt
 			world.SetConfig("ban",ckey,list2stickyban(ban))

+			SSstickyban.cache[ckey] = ban
+
+			if (!CONFIG_GET(flag/ban_legacy_system) && SSdbcore.Connect())
+				var/datum/DBQuery/query_remove_stickyban_alt = SSdbcore.NewQuery("DELETE FROM [format_table_name("stickyban_matched_ckey")] WHERE ckey = '[sanitizeSQL(ckey)]' AND matched_ckey = '[sanitizeSQL(alt)]'")
+				query_remove_stickyban_alt.warn_execute()
+
 			log_admin_private("[key_name(usr)] has disassociated [alt] from [ckey]'s sticky ban")
 			message_admins("<span class='adminnotice'>[key_name_admin(usr)] has disassociated [alt] from [ckey]'s sticky ban</span>")

@@ -124,14 +130,170 @@

 			world.SetConfig("ban",ckey,list2stickyban(ban))

+			SSstickyban.cache[ckey] = ban
+
+			if (!CONFIG_GET(flag/ban_legacy_system) && SSdbcore.Connect())
+				var/datum/DBQuery/query_edit_stickyban = SSdbcore.NewQuery("UPDATE [format_table_name("stickyban")] SET reason = '[sanitizeSQL(reason)]' WHERE ckey = '[sanitizeSQL(ckey)]'")
+				query_edit_stickyban.warn_execute()
+
 			log_admin_private("[key_name(usr)] has edited [ckey]'s sticky ban reason from [oldreason] to [reason]")
 			message_admins("<span class='adminnotice'>[key_name_admin(usr)] has edited [ckey]'s sticky ban reason from [oldreason] to [reason]</span>")

+		if ("exempt")
+			if (!data["ckey"])
+				return
+			var/ckey = data["ckey"]
+			if (!data["alt"])
+				return
+			if (!CONFIG_GET(flag/ban_legacy_system) || !SSdbcore.Connect())
+				to_chat(usr, "<span class='adminnotice'>No database connection!</span>")
+				return
+			var/alt = ckey(data["alt"])
+			var/ban = get_stickyban_from_ckey(ckey)
+			if (!ban)
+				to_chat(usr, "<span class='adminnotice'>Error: No sticky ban for [ckey] found!</span>")
+				return
+
+			var/key = ban["keys"][alt]
+			if (!key)
+				to_chat(usr, "<span class='adminnotice'>Error: [alt] is not linked to [ckey]'s sticky ban!</span>")
+				return
+
+			if (alert("Are you sure you want to exempt [alt] from [ckey]'s sticky ban?","Are you sure","Yes","No") == "No")
+				return
+
+			//we have to do this again incase something changes
+			ban = get_stickyban_from_ckey(ckey)
+			if (!ban)
+				to_chat(usr, "<span class='adminnotice'>Error: The ban disappeared.</span>")
+				return
+
+			key = ban["keys"][alt]
+			if (!key)
+				to_chat(usr, "<span class='adminnotice'>Error: [alt] link to [ckey]'s sticky ban disappeared.</span>")
+				return
+
+			key["exempt"] = TRUE
+
+			world.SetConfig("ban",ckey,list2stickyban(ban))
+
+			SSstickyban.cache[ckey] = ban
+
+
+			var/datum/DBQuery/query_exempt_stickyban_alt = SSdbcore.NewQuery("UPDATE [format_table_name("stickyban_matched_ckey")] SET exempt = 1 WHERE stickyban = ckey = '[sanitizeSQL(ckey)]' AND matched_ckey = '[sanitizeSQL(alt)]'")
+			query_exempt_stickyban_alt.warn_execute()
+
+			log_admin_private("[key_name(usr)] has exempted [alt] from [ckey]'s sticky ban")
+			message_admins("<span class='adminnotice'>[key_name_admin(usr)] has exempted [alt] from [ckey]'s sticky ban</span>")
+
+		if ("unexempt")
+			if (!data["ckey"])
+				return
+			var/ckey = data["ckey"]
+			if (!data["alt"])
+				return
+			if (!CONFIG_GET(flag/ban_legacy_system) || !SSdbcore.Connect())
+				to_chat(usr, "<span class='adminnotice'>No database connection!</span>")
+				return
+			var/alt = ckey(data["alt"])
+			var/ban = get_stickyban_from_ckey(ckey)
+			if (!ban)
+				to_chat(usr, "<span class='adminnotice'>Error: No sticky ban for [ckey] found!</span>")
+				return
+
+			var/key = ban["keys"][alt]
+			if (!key)
+				to_chat(usr, "<span class='adminnotice'>Error: [alt] is not linked to [ckey]'s sticky ban!</span>")
+				return
+
+			if (alert("Are you sure you want to unexempt [alt] from [ckey]'s sticky ban?","Are you sure","Yes","No") == "No")
+				return
+
+			//we have to do this again incase something changes
+			ban = get_stickyban_from_ckey(ckey)
+			if (!ban)
+				to_chat(usr, "<span class='adminnotice'>Error: The ban disappeared.</span>")
+				return
+
+			key = ban["keys"][alt]
+			if (!key)
+				to_chat(usr, "<span class='adminnotice'>Error: [alt] link to [ckey]'s sticky ban disappeared.</span>")
+				return
+
+			key["exempt"] = FALSE
+
+			world.SetConfig("ban",ckey,list2stickyban(ban))
+
+			SSstickyban.cache[ckey] = ban
+
+
+			var/datum/DBQuery/query_unexempt_stickyban_alt = SSdbcore.NewQuery("UPDATE [format_table_name("stickyban_matched_ckey")] SET exempt = 0 WHERE stickyban = ckey = '[sanitizeSQL(ckey)]' AND matched_ckey = '[sanitizeSQL(alt)]'")
+			query_unexempt_stickyban_alt.warn_execute()
+
+			log_admin_private("[key_name(usr)] has unexempted [alt] from [ckey]'s sticky ban")
+			message_admins("<span class='adminnotice'>[key_name_admin(usr)] has unexempted [alt] from [ckey]'s sticky ban</span>")
+
+		if ("timeout")
+			if (!data["ckey"])
+				return
+			if (CONFIG_GET(flag/ban_legacy_system) || !SSdbcore.Connect())
+				to_chat(usr, "<span class='adminnotice'>No database connection!</span>")
+				return
+
+			var/ckey = data["ckey"]
+
+			if (alert("Are you sure you want to put [ckey]'s stickyban on timeout until next round (or removed)?","Are you sure","Yes","No") == "No")
+				return
+			var/ban = get_stickyban_from_ckey(ckey)
+			if (!ban)
+				to_chat(usr, "<span class='adminnotice'>Error: No sticky ban for [ckey] found!</span>")
+				return
+
+			ban["timeout"] = TRUE
+
+			world.SetConfig("ban", ckey, null)
+
+			var/cachedban = SSstickyban.cache[ckey]
+			if (cachedban)
+				cachedban["timeout"] = TRUE
+
+			log_admin_private("[key_name(usr)] has put [ckey]'s sticky ban on timeout.")
+			message_admins("<span class='adminnotice'>[key_name_admin(usr)] has put [ckey]'s sticky ban on timeout.</span>")
+
+		if ("untimeout")
+			if (!data["ckey"])
+				return
+			if (CONFIG_GET(flag/ban_legacy_system) || !SSdbcore.Connect())
+				to_chat(usr, "<span class='adminnotice'>No database connection!</span>")
+				return
+			var/ckey = data["ckey"]
+
+			if (alert("Are you sure you want to lift the timeout on [ckey]'s stickyban?","Are you sure","Yes","No") == "No")
+				return
+
+			var/ban = get_stickyban_from_ckey(ckey)
+			var/cachedban = SSstickyban.cache[ckey]
+			if (cachedban)
+				cachedban["timeout"] = FALSE
+			if (!ban)
+				if (!cachedban)
+					to_chat(usr, "<span class='adminnotice'>Error: No sticky ban for [ckey] found!</span>")
+					return
+				ban = cachedban
+
+			ban["timeout"] = FALSE
+
+			world.SetConfig("ban",ckey,list2stickyban(ban))
+
+			log_admin_private("[key_name(usr)] has put [ckey]'s sticky ban on timeout.")
+			message_admins("<span class='adminnotice'>[key_name_admin(usr)] has put [ckey]'s sticky ban on timeout.</span>")
+
+
 		if ("revert")
 			if (!data["ckey"])
 				return
 			var/ckey = data["ckey"]
-			if (alert("Are you sure you want to revert the sticky ban on [ckey] to its state at round start?","Are you sure","Yes","No") == "No")
+			if (alert("Are you sure you want to revert the sticky ban on [ckey] to its state at round start (or last edit)?","Are you sure","Yes","No") == "No")
 				return
 			var/ban = get_stickyban_from_ckey(ckey)
 			if (!ban)
@@ -150,14 +312,21 @@
 			world.SetConfig("ban",ckey,list2stickyban(cached_ban))


-/datum/admins/proc/stickyban_gethtml(ckey, ban)
-	. = {"
+/datum/admins/proc/stickyban_gethtml(ckey)
+	var/ban = get_stickyban_from_ckey(ckey)
+	if (!ban)
+		return
+	var/timeout
+	if (!CONFIG_GET(flag/ban_legacy_system) && SSdbcore.Connect())
+		timeout = "<a href='?_src_=holder;[HrefToken()];stickyban=[(ban["timeout"] ? "untimeout" : "timeout")]&ckey=[ckey]'>\[[(ban["timeout"] ? "untimeout" : "timeout" )]\]</a>"
+	. = list({"
 		<a href='?_src_=holder;[HrefToken()];stickyban=remove&ckey=[ckey]'>\[-\]</a>
 		<a href='?_src_=holder;[HrefToken()];stickyban=revert&ckey=[ckey]'>\[revert\]</a>
+		[timeout]
 		<b>[ckey]</b>
 		<br />"
 		[ban["message"]] <b><a href='?_src_=holder;[HrefToken()];stickyban=edit&ckey=[ckey]'>\[Edit\]</a></b><br />
-	"}
+	"})
 	if (ban["admin"])
 		. += "[ban["admin"]]<br />"
 	else
@@ -166,19 +335,21 @@
 	for (var/key in ban["keys"])
 		if (ckey(key) == ckey)
 			continue
-		. += "<li><a href='?_src_=holder;[HrefToken()];stickyban=remove_alt&ckey=[ckey]&alt=[ckey(key)]'>\[-\]</a>[key]</li>"
+		var/exempt
+		if (!CONFIG_GET(flag/ban_legacy_system) && SSdbcore.Connect())
+			exempt = "<a href='?_src_=holder;[HrefToken()];stickyban=[(ban["keys"][key]["exempt"] ? "unexempt" : "exempt")]&ckey=[ckey]&alt=[ckey(key)]'>\[[(ban["keys"][key]["exempt"] ? "UE" : "E")]\]</a>"
+		. += "<li><a href='?_src_=holder;[HrefToken()];stickyban=remove_alt&ckey=[ckey]&alt=[ckey(key)]'>\[-\]</a>[key][exempt]</li>"
 	. += "</ol>\n"

 /datum/admins/proc/stickyban_show()
 	if(!check_rights(R_BAN))
 		return
-	var/list/bans = sortList(world.GetConfig("ban"))
-	var/banhtml = ""
+	var/list/bans = sticky_banned_ckeys()
+	var/list/banhtml = list()
 	for(var/key in bans)
 		var/ckey = ckey(key)
-		var/ban = stickyban2list(world.GetConfig("ban",key))
 		banhtml += "<br /><hr />\n"
-		banhtml += stickyban_gethtml(ckey,ban)
+		banhtml += stickyban_gethtml(ckey)

 	var/html = {"
 	<head>
@@ -186,20 +357,43 @@
 	</head>
 	<body>
 		<h2>All Sticky Bans:</h2> <a href='?_src_=holder;[HrefToken()];stickyban=add'>\[+\]</a><br>
-		[banhtml]
+		[banhtml.Join("")]
 	</body>
 	"}
 	usr << browse(html,"window=stickybans;size=700x400")

+/proc/sticky_banned_ckeys()
+	if (!CONFIG_GET(flag/ban_legacy_system) && (SSdbcore.Connect() || length(SSstickyban.dbcache)))
+		if (SSstickyban.dbcacheexpire < world.time)
+			SSstickyban.Populatedbcache()
+		if (SSstickyban.dbcacheexpire)
+			return SSstickyban.dbcache.Copy()
+
+	return sortList(world.GetConfig("ban"))
+
+
 /proc/get_stickyban_from_ckey(var/ckey)
+	. = list()
 	if (!ckey)
 		return null
-	ckey = ckey(ckey)
-	. = null
-	for (var/key in world.GetConfig("ban"))
-		if (ckey(key) == ckey)
-			. = stickyban2list(world.GetConfig("ban",key))
-			break
+	if (!CONFIG_GET(flag/ban_legacy_system) && (SSdbcore.Connect() || length(SSstickyban.dbcache)))
+		if (SSstickyban.dbcacheexpire < world.time)
+			SSstickyban.Populatedbcache()
+		if (SSstickyban.dbcacheexpire)
+			. = SSstickyban.dbcache[ckey]
+			var/list/cachedban = SSstickyban.cache["ckey"]["timeout"]
+			if (cachedban)
+				.["timeout"] = cachedban["timeout"]
+			.["fromdb"] = TRUE
+			return
+
+	. = stickyban2list(world.GetConfig("ban", ckey)) || stickyban2list(world.GetConfig("ban", ckey(ckey))) || list()
+
+	if (!length(.) && ckey != ckey(ckey)) //say that 10 times fast
+		. = stickyban2list(world.GetConfig("ban", ckey(ckey)))
+
+	if (!length(.))
+		return null

 /proc/stickyban2list(var/ban)
 	if (!ban)
@@ -226,11 +420,8 @@
 	if (.["type"])
 		.["type"] = jointext(.["type"], ",")

-	//internal tracking only, shouldn't be stored
-	. -= "existing_user_matches_this_round"
-	. -= "admin_matches_this_round"
-	. -= "matches_this_round"
 	. -= "reverting"
+	. -= "fromdb"

 	//storing these can sometimes cause sticky bans to start matching everybody
 	//	and isn't even needed for sticky ban matching, as the hub tracks these separately