fix: don't try to release a connection if its null

SpecterOps · Jul 19, 2024 · b1b6fb2 · b1b6fb2
1 parent d472c20
commit b1b6fb2
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 10 deletions.
diff --git a/src/CommonLib/ConnectionPoolManager.cs b/src/CommonLib/ConnectionPoolManager.cs
@@ -22,7 +22,10 @@ public ConnectionPoolManager(LdapConfig config, ILogger log = null, PortScanner
         }
 
         public void ReleaseConnection(LdapConnectionWrapper connectionWrapper, bool connectionFaulted = false) {
-            //I dont think this is possible, but at least account for it
+            if (connectionWrapper == null) {
+                return;
+            }
+            //I don't think this is possible, but at least account for it
             if (!_pools.TryGetValue(connectionWrapper.PoolIdentifier, out var pool)) {
                 _log.LogWarning("Could not find pool for {Identifier}", connectionWrapper.PoolIdentifier);
                 connectionWrapper.Connection.Dispose();

diff --git a/src/CommonLib/DirectoryObjects/DirectoryEntryWrapper.cs b/src/CommonLib/DirectoryObjects/DirectoryEntryWrapper.cs
@@ -39,6 +39,7 @@ public bool TryGetProperty(string propertyName, out string value) {
         var s = _entry.Properties[propertyName][0];
         value = s switch {
             string st => st,
+            int i => i.ToString(),
             _ => null
         };
 

diff --git a/src/CommonLib/LdapUtils.cs b/src/CommonLib/LdapUtils.cs
@@ -1052,11 +1052,10 @@ public bool GetDomain(out Domain domain) {
 
             if (_hostResolutionMap.TryGetValue(strippedHost, out var sid)) return (true, sid);
 
-            //Immediately start with NetWekstaGetInfo as its our most reliable indicator if successful
-            var workstationInfo = await GetWorkstationInfo(strippedHost);
-            if (workstationInfo.HasValue) {
-                var tempName = workstationInfo.Value.ComputerName;
-                var tempDomain = workstationInfo.Value.LanGroup;
+            //Immediately start with NetWkstaGetInfo as it's our most reliable indicator if successful
+            if (await GetWorkstationInfo(strippedHost) is (true, var workstationInfo)) {
+                var tempName = workstationInfo.ComputerName;
+                var tempDomain = workstationInfo.LanGroup;
 
                 if (string.IsNullOrWhiteSpace(tempDomain)) {
                     tempDomain = domain;
@@ -1138,14 +1137,14 @@ public bool GetDomain(out Domain domain) {
         /// </summary>
         /// <param name="hostname"></param>
         /// <returns></returns>
-        private async Task<NetAPIStructs.WorkstationInfo100?> GetWorkstationInfo(string hostname) {
+        private async Task<(bool Success, NetAPIStructs.WorkstationInfo100 Info)> GetWorkstationInfo(string hostname) {
             if (!await _portScanner.CheckPort(hostname))
-                return null;
+                return (false, default);
 
             var result = _nativeMethods.CallNetWkstaGetInfo(hostname);
-            if (result.IsSuccess) return result.Value;
+            if (result.IsSuccess) return (true, result.Value);
 
-            return null;
+            return (false, default);
         }
 
         public async Task<(bool Success, string[] Sids)> GetGlobalCatalogMatches(string name, string domain) {