Serializing identites

OctopusDeploy · Sep 8, 2024 · 6d062dc · 6d062dc
1 parent 3470942
commit 6d062dc
Show file tree

Hide file tree

Showing 5 changed files with 59 additions and 26 deletions.
diff --git a/source/Calamari.FullFrameworkTools/WindowsCertStore/PrivateKeyAccessRule.cs b/source/Calamari.FullFrameworkTools/WindowsCertStore/PrivateKeyAccessRule.cs
@@ -11,26 +11,34 @@ public class PrivateKeyAccessRule
 {
     [JsonConstructor]
     public PrivateKeyAccessRule(string identity, PrivateKeyAccess access)
-        :this(new NTAccount(identity), access)
-    {
-    }
-
-    public PrivateKeyAccessRule(IdentityReference identity, PrivateKeyAccess access)
     {
         Identity = identity;
         Access = access;
     }
-
-    public IdentityReference Identity { get; }
+
     public PrivateKeyAccess Access { get; }
 
-
-    private static JsonSerializerSettings JsonSerializerSettings => new JsonSerializerSettings
+    public string Identity { get; }
+
+
+    public IdentityReference GetIdentityReference()
     {
-        Converters = new List<JsonConverter>
+        return TryParse(Identity, out var temp) ? temp! : new NTAccount(Identity);
+    }
+
+
+    public static bool TryParse(string value, out SecurityIdentifier? result)
+    {
+        try
         {
-            new StringEnumConverter(),
+            result = new SecurityIdentifier(value);
+            return true;
         }
-    };
+        catch (ArgumentException)
+        {
+            result = null;
+            return false;
+        }
+    }
 
 }
diff --git a/source/Calamari.FullFrameworkTools/WindowsCertStore/WindowsX509CertificateStore.cs b/source/Calamari.FullFrameworkTools/WindowsCertStore/WindowsX509CertificateStore.cs
@@ -108,7 +108,7 @@ public void ImportCertificateToStore(byte[] pfxBytes, string password, string us
                 if (certificate.HasPrivateKey())
                 {
                     // Because we have to store the private-key in the machine key-store, we must grant the user access to it
-                    var keySecurity = new[] {new PrivateKeyAccessRule(account, PrivateKeyAccess.FullControl)};
+                    var keySecurity = new[] {new PrivateKeyAccessRule(account.Value, PrivateKeyAccess.FullControl)};
                     AddPrivateKeyAccessRules(keySecurity, certificate);
                 }
             }

