chore: bump versions, fix forestrootid

SpecterOps · Jul 30, 2024 · 9470f66 · 9470f66
1 parent f17436e
commit 9470f66
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/Sharphound.csproj b/Sharphound.csproj
@@ -6,8 +6,8 @@
         <LangVersion>latest</LangVersion>
         <DebugType>full</DebugType>
         <ApplicationIcon>favicon.ico</ApplicationIcon>
-        <Version>2.5.2</Version>
-        <FileVersion>2.5.2</FileVersion>
+        <Version>2.5.3</Version>
+        <FileVersion>2.5.3</FileVersion>
         <Company>SpecterOps</Company>
         <Product>SharpHound</Product>
         <AssemblyName>SharpHound</AssemblyName>
@@ -24,8 +24,8 @@
         <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0" />
         <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
         <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-        <PackageReference Include="SharpHoundCommon" Version="4.0.2" />
-        <PackageReference Include="SharpHoundRPC" Version="4.0.2" />
+        <PackageReference Include="SharpHoundCommon" Version="4.0.3" />
+        <PackageReference Include="SharpHoundRPC" Version="4.0.3" />
         <PackageReference Include="SharpZipLib" Version="1.3.3" />
         <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />
         <PackageReference Include="System.Threading.Channels" Version="8.0.0" />

diff --git a/src/Runtime/ObjectProcessors.cs b/src/Runtime/ObjectProcessors.cs
@@ -349,6 +349,10 @@ private async Task<Domain> ProcessDomainObject(IDirectoryObject entry,
             var ret = new Domain {
                 ObjectIdentifier = resolvedSearchResult.ObjectId
             };
+
+            if (await _context.LDAPUtils.GetForest(resolvedSearchResult.DisplayName) is (true, var forest) && await _context.LDAPUtils.GetDomainSidFromDomainName(forest) is (true, var forestSid)) {
+                ret.ForestRootIdentifier = forestSid;
+            }
 
             ret.Properties = new Dictionary<string, object>(GetCommonProperties(entry, resolvedSearchResult));