Merge branch '2.X' into adcs

.gitignore

@@ -428,7 +428,7 @@ PublishScripts/
 *.nuget.targets
 
 # Nuget personal access tokens and Credentials
-nuget.config
+#nuget.config
 
 # Microsoft Azure Build Output
 csx/

README.md

@@ -1,5 +1,5 @@
 ---
-SharpHound Open Source Client version: 1.1.1
+SharpHound Open Source Client version: 2.0.0
 ---
 
 # SharpHound

Sharphound.csproj

@@ -6,8 +6,8 @@
         <LangVersion>latest</LangVersion>
         <DebugType>full</DebugType>
         <ApplicationIcon>favicon.ico</ApplicationIcon>
-        <Version>2.0.0</Version>
-        <FileVersion>2.0.0</FileVersion>
+        <Version>2.0.1</Version>
+        <FileVersion>2.0.1</FileVersion>
         <Company>SpecterOps</Company>
         <Product>SharpHound</Product>
         <AssemblyName>SharpHound</AssemblyName>
@@ -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.6" /> -->
+        <!-- <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.5.0" />
     </ItemGroup>
 
     <ItemGroup>
-       <Reference Include="SharpHoundCommonLib, Version=3.0.9.0, Culture=neutral, PublicKeyToken=null">
+        <Reference Include="SharpHoundCommonLib, Version=3.0.8.0, Culture=neutral, PublicKeyToken=null">
             <HintPath>..\SharpHoundCommon\src\CommonLib\bin\Debug\net462\SharpHoundCommonLib.dll</HintPath>
         </Reference>
         <Reference Include="System.DirectoryServices" />

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>

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);

src/Runtime/ObjectProcessors.cs

@@ -11,6 +11,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
 {

src/Sharphound.cs

@@ -392,7 +392,7 @@ public class Program
         public static async Task Main(string[] args)
         {
             var logger = new BasicLogger((int)LogLevel.Information);
-            logger.LogInformation("This version of SharpHound is compatible with the 4.3.1 Release of BloodHound");
+            logger.LogInformation("This version of SharpHound is compatible with the 5.0.0 Release of BloodHound");
             try
             {
                 var parser = new Parser(with =>

src/Writers/JsonDataWriter.cs

@@ -1,8 +1,10 @@
-using System.IO;
+using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
 using Newtonsoft.Json.Serialization;
 using Sharphound.Client;
 using SharpHoundCommonLib.OutputTypes;
@@ -18,6 +20,7 @@ public class JsonDataWriter<T> : BaseWriter<T>
         private JsonTextWriter _jsonWriter;
         private readonly IContext _context;
         private string _fileName;
+        private JsonSerializerSettings _serializerSettings;
 
         private const int DataVersion = 5;
 
@@ -31,6 +34,15 @@ public JsonDataWriter(IContext context, string dataType) : base(dataType)
             _context = context;
             if (_context.Flags.NoOutput)
                 NoOp = true;
+
+            _serializerSettings = new JsonSerializerSettings()
+            {
+                Converters = new List<JsonConverter>
+                {
+                    new StringEnumConverter()
+                },
+                Formatting = PrettyPrint
+            };
         }
 
         private Formatting PrettyPrint => _context.Flags.PrettyPrint ? Formatting.Indented : Formatting.None;
@@ -61,7 +73,7 @@ protected override async Task WriteData()
         {
             foreach (var item in Queue)
             {
-                await _jsonWriter.WriteRawValueAsync(JsonConvert.SerializeObject(item, PrettyPrint));
+                await _jsonWriter.WriteRawValueAsync(JsonConvert.SerializeObject(item, _serializerSettings));
             }
         }