From 39ef5899f2671e1006037e330da2caf38c3147e2 Mon Sep 17 00:00:00 2001 From: "C.L" Date: Thu, 29 Sep 2022 21:14:39 -0400 Subject: [PATCH 1/4] RCON Sanitization - Makes RCON tags less exploitable. --- code/modules/power/breaker_box.dm | 5 +++-- code/modules/power/smes_construction.dm | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/code/modules/power/breaker_box.dm b/code/modules/power/breaker_box.dm index e666ba6f578..2dffe3c228f 100644 --- a/code/modules/power/breaker_box.dm +++ b/code/modules/power/breaker_box.dm @@ -40,7 +40,7 @@ /obj/machinery/power/breakerbox/activated/Initialize() . = ..() return INITIALIZE_HINT_LATELOAD - + /obj/machinery/power/breakerbox/activated/LateInitialize() set_state(1) @@ -96,7 +96,8 @@ /obj/machinery/power/breakerbox/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob) if(istype(W, /obj/item/device/multitool)) - var/newtag = tgui_input_text(user, "Enter new RCON tag. Use \"NO_TAG\" to disable RCON or leave empty to cancel.", "SMES RCON system") + var/newtag = tgui_input_text(user, "Enter new RCON tag. Use \"NO_TAG\" to disable RCON or leave empty to cancel.", "SMES RCON system", "", MAX_NAME_LEN) + newtag = sanitize(newtag,MAX_NAME_LEN) if(newtag) RCon_tag = newtag to_chat(user, "You changed the RCON tag to: [newtag]") diff --git a/code/modules/power/smes_construction.dm b/code/modules/power/smes_construction.dm index 381f6b09f69..15c2f61f0da 100644 --- a/code/modules/power/smes_construction.dm +++ b/code/modules/power/smes_construction.dm @@ -312,7 +312,8 @@ // Multitool - change RCON tag if(istype(W, /obj/item/device/multitool)) - var/newtag = tgui_input_text(user, "Enter new RCON tag. Use \"NO_TAG\" to disable RCON or leave empty to cancel.", "SMES RCON system") + var/newtag = tgui_input_text(user, "Enter new RCON tag. Use \"NO_TAG\" to disable RCON or leave empty to cancel.", "SMES RCON system", "", MAX_NAME_LEN) + newtag = sanitize(newtag,MAX_NAME_LEN) if(newtag) RCon_tag = newtag to_chat(user, "You changed the RCON tag to: [newtag]") From 01bee93e1ec43ec40bb63d99741e54226b1d0a20 Mon Sep 17 00:00:00 2001 From: "C.L" Date: Thu, 29 Sep 2022 21:31:24 -0400 Subject: [PATCH 2/4] Navbeacon sanitization --- code/game/machinery/navbeacon.dm | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/code/game/machinery/navbeacon.dm b/code/game/machinery/navbeacon.dm index 1e1fff180ed..be37e988b86 100644 --- a/code/game/machinery/navbeacon.dm +++ b/code/game/machinery/navbeacon.dm @@ -150,7 +150,7 @@ Transponder Codes: