diff --git a/Content.Server/Administration/Managers/BanManager.cs b/Content.Server/Administration/Managers/BanManager.cs index cc76438e28..4640c63dbd 100644 --- a/Content.Server/Administration/Managers/BanManager.cs +++ b/Content.Server/Administration/Managers/BanManager.cs @@ -10,6 +10,7 @@ using Content.Shared.Players; using Content.Shared.Players.PlayTimeTracking; using Content.Shared.Roles; using Microsoft.CodeAnalysis; +using Content.Shared.CCVar; using Robust.Server.Player; using Robust.Shared.Configuration; using Robust.Shared.Enums; @@ -151,9 +152,18 @@ public sealed class BanManager : IBanManager, IPostInjectInit : "null"; var expiresString = expires == null ? Loc.GetString("server-ban-string-never") : $"{expires}"; - var logMessage = Loc.GetString("server-ban-string", ("admin", adminName), ("severity", severity), - ("expires", expiresString), ("name", targetName), ("ip", addressRangeString), - ("hwid", hwidString), ("reason", reason)); + var key = _cfg.GetCVar(CCVars.AdminShowPIIOnBan) ? "server-ban-string" : "server-ban-string-no-pii"; + + var logMessage = Loc.GetString( + key, + ("admin", adminName), + ("severity", severity), + ("expires", expiresString), + ("name", targetName), + ("ip", addressRangeString), + ("hwid", hwidString), + ("reason", reason)); + _sawmill.Info(logMessage); _chat.SendAdminAlert(logMessage); diff --git a/Content.Shared/CCVar/CCVars.cs b/Content.Shared/CCVar/CCVars.cs index db41d69668..36b5377566 100644 --- a/Content.Shared/CCVar/CCVars.cs +++ b/Content.Shared/CCVar/CCVars.cs @@ -699,6 +699,12 @@ namespace Content.Shared.CCVar public static readonly CVarDef AdminAlertExplosionMinIntensity = CVarDef.Create("admin.alert.explosion_min_intensity", 60, CVar.SERVERONLY); + + /// + /// Should the ban details in admin channel include PII? (IP, HWID, etc) + public static readonly CVarDef AdminShowPIIOnBan = + CVarDef.Create("admin.show_pii_onban", false, CVar.SERVERONLY); + /* * Explosions */ diff --git a/Resources/Locale/en-US/info/ban.ftl b/Resources/Locale/en-US/info/ban.ftl index 61292e6148..f1e67c66cd 100644 --- a/Resources/Locale/en-US/info/ban.ftl +++ b/Resources/Locale/en-US/info/ban.ftl @@ -79,4 +79,5 @@ ban-panel-severity = Severity: # Ban string server-ban-string = {$admin} created a {$severity} severity server ban that expires {$expires} for [{$name}, {$ip}, {$hwid}], with reason: {$reason} +server-ban-string-no-pii = {$admin} created a {$severity} severity server ban that expires {$expires} for {$name} with reason: {$reason} server-ban-string-never = never