fix: elevate try/catch on principalcontext calls to fix exceptions

BloodHoundAD/SharpHound#120
BloodHoundAD · Oct 21, 2024 · ead8b73 · ead8b73
1 parent 8993bec
commit ead8b73
Showing 1 changed file with 21 additions and 17 deletions.
diff --git a/src/CommonLib/LdapUtils.cs b/src/CommonLib/LdapUtils.cs
@@ -168,8 +168,8 @@ public IAsyncEnumerable<LdapResult<IDirectoryObject>> PagedQuery(LdapQueryParame
                 //pass
             }
 
-            using (var ctx = new PrincipalContext(ContextType.Domain)) {
-                try {
+            try {
+                using (var ctx = new PrincipalContext(ContextType.Domain)) {
                     var principal = Principal.FindByIdentity(ctx, IdentityType.Sid, sid);
                     if (principal != null) {
                         var entry = ((DirectoryEntry)principal.GetUnderlyingObject()).ToDirectoryObject();
@@ -178,10 +178,11 @@ public IAsyncEnumerable<LdapResult<IDirectoryObject>> PagedQuery(LdapQueryParame
                             return (true, type);
                         }
                     }
-                } catch {
-                    //pass
                 }
+            } catch {
+                //pass
             }
+
 
             return (false, Label.Base);
         }
@@ -212,8 +213,8 @@ public IAsyncEnumerable<LdapResult<IDirectoryObject>> PagedQuery(LdapQueryParame
                 //pass
             }
 
-            using (var ctx = new PrincipalContext(ContextType.Domain)) {
-                try {
+            try {
+                using (var ctx = new PrincipalContext(ContextType.Domain)) {
                     var principal = Principal.FindByIdentity(ctx, IdentityType.Guid, guid);
                     if (principal != null) {
                         var entry = ((DirectoryEntry)principal.GetUnderlyingObject()).ToDirectoryObject();
@@ -222,10 +223,11 @@ public IAsyncEnumerable<LdapResult<IDirectoryObject>> PagedQuery(LdapQueryParame
                             return (true, type);
                         }
                     }
-                } catch {
-                    //pass
                 }
+            } catch {
+                //pass
             }
+
 
             return (false, Label.Base);
         }
@@ -345,8 +347,8 @@ public IAsyncEnumerable<LdapResult<IDirectoryObject>> PagedQuery(LdapQueryParame
                 return (true, domainName);
             }
 
-            using (var ctx = new PrincipalContext(ContextType.Domain)) {
-                try {
+            try {
+                using (var ctx = new PrincipalContext(ContextType.Domain)) {
                     var principal = Principal.FindByIdentity(ctx, IdentityType.Sid, sid);
                     if (principal != null) {
                         var dn = principal.DistinguishedName;
@@ -355,10 +357,11 @@ public IAsyncEnumerable<LdapResult<IDirectoryObject>> PagedQuery(LdapQueryParame
                             return (true, Helpers.DistinguishedNameToDomain(dn));
                         }
                     }
-                } catch {
-                    //pass
                 }
+            } catch {
+                //pass
             }
+
 
             return (false, string.Empty);
         }
@@ -877,8 +880,8 @@ public async Task<bool> IsDomainController(string computerObjectId, string domai
                 return (true, principal);
             }
 
-            using (var ctx = new PrincipalContext(ContextType.Domain)) {
-                try {
+            try {
+                using (var ctx = new PrincipalContext(ContextType.Domain)) {
                     var lookupPrincipal =
                         Principal.FindByIdentity(ctx, IdentityType.DistinguishedName, distinguishedName);
                     if (lookupPrincipal != null) {
@@ -895,12 +898,13 @@ public async Task<bool> IsDomainController(string computerObjectId, string domai
                         }
                     }
 
-                    return (false, default);
-                } catch {
-                    _unresolvablePrincipals.Add(distinguishedName);
                     return (false, default);
                 }
+            } catch {
+                _unresolvablePrincipals.Add(distinguishedName);
+                return (false, default);
             }
+
         }
 
         public async Task<(bool Success, string DSHeuristics)> GetDSHueristics(string domain, string dn) {