From 0bf98fd820f8eaeb8db56ea6ed28c1e8c6c5a603 Mon Sep 17 00:00:00 2001
From: Rohan Vazarkar <rvazarkar@users.noreply.github.com>
Date: Wed, 31 Jul 2024 10:13:01 -0400
Subject: [PATCH] chore: update commonlib (#110)

chore: skip base labelled items
chore: bump version
---
 Sharphound.csproj           | 8 ++++----
 src/Runtime/LDAPConsumer.cs | 8 ++++++--
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/Sharphound.csproj b/Sharphound.csproj
index a04e8d4..ae75dac 100644
--- a/Sharphound.csproj
+++ b/Sharphound.csproj
@@ -6,8 +6,8 @@
         <LangVersion>latest</LangVersion>
         <DebugType>full</DebugType>
         <ApplicationIcon>favicon.ico</ApplicationIcon>
-        <Version>2.5.3</Version>
-        <FileVersion>2.5.3</FileVersion>
+        <Version>2.5.4</Version>
+        <FileVersion>2.5.4</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.3" />
-        <PackageReference Include="SharpHoundRPC" Version="4.0.3" />
+        <PackageReference Include="SharpHoundCommon" Version="4.0.4" />
+        <PackageReference Include="SharpHoundRPC" Version="4.0.4" />
         <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/LDAPConsumer.cs b/src/Runtime/LDAPConsumer.cs
index 4aa4046..952b0f9 100644
--- a/src/Runtime/LDAPConsumer.cs
+++ b/src/Runtime/LDAPConsumer.cs
@@ -6,6 +6,7 @@
 using Microsoft.Extensions.Logging;
 using Sharphound.Client;
 using SharpHoundCommonLib;
+using SharpHoundCommonLib.Enums;
 using SharpHoundCommonLib.OutputTypes;
 
 namespace Sharphound.Runtime
@@ -24,11 +25,14 @@ internal static async Task ConsumeSearchResults(Channel<IDirectoryObject> inputC
             await foreach (var item in inputChannel.Reader.ReadAllAsync())
                 try
                 {
-                    if (await LdapUtils.ResolveSearchResult(item, context.LDAPUtils) is not (true, var res) || res == null) {
+                    if (await LdapUtils.ResolveSearchResult(item, context.LDAPUtils) is not (true, var res) || res == null || res.ObjectType == Label.Base) {
+                        if (item.TryGetDistinguishedName(out var dn)) {
+                            log.LogTrace("Consumer failed to resolve entry for {item} or label was Base", dn);
+                        }
                         continue;
                     }
 
-                    log.LogTrace("Consumer {ThreadID} started processing {obj}", threadId, res.DisplayName);
+                    log.LogTrace("Consumer {ThreadID} started processing {obj} ({type})", threadId, res.DisplayName, res.ObjectType);
                     watch.Start();
                     var processed = await processor.ProcessObject(item, res, computerStatusChannel);
                     watch.Stop();