Fix collection of cert template attributes

BloodHoundAD · Sep 14, 2023 · 2abe9c0 · 2abe9c0
1 parent c2bf76d
commit 2abe9c0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/CommonLib/LDAPQueries/CommonProperties.cs b/src/CommonLib/LDAPQueries/CommonProperties.cs
@@ -65,7 +65,8 @@ public static class CommonProperties
             "certificateTemplates", "flags", "dnshostname", "cacertificate", "mspki-certificate-name-flag",
             "mspki-enrollment-flag", "displayname", "name", "mspki-template-schema-version", "mspki-cert-template-oid",
             "pKIOverlapPeriod", "pKIExpirationPeriod", "pkiextendedkeyusage", "mspki-ra-signature",
-            "mspki-ra-application-policies", "mspki-ra-policies", "crosscertificatepair"
+            "mspki-ra-application-policies", "mspki-ra-policies", "crosscertificatepair",
+            "mspki-certificate-application-policy"
         };
     }
 }
diff --git a/src/CommonLib/Processors/LDAPPropertyProcessor.cs b/src/CommonLib/Processors/LDAPPropertyProcessor.cs
@@ -437,15 +437,14 @@ public static Dictionary<string, object> ReadCertTemplateProperties(ISearchResul
             }
 
             props.Add("ekus", entry.GetArrayProperty(LDAPProperties.ExtendedKeyUsage));
+            props.Add("certificateapplicationpolicy", entry.GetArrayProperty(LDAPProperties.CertificateApplicationPolicy));
 
             if (entry.GetIntProperty(LDAPProperties.NumSignaturesRequired, out var authorizedSignatures))
             {
                 props.Add("authorizedsignatures", authorizedSignatures);
-                props.Add("applicationpolicies", entry.GetProperty(LDAPProperties.ApplicationPolicies));
-                props.Add("issuancepolicies", entry.GetProperty(LDAPProperties.IssuancePolicies));
             }
-
-            props.Add("certificateapplicationpolicy", entry.GetArrayProperty(LDAPProperties.CertificateApplicationPolicy));
+            props.Add("applicationpolicies", entry.GetArrayProperty(LDAPProperties.ApplicationPolicies));
+            props.Add("issuancepolicies", entry.GetArrayProperty(LDAPProperties.IssuancePolicies));
 
             return props;
         }