Merge branch 'security' of gitlab.com:plasmicplexus/HyperBooru-Server into security

1 files changed, 12 insertions, 6 deletions

diff --git a/SecurityIdentifier.cs b/SecurityIdentifier.cs
index 075788d..8ffaa1b 100644
--- a/SecurityIdentifier.cs
+++ b/SecurityIdentifier.cs
@@ -15,6 +15,7 @@ public static class WellKnownSid {
     public static readonly SecurityIdentifier CreatorGroupSid = new("S-1-3-1");
 
     private static readonly (string name, SecurityIdentifier sid)[] nameMap = new[] {
+        ( "Nobody",        NullSid         ),
         ( "Everyone",      WorldSid        ),
         ( "LOCAL",         LocalSid        ),
         ( "CREATOR OWNER", CreatorGroupSid ),
@@ -106,14 +107,19 @@ public class SecurityIdentifier {
         }
     }
 
-    public override string ToString() {
-        var identifierAuthority = new BigInteger(SidStruct.IdentifierAuthority, true, true);
-        var subAuthorities = string.Join('-',SidStruct.SubAuthorities.Select(sa => sa.ToString()));
-        if(!string.IsNullOrEmpty(subAuthorities))
-            subAuthorities = "-" + subAuthorities;
-        return $"S-{SidStruct.Revision}-{identifierAuthority}{subAuthorities}";
+    public string SddlForm {
+        get {
+            var identifierAuthority = new BigInteger(SidStruct.IdentifierAuthority, true, true);
+            var subAuthorities = string.Join('-',SidStruct.SubAuthorities.Select(sa => sa.ToString()));
+            if(!string.IsNullOrEmpty(subAuthorities))
+                subAuthorities = "-" + subAuthorities;
+            return $"S-{SidStruct.Revision}-{identifierAuthority}{subAuthorities}";
+        }
     }
 
+    public override string ToString() =>
+        WellKnownSid.TranslateSid(this) ?? SddlForm;
+
     public static bool operator ==(SecurityIdentifier? x, SecurityIdentifier? y) =>
         x?.SidStruct.Equals(y?.SidStruct) ?? false;