Merge pull request #67 from BloodHoundAD/rename-enrollmentservice

Rename EnrollmentService to EnterpriseCA
SpecterOps · Oct 4, 2023 · 4fbe693 · 4fbe693
2 parents b0b4482 + 422ff12
commit 4fbe693
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/src/Runtime/ObjectProcessors.cs b/src/Runtime/ObjectProcessors.cs
@@ -76,8 +76,8 @@ internal async Task<OutputBase> ProcessObject(ISearchResultEntry entry,
                     return await ProcessRootCA(entry, resolvedSearchResult);
                 case Label.AIACA:
                     return await ProcessAIACA(entry, resolvedSearchResult);
-                case Label.EnrollmentService:
-                    return await ProcessEnrollmentService(entry, resolvedSearchResult);
+                case Label.EnterpriseCA:
+                    return await ProcessEnterpriseCA(entry, resolvedSearchResult);
                 case Label.NTAuthStore:
                     return await ProcessNTAuthStore(entry, resolvedSearchResult);
                 case Label.CertTemplate:
@@ -578,9 +578,9 @@ private async Task<AIACA> ProcessAIACA(ISearchResultEntry entry, ResolvedSearchR
             return ret;
         }
 
-        private async Task<EnrollmentService> ProcessEnrollmentService(ISearchResultEntry entry, ResolvedSearchResult resolvedSearchResult)
+        private async Task<EnterpriseCA> ProcessEnterpriseCA(ISearchResultEntry entry, ResolvedSearchResult resolvedSearchResult)
         {
-            var ret = new EnrollmentService
+            var ret = new EnterpriseCA
             {
                 ObjectIdentifier = resolvedSearchResult.ObjectId
             };
@@ -603,7 +603,7 @@ private async Task<EnrollmentService> ProcessEnrollmentService(ISearchResultEntr
 
             if ((_methods & ResolvedCollectionMethod.ObjectProps) != 0)
             {
-                var props = LDAPPropertyProcessor.ReadEnrollmentServiceProperties(entry);
+                var props = LDAPPropertyProcessor.ReadEnterpriseCAProperties(entry);
                 ret.Properties.Merge(props);
 
                 // Certificate

diff --git a/src/Runtime/OutputWriter.cs b/src/Runtime/OutputWriter.cs
@@ -30,7 +30,7 @@ public class OutputWriter
         private readonly JsonDataWriter<User> _userOutput;
         private readonly JsonDataWriter<RootCA> _rootCAOutput;
         private readonly JsonDataWriter<AIACA> _aIACAOutput;
-        private readonly JsonDataWriter<EnrollmentService> _enrollmentServiceOutput;
+        private readonly JsonDataWriter<EnterpriseCA> _enterpriseCAOutput;
         private readonly JsonDataWriter<NTAuthStore> _nTAuthStoreOutput;
         private readonly JsonDataWriter<CertTemplate> _certTemplateOutput;
 
@@ -52,7 +52,7 @@ public OutputWriter(IContext context, Channel<OutputBase> outputChannel)
             _containerOutput = new JsonDataWriter<Container>(_context, DataType.Containers);
             _rootCAOutput = new JsonDataWriter<RootCA>(_context, DataType.RootCAs);
             _aIACAOutput = new JsonDataWriter<AIACA>(_context, DataType.AIACAs);
-            _enrollmentServiceOutput = new JsonDataWriter<EnrollmentService>(_context, DataType.EnrollmentServices);
+            _enterpriseCAOutput = new JsonDataWriter<EnterpriseCA>(_context, DataType.EnterpriseCAs);
             _nTAuthStoreOutput = new JsonDataWriter<NTAuthStore>(_context, DataType.NTAuthStores);
             _certTemplateOutput = new JsonDataWriter<CertTemplate>(_context, DataType.CertTemplates);
 
@@ -131,8 +131,8 @@ internal async Task<string> StartWriter()
                     case AIACA aIACA:
                         await _aIACAOutput.AcceptObject(aIACA);
                         break;
-                    case EnrollmentService enrollmentService:
-                        await _enrollmentServiceOutput.AcceptObject(enrollmentService);
+                    case EnterpriseCA enterpriseCA:
+                        await _enterpriseCAOutput.AcceptObject(enterpriseCA);
                         break;
                     case NTAuthStore nTAuthStore:
                         await _nTAuthStoreOutput.AcceptObject(nTAuthStore);
@@ -160,7 +160,7 @@ private async Task<string> FlushWriters()
             await _containerOutput.FlushWriter();
             await _rootCAOutput.FlushWriter();
             await _aIACAOutput.FlushWriter();
-            await _enrollmentServiceOutput.FlushWriter();
+            await _enterpriseCAOutput.FlushWriter();
             await _nTAuthStoreOutput.FlushWriter();
             await _certTemplateOutput.FlushWriter();
             CloseOutput();
@@ -191,7 +191,7 @@ private string ZipFiles()
                 _computerOutput.GetFilename(), _userOutput.GetFilename(), _groupOutput.GetFilename(),
                 _containerOutput.GetFilename(), _domainOutput.GetFilename(), _gpoOutput.GetFilename(),
                 _ouOutput.GetFilename(), _rootCAOutput.GetFilename(), _aIACAOutput.GetFilename(),
-                _enrollmentServiceOutput.GetFilename(), _nTAuthStoreOutput.GetFilename(),
+                _enterpriseCAOutput.GetFilename(), _nTAuthStoreOutput.GetFilename(),
                 _certTemplateOutput.GetFilename()
             });