tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adds a Pii Flag, Censors Hwid and Ip (#27776)

Browse Source 
* yes

* fixes
This commit is contained in:
Geekyhobo
2024-06-01 03:23:54 -04:00
committed by GitHub
parent 90f606f5e5
commit 94a113dbd6
2 changed files with 32 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
Content.Server/Administration/BanList/BanListEui.cs
View File

@@ -65,13 +65,23 @@ public sealed class BanListEui : BaseEui
unban = new SharedServerUnban(unbanningAdmin, ban.Unban.UnbanTime.UtcDateTime);
}
(string, int cidrMask)? ip = ("*Hidden*", 0);
var hwid = "*Hidden*";
if (_admins.HasAdminFlag(Player, AdminFlags.Pii))
{
ip = ban.Address is { } address
? (address.address.ToString(), address.cidrMask)
: null;
hwid = ban.HWId == null ? null : Convert.ToBase64String(ban.HWId.Value.AsSpan());
}
Bans.Add(new SharedServerBan(
ban.Id,
ban.UserId,
ban.Address is { } address
? (address.address.ToString(), address.cidrMask)
: null,
ban.HWId == null ? null : Convert.ToBase64String(ban.HWId.Value.AsSpan()),
ip,
hwid,
ban.BanTime.UtcDateTime,
ban.ExpirationTime?.UtcDateTime,
ban.Reason,
@@ -96,13 +106,22 @@ public sealed class BanListEui : BaseEui
unban = new SharedServerUnban(unbanningAdmin, ban.Unban.UnbanTime.UtcDateTime);
}
(string, int cidrMask)? ip = ("*Hidden*", 0);
var hwid = "*Hidden*";
if (_admins.HasAdminFlag(Player, AdminFlags.Pii))
{
ip = ban.Address is { } address
? (address.address.ToString(), address.cidrMask)
: null;
hwid = ban.HWId == null ? null : Convert.ToBase64String(ban.HWId.Value.AsSpan());
}
RoleBans.Add(new SharedServerRoleBan(
ban.Id,
ban.UserId,
ban.Address is { } address
? (address.address.ToString(), address.cidrMask)
: null,
ban.HWId == null ? null : Convert.ToBase64String(ban.HWId.Value.AsSpan()),
ip,
hwid,
ban.BanTime.UtcDateTime,
ban.ExpirationTime?.UtcDateTime,
ban.Reason,

5
Content.Shared/Administration/AdminFlags.cs
View File

@@ -104,6 +104,11 @@
///</summary>
Adminchat = 1 << 17,
///<summary>
/// Permits the visibility of Pii in game and on SS14 Admin
///</summary>
Pii = 1 << 18,
/// <summary>
/// Dangerous host permissions like scsi.
/// </summary>