Merge pull request #4006 from Citadel-Station-13/upstream-merge-32837

[MIRROR] Fixes topic logs exposing serviceCommsKey
This commit is contained in:
deathride58
2017-11-19 04:28:21 +00:00
committed by GitHub
+3 -2
View File
@@ -117,6 +117,9 @@ GLOBAL_PROTECT(security_mode)
warning("/tg/station 13 uses many file operations, a few shell()s, and some external call()s. Trusted mode is recommended. You can download our source code for your own browsing and compilation at https://github.com/tgstation/tgstation")
/world/Topic(T, addr, master, key)
SERVER_TOOLS_ON_TOPIC //redirect to server tools if necessary
var/static/list/topic_handlers = TopicHandlers()
var/list/input = params2list(T)
var/datum/world_topic/handler
@@ -128,8 +131,6 @@ GLOBAL_PROTECT(security_mode)
if((!handler || initial(handler.log)) && config && CONFIG_GET(flag/log_world_topic))
WRITE_FILE(GLOB.world_game_log, "TOPIC: \"[T]\", from:[addr], master:[master], key:[key]")
SERVER_TOOLS_ON_TOPIC //redirect to server tools if necessary
if(!handler)
return