chore: fix namespace

SpecterOps · Feb 11, 2025 · e96438f · e96438f
1 parent 79333e2
commit e96438f
Show file tree

Hide file tree

Showing 21 changed files with 16 additions and 25 deletions.
diff --git a/src/CommonLib/LdapUtils.cs b/src/CommonLib/LdapUtils.cs
@@ -982,6 +982,7 @@ await GetDomainSidFromDomainName(forestName) is (true, var forestDomainSid)) {
 
             foreach (var f in grouped) {
                 if (!forestSidToName.TryGetValue(f.Key, out var forestName)) {
+                    _log.LogWarning("Could not get a mapped value for well known principal {Key}", f.Key);
                     continue;
                 }
 

diff --git a/src/CommonLib/Ntlm/HttpNtlmAuthenticationService.cs b/src/CommonLib/Ntlm/HttpNtlmAuthenticationService.cs
@@ -35,10 +35,10 @@ public async Task EnsureRequiresAuth(Uri url, bool? useBadChannelBindings) {
 
         foreach (var authScheme in supportedAuthSchemes) {
             if (useBadChannelBindings == null) {
-                await AuthWithBadChannelBindings(url, authScheme);
+                await AuthWithBadChannelBindingsAsync(url, authScheme);
             } else {
                 if ((bool)useBadChannelBindings) {
-                    await AuthWithBadChannelBindings(url, authScheme);
+                    await AuthWithBadChannelBindingsAsync(url, authScheme);
                 } else {
                     await AuthWithChannelBindingAsync(url, authScheme);
                 }
@@ -88,7 +88,7 @@ private string[] ExtractAuthSchemes(HttpResponseMessage response) {
         return schemes;
     }
 
-    private async Task AuthWithBadChannelBindings(Uri url, string authScheme) {
+    private async Task AuthWithBadChannelBindingsAsync(Uri url, string authScheme) {
         var httpClient = _httpClientFactory.CreateUnauthenticatedClient();
         var transport = new HttpTransport(httpClient, url, authScheme, _logger);
         var ntlmAuthHandler = new NtlmAuthenticationHandler($"HTTP/{url.Host}");

diff --git a/...monLib/OutputTypes/APIResult/APIResult.cs → src/CommonLib/OutputTypes/APIResult.cs b/...monLib/OutputTypes/APIResult/APIResult.cs → src/CommonLib/OutputTypes/APIResult.cs
@@ -1,4 +1,4 @@
-namespace SharpHoundCommonLib.OutputTypes.APIResult {
+namespace SharpHoundCommonLib.OutputTypes {
     public class APIResult {
         public bool Collected { get; set; }
         public string FailureReason { get; set; }

diff --git a/...utTypes/APIResult/AceRegistryAPIResult.cs → ...tTypes/APIResults/AceRegistryAPIResult.cs b/...utTypes/APIResult/AceRegistryAPIResult.cs → ...tTypes/APIResults/AceRegistryAPIResult.cs
@@ -2,7 +2,7 @@
 
 namespace SharpHoundCommonLib.OutputTypes
 {
-    public class AceRegistryAPIResult : APIResult.APIResult
+    public class AceRegistryAPIResult : APIResult
     {
         public ACE[] Data { get; set; } = Array.Empty<ACE>();
     }

diff --git a/...tTypes/APIResult/BoolRegistryAPIResult.cs → ...Types/APIResults/BoolRegistryAPIResult.cs b/...tTypes/APIResult/BoolRegistryAPIResult.cs → ...Types/APIResults/BoolRegistryAPIResult.cs
@@ -1,6 +1,6 @@
 namespace SharpHoundCommonLib.OutputTypes
 {
-    public class BoolRegistryAPIResult : APIResult.APIResult
+    public class BoolRegistryAPIResult : APIResult
     {
         public bool Value { get; set; }
     }

diff --git a/...tTypes/APIResult/CAEnrollmentAPIResult.cs → ...Types/APIResults/CAEnrollmentAPIResult.cs b/...tTypes/APIResult/CAEnrollmentAPIResult.cs → ...Types/APIResults/CAEnrollmentAPIResult.cs
@@ -1,6 +1,6 @@
 namespace SharpHoundCommonLib.OutputTypes;
 
-public class CAEnrollmentAPIResult : APIResult.APIResult{
+public class CAEnrollmentAPIResult : APIResult{
     public CAEnrollmentEndpoint Result { get; set; }
 
     public static CAEnrollmentAPIResult Fail(string error) {

diff --git a/...esult/EnrollmentAgentRegistryAPIResult.cs → ...sults/EnrollmentAgentRegistryAPIResult.cs b/...esult/EnrollmentAgentRegistryAPIResult.cs → ...sults/EnrollmentAgentRegistryAPIResult.cs
@@ -3,7 +3,7 @@
 
 namespace SharpHoundCommonLib.OutputTypes
 {
-    public class EnrollmentAgentRegistryAPIResult : APIResult.APIResult
+    public class EnrollmentAgentRegistryAPIResult : APIResult
     {
         public EnrollmentAgentRestriction[] Restrictions { get; set; } = Array.Empty<EnrollmentAgentRestriction>();
     }

diff --git a/...utTypes/APIResult/IntRegistryAPIResult.cs → ...tTypes/APIResults/IntRegistryAPIResult.cs b/...utTypes/APIResult/IntRegistryAPIResult.cs → ...tTypes/APIResults/IntRegistryAPIResult.cs
@@ -1,6 +1,6 @@
 namespace SharpHoundCommonLib.OutputTypes
 {
-    public class IntRegistryAPIResult : APIResult.APIResult
+    public class IntRegistryAPIResult : APIResult
     {
         public int Value { get; set; }
     }

diff --git a/...tTypes/APIResult/LSAPrivilegeAPIResult.cs → ...Types/APIResults/LSAPrivilegeAPIResult.cs b/...tTypes/APIResult/LSAPrivilegeAPIResult.cs → ...Types/APIResults/LSAPrivilegeAPIResult.cs
@@ -2,7 +2,7 @@
 
 namespace SharpHoundCommonLib.OutputTypes
 {
-    public class LSAPrivilegeAPIResult : APIResult.APIResult
+    public class LSAPrivilegeAPIResult : APIResult
     {
         public TypedPrincipal[] Results { get; set; } = Array.Empty<TypedPrincipal>();
     }

diff --git a/...putTypes/APIResult/LocalGroupAPIResult.cs → ...utTypes/APIResults/LocalGroupAPIResult.cs b/...putTypes/APIResult/LocalGroupAPIResult.cs → ...utTypes/APIResults/LocalGroupAPIResult.cs
@@ -3,7 +3,7 @@
 
 namespace SharpHoundCommonLib.OutputTypes
 {
-    public class LocalGroupAPIResult : APIResult.APIResult
+    public class LocalGroupAPIResult : APIResult
     {
         public string ObjectIdentifier { get; set; }
         public string Name { get; set; }

diff --git a/...OutputTypes/APIResult/SessionAPIResult.cs → ...utputTypes/APIResults/SessionAPIResult.cs b/...OutputTypes/APIResult/SessionAPIResult.cs → ...utputTypes/APIResults/SessionAPIResult.cs
@@ -2,7 +2,7 @@
 
 namespace SharpHoundCommonLib.OutputTypes
 {
-    public class SessionAPIResult : APIResult.APIResult
+    public class SessionAPIResult : APIResult
     {
         public Session[] Results { get; set; } = Array.Empty<Session>();
     }

diff --git a/...PIResult/UserRightsAssignmentAPIResult.cs → ...IResults/UserRightsAssignmentAPIResult.cs b/...PIResult/UserRightsAssignmentAPIResult.cs → ...IResults/UserRightsAssignmentAPIResult.cs
@@ -3,7 +3,7 @@
 
 namespace SharpHoundCommonLib.OutputTypes
 {
-    public class UserRightsAssignmentAPIResult : APIResult.APIResult
+    public class UserRightsAssignmentAPIResult : APIResult
     {
         public string Privilege { get; set; }
         public TypedPrincipal[] Results { get; set; } = Array.Empty<TypedPrincipal>();

diff --git a/src/CommonLib/OutputTypes/CARegistryData.cs b/src/CommonLib/OutputTypes/CARegistryData.cs
@@ -1,5 +1,4 @@
-using SharpHoundCommonLib.OutputTypes.APIResult;
-using SharpHoundCommonLib.Processors;
+using SharpHoundCommonLib.Processors;
 
 namespace SharpHoundCommonLib.OutputTypes
 {

diff --git a/src/CommonLib/OutputTypes/Computer.cs b/src/CommonLib/OutputTypes/Computer.cs
@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using SharpHoundCommonLib.OutputTypes.APIResult;
 
 namespace SharpHoundCommonLib.OutputTypes {
     /// <summary>

diff --git a/src/CommonLib/OutputTypes/EnterpriseCA.cs b/src/CommonLib/OutputTypes/EnterpriseCA.cs
@@ -1,6 +1,4 @@
-using SharpHoundCommonLib.OutputTypes.APIResult;
-
-namespace SharpHoundCommonLib.OutputTypes
+namespace SharpHoundCommonLib.OutputTypes
 {
     public class EnterpriseCA : OutputBase
     {

diff --git a/src/CommonLib/Processors/CAEnrollmentProcessor.cs b/src/CommonLib/Processors/CAEnrollmentProcessor.cs
@@ -7,7 +7,6 @@
 using System.Net.Http;
 using System.Net.Sockets;
 using System.Threading.Tasks;
-using SharpHoundCommonLib.OutputTypes.APIResult;
 
 namespace SharpHoundCommonLib.Processors {
     /// <summary>

diff --git a/src/CommonLib/Processors/DCLdapProcessor.cs b/src/CommonLib/Processors/DCLdapProcessor.cs
@@ -6,7 +6,6 @@
 using System;
 using System.Diagnostics.CodeAnalysis;
 using System.Threading.Tasks;
-using SharpHoundCommonLib.OutputTypes.APIResult;
 
 namespace SharpHoundCommonLib.Processors;
 

diff --git a/src/CommonLib/Processors/EventLogProcessor.cs b/src/CommonLib/Processors/EventLogProcessor.cs
@@ -7,7 +7,6 @@
 using System.Threading.Tasks;
 using SharpHoundCommonLib.OutputTypes;
 using System.Net;
-using SharpHoundCommonLib.OutputTypes.APIResult;
 
 namespace SharpHoundCommonLib.Processors {
     [Flags]

diff --git a/src/CommonLib/Processors/RegistryResult.cs b/src/CommonLib/Processors/RegistryResult.cs
@@ -1,5 +1,4 @@
 using SharpHoundCommonLib.OutputTypes;
-using SharpHoundCommonLib.OutputTypes.APIResult;
 
 namespace SharpHoundCommonLib.Processors {
     public class RegistryResult : APIResult {

diff --git a/src/CommonLib/Processors/SmbProcessor.cs b/src/CommonLib/Processors/SmbProcessor.cs
@@ -5,7 +5,6 @@
 using System.Net.Sockets;
 using System.Text;
 using System.Threading.Tasks;
-using SharpHoundCommonLib.OutputTypes.APIResult;
 
 namespace SharpHoundCommonLib.Processors {
     /// <summary>

diff --git a/src/CommonLib/Processors/WebClientServiceProcessor.cs b/src/CommonLib/Processors/WebClientServiceProcessor.cs
@@ -8,7 +8,6 @@
 using System.Runtime.InteropServices;
 using System.Text;
 using System.Threading.Tasks;
-using SharpHoundCommonLib.OutputTypes.APIResult;
 
 namespace SharpHoundCommonLib.Processors {
     /// <summary>