diff --git a/source/Calamari.Shared/Integration/Certificates/PrivateKeyAccessRule.cs b/source/Calamari.Shared/Integration/Certificates/PrivateKeyAccessRule.cs
@@ -10,17 +10,42 @@ public class PrivateKeyAccessRule
     {
         [JsonConstructor]
         public PrivateKeyAccessRule(string identity, PrivateKeyAccess access)
-            :this(new NTAccount(identity), access)
+
         {
+            Identity = identity;
+            Access = access;
         }
 
-        public PrivateKeyAccessRule(IdentityReference identity, PrivateKeyAccess access)
+        /*public PrivateKeyAccessRule(IdentityReference identity, PrivateKeyAccess access)
         {
             Identity = identity;
             Access = access;
-        }
+        }*/
 
-        public IdentityReference Identity { get; }
+        /*public IdentityReference Identity { get; }*/
+        public string Identity { get; }
+
+        public IdentityReference GetIdentityReference()
+        {
+            return TryParse(Identity, out var temp) ? (IdentityReference)temp : new NTAccount(Identity);
+        }
+
+
+        public static bool TryParse(string value, out SecurityIdentifier result)
+        {
+            try
+            {
+                result = new SecurityIdentifier(value);
+                return true;
+            }
+            catch (ArgumentException)
+            {
+                result = null;
+                return false;
+            }
+        }
+
+
         public PrivateKeyAccess Access { get; }
 
         public static ICollection<PrivateKeyAccessRule> FromJson(string json)

diff --git a/source/Calamari.Shared/Integration/Certificates/WindowsX509CertificateStore.cs b/source/Calamari.Shared/Integration/Certificates/WindowsX509CertificateStore.cs
@@ -97,7 +97,7 @@ public void ImportCertificateToStore(byte[] pfxBytes, string password, string us
                 if (certificate.HasPrivateKey())
                 {
                     // Because we have to store the private-key in the machine key-store, we must grant the user access to it
-                    var keySecurity = new[] {new PrivateKeyAccessRule(account, PrivateKeyAccess.FullControl)};
+                    var keySecurity = new[] {new PrivateKeyAccessRule(userName, PrivateKeyAccess.FullControl)};
                     AddPrivateKeyAccessRules(keySecurity, certificate);
                 }
             }
@@ -439,11 +439,11 @@ static CryptoKeyAccessRule ToCryptoKeyAccessRule(PrivateKeyAccessRule rule)
             switch (rule.Access)
             {
                 case PrivateKeyAccess.ReadOnly:
-                    return new CryptoKeyAccessRule(rule.Identity, CryptoKeyRights.GenericRead, AccessControlType.Allow);
+                    return new CryptoKeyAccessRule(rule.GetIdentityReference(), CryptoKeyRights.GenericRead, AccessControlType.Allow);
 
                 case PrivateKeyAccess.FullControl:
                     // We use 'GenericAll' here rather than 'FullControl' as 'FullControl' doesn't correctly set the access for CNG keys
-                    return new CryptoKeyAccessRule(rule.Identity, CryptoKeyRights.GenericAll, AccessControlType.Allow);
+                    return new CryptoKeyAccessRule(rule.GetIdentityReference(), CryptoKeyRights.GenericAll, AccessControlType.Allow);
 
                 default:
                     throw new ArgumentOutOfRangeException(nameof(rule.Access));

diff --git a/source/Calamari/Deployment/Features/IisWebSiteAfterPostDeployFeature.cs b/source/Calamari/Deployment/Features/IisWebSiteAfterPostDeployFeature.cs
@@ -66,7 +66,7 @@ static PrivateKeyAccessRule CreatePrivateKeyAccessForApplicationPoolAccount(IVar
                                             PrivateKeyAccess.FullControl);
         }
 
-        static IdentityReference GetIdentityForApplicationPoolIdentity(ApplicationPoolIdentityType applicationPoolIdentityType,
+        static string GetIdentityForApplicationPoolIdentity(ApplicationPoolIdentityType applicationPoolIdentityType,
                                                                        IVariables variables)
         {
             //TODO: Once this only runs netcore we can remove this check (or potentially externalize the whole check)
@@ -79,19 +79,19 @@ static IdentityReference GetIdentityForApplicationPoolIdentity(ApplicationPoolId
             switch (applicationPoolIdentityType)
             {
                 case ApplicationPoolIdentityType.ApplicationPoolIdentity:
-                    return new NTAccount("IIS AppPool\\" + variables.Get(SpecialVariables.Action.IisWebSite.ApplicationPoolName));
+                    return new NTAccount("IIS AppPool\\" + variables.Get(SpecialVariables.Action.IisWebSite.ApplicationPoolName)).Value;
 
                 case ApplicationPoolIdentityType.LocalService:
-                    return new SecurityIdentifier(WellKnownSidType.LocalServiceSid, null);
+                    return new SecurityIdentifier(WellKnownSidType.LocalServiceSid, null).Value;
 
                 case ApplicationPoolIdentityType.LocalSystem:
-                    return new SecurityIdentifier(WellKnownSidType.LocalServiceSid, null);
+                    return new SecurityIdentifier(WellKnownSidType.LocalServiceSid, null).Value;
 
                 case ApplicationPoolIdentityType.NetworkService:
-                    return new SecurityIdentifier(WellKnownSidType.NetworkServiceSid, null);
+                    return new SecurityIdentifier(WellKnownSidType.NetworkServiceSid, null).Value;
 
                 case ApplicationPoolIdentityType.SpecificUser:
-                    return new NTAccount(StripLocalAccountIdentifierFromUsername(variables.Get(SpecialVariables.Action.IisWebSite.ApplicationPoolUserName)));
+                    return new NTAccount(StripLocalAccountIdentifierFromUsername(variables.Get(SpecialVariables.Action.IisWebSite.ApplicationPoolUserName))).Value;
 
                 default:
                     throw new ArgumentOutOfRangeException(nameof(applicationPoolIdentityType), applicationPoolIdentityType, null);