Merge branch 'v3' into adcs

SpecterOps · Oct 18, 2023 · 82a1cdf · 82a1cdf
2 parents be37a92 + 45f5385
commit 82a1cdf
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 3 deletions.
diff --git a/src/CommonLib/Enums/LdapErrorCodes.cs b/src/CommonLib/Enums/LdapErrorCodes.cs
@@ -4,5 +4,6 @@ public enum LdapErrorCodes : int
     {
         Success = 0,
         Busy = 51,
+        ServerDown = 81
     }
 }
diff --git a/src/CommonLib/LDAPUtils.cs b/src/CommonLib/LDAPUtils.cs
@@ -866,9 +866,23 @@ public IEnumerable<ISearchResultEntry> QueryLDAP(string ldapFilter, SearchScope
                     if (response != null)
                         pageResponse = (PageResultResponseControl)response.Controls
                             .Where(x => x is PageResultResponseControl).DefaultIfEmpty(null).FirstOrDefault();
-                }
-                catch (LdapException le) when (le.ErrorCode == (int)LdapErrorCodes.Busy && retryCount < MaxRetries)
+                }catch (LdapException le) when (le.ErrorCode == (int)LdapErrorCodes.ServerDown &&
+                                                retryCount < MaxRetries)
                 {
+                    retryCount++;
+                    Thread.Sleep(backoffDelay);
+                    backoffDelay = TimeSpan.FromSeconds(Math.Min(
+                        backoffDelay.TotalSeconds * BackoffDelayMultiplier.TotalSeconds, MaxBackoffDelay.TotalSeconds));
+                    conn = CreateNewConnection(domainName, globalCatalog, skipCache);
+                    if (conn == null)
+                    {
+                        _log.LogError("Unable to create replacement ldap connection for ServerDown exception. Breaking loop");
+                        yield break;
+                    }
+
+                    _log.LogInformation("Created new LDAP connection after receiving ServerDown from server");
+                    continue;
+                }catch (LdapException le) when (le.ErrorCode == (int)LdapErrorCodes.Busy && retryCount < MaxRetries) {
                     retryCount++;
                     Thread.Sleep(backoffDelay);
                     backoffDelay = TimeSpan.FromSeconds(Math.Min(
@@ -920,6 +934,22 @@ public IEnumerable<ISearchResultEntry> QueryLDAP(string ldapFilter, SearchScope
             }
         }
 
+        private LdapConnection CreateNewConnection(string domainName = null, bool globalCatalog = false, bool skipCache = false)
+        {
+            var task = globalCatalog
+                ? Task.Run(() => CreateGlobalCatalogConnection(domainName, _ldapConfig.AuthType))
+                : Task.Run(() => CreateLDAPConnection(domainName, skipCache, _ldapConfig.AuthType));
+
+            try
+            {
+                return task.ConfigureAwait(false).GetAwaiter().GetResult();
+            }
+            catch
+            {
+                return null;
+            }
+        }
+
         /// <summary>
         ///     Performs an LDAP query using the parameters specified by the user.
         /// </summary>
@@ -983,6 +1013,23 @@ public virtual IEnumerable<ISearchResultEntry> QueryLDAP(string ldapFilter, Sear
                         backoffDelay.TotalSeconds * BackoffDelayMultiplier.TotalSeconds, MaxBackoffDelay.TotalSeconds));
                     continue;
                 }
+                catch (LdapException le) when (le.ErrorCode == (int)LdapErrorCodes.ServerDown &&
+                                               retryCount < MaxRetries)
+                {
+                    retryCount++;
+                    Thread.Sleep(backoffDelay);
+                    backoffDelay = TimeSpan.FromSeconds(Math.Min(
+                        backoffDelay.TotalSeconds * BackoffDelayMultiplier.TotalSeconds, MaxBackoffDelay.TotalSeconds));
+                    conn = CreateNewConnection(domainName, globalCatalog, skipCache);
+                    if (conn == null)
+                    {
+                        _log.LogError("Unable to create replacement ldap connection for ServerDown exception. Breaking loop");
+                        yield break;
+                    }
+
+                    _log.LogInformation("Created new LDAP connection after receiving ServerDown from server");
+                    continue;
+                }
                 catch (LdapException le)
                 {
                     if (le.ErrorCode != 82)

diff --git a/src/CommonLib/SharpHoundCommonLib.csproj b/src/CommonLib/SharpHoundCommonLib.csproj
@@ -9,7 +9,7 @@
         <PackageDescription>Common library for C# BloodHound enumeration tasks</PackageDescription>
         <PackageLicenseExpression>GPL-3.0-only</PackageLicenseExpression>
         <RepositoryUrl>https://github.com/BloodHoundAD/SharpHoundCommon</RepositoryUrl>
-        <Version>3.0.8</Version>
+        <Version>3.0.9</Version>
         <AssemblyName>SharpHoundCommonLib</AssemblyName>
         <RootNamespace>SharpHoundCommonLib</RootNamespace>
     </PropertyGroup>