Adds a cvar to hide PII information in ban message (#18428)

* my macbook hates running 2 clients

* yes
This commit is contained in:
Vasilis
2023-07-29 20:14:56 +03:00
committed by GitHub
parent 96854f25d2
commit 55f935e3fe
3 changed files with 20 additions and 3 deletions

View File

@@ -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);

View File

@@ -699,6 +699,12 @@ namespace Content.Shared.CCVar
public static readonly CVarDef<int> AdminAlertExplosionMinIntensity =
CVarDef.Create("admin.alert.explosion_min_intensity", 60, CVar.SERVERONLY);
/// <summary>
/// Should the ban details in admin channel include PII? (IP, HWID, etc)
public static readonly CVarDef<bool> AdminShowPIIOnBan =
CVarDef.Create("admin.show_pii_onban", false, CVar.SERVERONLY);
/*
* Explosions
*/

View File

@@ -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