From aa2e2c2f5b23f093f25297edcbbb56dabec2d24e Mon Sep 17 00:00:00 2001
From: rvazarkar <rvazarkar@specterops.io>
Date: Tue, 26 Sep 2023 15:11:47 -0400
Subject: [PATCH 1/2] chore: move commonlib over to new hosting

---
 .gitignore        | 2 +-
 Sharphound.csproj | 7 ++++---
 nuget.config      | 8 ++++++++
 3 files changed, 13 insertions(+), 4 deletions(-)
 create mode 100644 nuget.config

diff --git a/.gitignore b/.gitignore
index 98b8228..e2a5b73 100644
--- a/.gitignore
+++ b/.gitignore
@@ -428,7 +428,7 @@ PublishScripts/
 *.nuget.targets
 
 # Nuget personal access tokens and Credentials
-nuget.config
+#nuget.config
 
 # Microsoft Azure Build Output
 csx/
diff --git a/Sharphound.csproj b/Sharphound.csproj
index cee86b2..842c76b 100644
--- a/Sharphound.csproj
+++ b/Sharphound.csproj
@@ -24,15 +24,16 @@
         <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="5.0.0" />
         <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="5.0.0" />
         <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-        <PackageReference Include="SharpHoundCommon" Version="3.0.4" />
+        <PackageReference Include="SharpHoundCommon" Version="3.0.8" />
+        <PackageReference Include="SharpHoundRPC" Version="3.0.8" />
         <PackageReference Include="SharpZipLib" Version="1.3.3" />
         <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />
         <PackageReference Include="System.Threading.Channels" Version="6.0.0" />
-        <PackageReference Include="System.ValueTuple" Version="4.3.1" />
+        <PackageReference Include="System.ValueTuple" Version="4.5.0" />
     </ItemGroup>
 
     <ItemGroup>
-<!--        <Reference Include="SharpHoundCommonLib, Version=3.0.0.0, Culture=neutral, PublicKeyToken=null">-->
+<!--        <Reference Include="SharpHoundCommonLib, Version=3.0.6.0, Culture=neutral, PublicKeyToken=null">-->
 <!--            <HintPath>..\SharpHoundCommon\src\CommonLib\bin\Debug\net462\SharpHoundCommonLib.dll</HintPath>-->
 <!--        </Reference>-->
         <Reference Include="System.DirectoryServices" />
diff --git a/nuget.config b/nuget.config
new file mode 100644
index 0000000..21f2f07
--- /dev/null
+++ b/nuget.config
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+    <packageSources>
+        <clear />
+        <add key="specterops" value="https://s3.amazonaws.com/bloodhound-ad/index.json" />
+        <add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
+    </packageSources>
+</configuration>

From 16303fc79f4594bc9df6f26e90a0764b73859b54 Mon Sep 17 00:00:00 2001
From: rvazarkar <rvazarkar@specterops.io>
Date: Tue, 26 Sep 2023 15:12:13 -0400
Subject: [PATCH 2/2] chore: add some extra logging around CollectAllProperties

---
 src/Producers/LdapProducer.cs   | 6 ++++++
 src/Runtime/ObjectProcessors.cs | 3 +++
 2 files changed, 9 insertions(+)

diff --git a/src/Producers/LdapProducer.cs b/src/Producers/LdapProducer.cs
index 6d712ef..78feaf4 100644
--- a/src/Producers/LdapProducer.cs
+++ b/src/Producers/LdapProducer.cs
@@ -31,6 +31,12 @@ public override async Task Produce()
             var log = Context.Logger;
             var utils = Context.LDAPUtils;
 
+            if (Context.Flags.CollectAllProperties)
+            {
+                log.LogDebug("CollectAllProperties set. Changing LDAP properties to *");
+                ldapData.Props = new[] { "*" };
+            }
+
             foreach (var domain in Context.Domains)
             {
                 Context.Logger.LogInformation("Beginning LDAP search for {Domain}", domain);
diff --git a/src/Runtime/ObjectProcessors.cs b/src/Runtime/ObjectProcessors.cs
index 45e4723..3282a68 100644
--- a/src/Runtime/ObjectProcessors.cs
+++ b/src/Runtime/ObjectProcessors.cs
@@ -10,6 +10,9 @@
 using SharpHoundCommonLib.Enums;
 using SharpHoundCommonLib.OutputTypes;
 using SharpHoundCommonLib.Processors;
+using Container = SharpHoundCommonLib.OutputTypes.Container;
+using Group = SharpHoundCommonLib.OutputTypes.Group;
+using Label = SharpHoundCommonLib.Enums.Label;
 
 namespace Sharphound.Runtime
 {