Merge remote-tracking branch 'origin/adcs' into adcs

SpecterOps · Oct 4, 2023 · d778043 · d778043
2 parents bcb41fd + eabd7e4
commit d778043
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 12 deletions.
diff --git a/src/CommonLib/Enums/DataType.cs b/src/CommonLib/Enums/DataType.cs
@@ -12,7 +12,7 @@ public static class DataType
         public const string RootCAs = "rootcas";
         public const string AIACAs = "aiacas";
         public const string NTAuthStores = "ntauthstores";
-        public const string EnrollmentServices = "enrollmentservices";
+        public const string EnterpriseCAs = "enterprisecas";
         public const string CertTemplates = "certtemplates";
     }
 }
diff --git a/src/CommonLib/Enums/DirectoryPaths.cs b/src/CommonLib/Enums/DirectoryPaths.cs
@@ -2,7 +2,7 @@
 {
     public class DirectoryPaths
     {
-        public const string EnrollmentServiceLocation = "CN=Enrollment Services,CN=Public Key Services,CN=Services,CN=Configuration";
+        public const string EnterpriseCALocation = "CN=Enrollment Services,CN=Public Key Services,CN=Services,CN=Configuration";
         public const string RootCALocation = "CN=Certification Authorities,CN=Public Key Services,CN=Services,CN=Configuration";
         public const string AIACALocation = "CN=AIA,CN=Public Key Services,CN=Services,CN=Configuration";
         public const string CertTemplateLocation = "CN=Certificate Templates,CN=Public Key Services,CN=Services,CN=Configuration";

diff --git a/src/CommonLib/Enums/Labels.cs b/src/CommonLib/Enums/Labels.cs
@@ -16,7 +16,7 @@ public enum Label
         CertAuthority,
         RootCA,
         AIACA,
-        EnrollmentService,
+        EnterpriseCA,
         NTAuthStore
     }
 }
diff --git a/...monLib/Enums/PKIEnrollmentServiceFlags.cs → src/CommonLib/Enums/PKIEnterpriseCAFlags.cs b/...monLib/Enums/PKIEnrollmentServiceFlags.cs → src/CommonLib/Enums/PKIEnterpriseCAFlags.cs
@@ -3,7 +3,7 @@
 namespace SharpHoundCommonLib.Enums
 {
     [Flags]
-    public enum PKIEnrollmentServiceFlags
+    public enum PKIEnterpriseCAFlags
     {
         NO_TEMPLATE_SUPPORT = 0x00000001,
         SUPPORTS_NT_AUTHENTICATION = 0x00000002,

diff --git a/src/CommonLib/Extensions.cs b/src/CommonLib/Extensions.cs
@@ -372,7 +372,7 @@ public static Label GetLabel(this SearchResultEntry entry)
                 else if (objectClasses.Contains(PKICertificateTemplateClass, StringComparer.InvariantCultureIgnoreCase))
                     objectType = Label.CertTemplate;
                 else if (objectClasses.Contains(PKIEnrollmentServiceClass, StringComparer.InvariantCultureIgnoreCase))
-                    objectType = Label.EnrollmentService;
+                    objectType = Label.EnterpriseCA;
                 else if (objectClasses.Contains(CertificationAutorityClass, StringComparer.InvariantCultureIgnoreCase))
                 {
                     if (entry.DistinguishedName.Contains(DirectoryPaths.RootCALocation))

diff --git a/...ommonLib/OutputTypes/EnrollmentService.cs → src/CommonLib/OutputTypes/EnterpriseCA.cs b/...ommonLib/OutputTypes/EnrollmentService.cs → src/CommonLib/OutputTypes/EnterpriseCA.cs
@@ -1,6 +1,6 @@
 namespace SharpHoundCommonLib.OutputTypes
 {
-    public class EnrollmentService : OutputBase
+    public class EnterpriseCA : OutputBase
     {
         public TypedPrincipal[] EnabledCertTemplates { get; set; }
         public string HostingComputer { get; set; }

diff --git a/src/CommonLib/Processors/ACLProcessor.cs b/src/CommonLib/Processors/ACLProcessor.cs
@@ -33,7 +33,7 @@ static ACLProcessor()
                 {Label.Container, "bf967a8b-0de6-11d0-a285-00aa003049e2"},
                 {Label.RootCA, "3fdfee50-47f4-11d1-a9c3-0000f80367c1"},
                 {Label.AIACA, "3fdfee50-47f4-11d1-a9c3-0000f80367c1"},
-                {Label.EnrollmentService, "ee4aa692-3bba-11d2-90cc-00c04fd91ab1"},
+                {Label.EnterpriseCA, "ee4aa692-3bba-11d2-90cc-00c04fd91ab1"},
                 {Label.NTAuthStore, "3fdfee50-47f4-11d1-a9c3-0000f80367c1"},
                 {Label.CertTemplate, "e5209ca2-3bba-11d2-90cc-00c04fd91ab1"}
             };
@@ -444,8 +444,8 @@ public IEnumerable<ACE> ProcessACL(byte[] ntSecurityDescriptor, string objectDom
                     }
                 }
 
-                // Enrollment service rights
-                if (objectType == Label.EnrollmentService)
+                // EnterpriseCA rights
+                if (objectType == Label.EnterpriseCA)
                 {
                     if (aceType is ACEGuids.Enroll)
                         yield return new ACE

diff --git a/src/CommonLib/Processors/LDAPPropertyProcessor.cs b/src/CommonLib/Processors/LDAPPropertyProcessor.cs
@@ -406,10 +406,10 @@ public static Dictionary<string, object> ReadAIACAProperties(ISearchResultEntry
             return props;
         }
 
-        public static Dictionary<string, object> ReadEnrollmentServiceProperties(ISearchResultEntry entry)
+        public static Dictionary<string, object> ReadEnterpriseCAProperties(ISearchResultEntry entry)
         {
             var props = GetCommonProps(entry);
-            if (entry.GetIntProperty("flags", out var flags)) props.Add("flags", (PKIEnrollmentServiceFlags)flags);
+            if (entry.GetIntProperty("flags", out var flags)) props.Add("flags", (PKIEnterpriseCAFlags)flags);
 
             return props;
         }

diff --git a/src/CommonLib/SearchResultEntryWrapper.cs b/src/CommonLib/SearchResultEntryWrapper.cs
@@ -171,7 +171,7 @@ public ResolvedSearchResult ResolveBloodHoundInfo()
                 case Label.RootCA:
                 case Label.AIACA:
                 case Label.NTAuthStore:
-                case Label.EnrollmentService:
+                case Label.EnterpriseCA:
                 case Label.CertTemplate:
                     res.DisplayName = $"{GetProperty(LDAPProperties.Name)}@{itemDomain}";
                     break;