fix: exception when adding keys (#149)

fix: couple missing properties chore: bump version
BloodHoundAD · Jul 31, 2024 · 1f5e96a · 1f5e96a
1 parent 3398b95
commit 1f5e96a
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 13 deletions.
diff --git a/src/CommonLib/LdapQueries/CommonProperties.cs b/src/CommonLib/LdapQueries/CommonProperties.cs
@@ -55,7 +55,7 @@ public static class CommonProperties
             LDAPProperties.GroupPolicyOptions, LDAPProperties.AllowedToDelegateTo,
             LDAPProperties.AllowedToActOnBehalfOfOtherIdentity, LDAPProperties.WhenCreated,
             LDAPProperties.HostServiceAccount, LDAPProperties.UnixUserPassword, LDAPProperties.MsSFU30Password,
-            LDAPProperties.UnicodePassword
+            LDAPProperties.UnicodePassword, LDAPProperties.ProfilePath, LDAPProperties.ScriptPath
         };
 
         public static readonly string[] ContainerProps =

diff --git a/src/CommonLib/LdapUtils.cs b/src/CommonLib/LdapUtils.cs
@@ -1402,22 +1402,19 @@ public async IAsyncEnumerable<OutputBase> GetWellKnownPrincipalOutput() {
         }
 
         private async IAsyncEnumerable<Group> GetEnterpriseDCGroups() {
-            var grouped = new Dictionary<string, List<string>>();
-            var forestSidToName = new Dictionary<string, string>();
+            var grouped = new ConcurrentDictionary<string, List<string>>(StringComparer.OrdinalIgnoreCase);
+            var forestSidToName = new ConcurrentDictionary<string, string>(StringComparer.OrdinalIgnoreCase);
             foreach (var domainSid in DomainControllers.GroupBy(x => new SecurityIdentifier(x.Key).AccountDomainSid.Value)) {
                 if (await GetDomainNameFromSid(domainSid.Key) is (true, var domainName) &&
                     await GetForest(domainName) is (true, var forestName) &&
                     await GetDomainSidFromDomainName(forestName) is (true, var forestDomainSid)) {
-                    forestSidToName.Add(forestDomainSid, forestName);
-                    if (grouped.ContainsKey(forestDomainSid)) {
-                        foreach (var k in domainSid) {
-                            grouped[forestDomainSid].Add(k.Key);    
-                        }
-                    } else {
+                    forestSidToName.TryAdd(forestDomainSid, forestName);
+                    if (!grouped.ContainsKey(forestDomainSid)) {
                         grouped[forestDomainSid] = new List<string>();
-                        foreach (var k in domainSid) {
-                            grouped[forestDomainSid].Add(k.Key);    
-                        }
+                    }
+
+                    foreach (var k in domainSid) {
+                        grouped[forestDomainSid].Add(k.Key);    
                     }
                 }
             }

diff --git a/src/CommonLib/Processors/LdapPropertyProcessor.cs b/src/CommonLib/Processors/LdapPropertyProcessor.cs
@@ -212,6 +212,7 @@ public async Task<UserProperties> ReadUserProperties(IDirectoryObject entry, str
             props.Add("unicodepassword", entry.GetProperty(LDAPProperties.UnicodePassword));
             props.Add("sfupassword", entry.GetProperty(LDAPProperties.MsSFU30Password));
             props.Add("logonscript", entry.GetProperty(LDAPProperties.ScriptPath));
+            props.Add("profilepath", entry.GetProperty(LDAPProperties.ProfilePath));
 
             entry.TryGetLongProperty(LDAPProperties.AdminCount, out var ac);
             props.Add("admincount", ac != 0);

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>4.0.3</Version>
+        <Version>4.0.4</Version>
         <AssemblyName>SharpHoundCommonLib</AssemblyName>
         <RootNamespace>SharpHoundCommonLib</RootNamespace>
     </PropertyGroup>