Merge pull request #78 from BloodHoundAD/BED-3926

fix: bad filter sneaking into configurations NC
BloodHoundAD · Nov 29, 2023 · a341b73 · a341b73
2 parents 437894e + ff68481
commit a341b73
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/Producers/BaseProducer.cs b/src/Producers/BaseProducer.cs
@@ -151,7 +151,7 @@ protected LDAPData CreateConfigNCData()
             props.AddRange(CommonProperties.TypeResolutionProps);
 
             var methods = Context.ResolvedCollectionMethods;
-            var allObjectTypesQuery = query.AddContainers().AddConfiguration().AddCertificateTemplates().AddCertificateAuthorities().AddEnterpriseCertificationAuthorities();
+            var allObjectTypesQuery = new LDAPFilter().AddContainers().AddConfiguration().AddCertificateTemplates().AddCertificateAuthorities().AddEnterpriseCertificationAuthorities();
 
             if ((methods & ResolvedCollectionMethod.ObjectProps) != 0)
             {

diff --git a/src/Producers/LdapProducer.cs b/src/Producers/LdapProducer.cs
@@ -94,9 +94,12 @@ public override async Task ProduceConfigNC()
         {
             var cancellationToken = Context.CancellationTokenSource.Token;
             var configNcData = CreateConfigNCData();
-            List<string> configurationNCsCollected = new List<string>();
+            var configurationNCsCollected = new List<string>();
 
-            foreach (EnumerationDomain domain in Context.Domains)
+            if (string.IsNullOrEmpty(configNcData.Filter.GetFilter()))
+                return;
+
+            foreach (var domain in Context.Domains)
             {
                 var configAdsPath = Context.LDAPUtils.GetConfigurationPath(domain.Name);
                 if (!configurationNCsCollected.Contains(configAdsPath))
@@ -121,8 +124,6 @@ public override async Task ProduceConfigNC()
                     Context.Logger.LogTrace("Skipping already collected config NC '{path}' for domain {Domain}", configAdsPath, domain.Name);
                 }
             }
-
         }
-
     }
 }