Merge pull request #1 from eversinc33/dev

fix options parsing
LuemmelSec · Feb 15, 2023 · 02efb58 · 02efb58
2 parents a357407 + ff03198
commit 02efb58
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 13 deletions.
diff --git a/src/BaseContext.cs b/src/BaseContext.cs
@@ -115,9 +115,9 @@ public string ResolveFileName(string filename, string extension, bool addTimesta
         }
 
         public string[] Domains { get; set; }
-        public string LocalAdminUsername { get; internal set; }
-        public string LocalAdminPassword { get; internal set; }
-        public bool LocalAdminSessionEnum { get; internal set; }
+        public string LocalAdminUsername { get; set; }
+        public string LocalAdminPassword { get; set; }
+        public bool LocalAdminSessionEnum { get; set; }
 
         // // TODO: override finalizer only if 'Dispose(bool disposing)' has code to free unmanaged resources
         // ~Context()

diff --git a/src/Client/Context.cs b/src/Client/Context.cs
@@ -58,6 +58,10 @@ public interface IContext
         int Jitter { get; set; }
         int PortScanTimeout { get; set; }
 
+        public string LocalAdminUsername { get; set; }
+
+        public string LocalAdminPassword { get; set; }
+
         ResolvedCollectionMethod ResolvedCollectionMethods { get; set; }
 
         /// <summary>

diff --git a/src/Client/Flags.cs b/src/Client/Flags.cs
@@ -25,7 +25,6 @@ public class Flags
         public bool DCOnly { get; set; }
         public bool PrettyPrint { get; set; }
         public bool SearchForest { get; set; }
-        public bool LocalAdminSessionEnum { get; set; }
-
+        public bool DoLocalAdminSessionEnum { get; set; }
     }
 }
diff --git a/src/Options.cs b/src/Options.cs
@@ -76,10 +76,13 @@ public class Options
         [Option(HelpText = "Password for LDAP", Default = null)]
         public string LDAPPassword { get; set; }
 
-        [Option(HelpText = "Username for local Administrator", Default = null)]
+        [Option(HelpText = "Do the session enumeration with local admin credentials instead of domain credentials", Default = false)]
+        public bool DoLocalAdminSessionEnum { get; set; }
+
+        [Option(HelpText = "Username for local Administrator to be used if DoLocalAdminSessionEnum is set", Default = null)]
         public string LocalAdminUsername { get; set; }
 
-        [Option(HelpText = "Password for local Administrator", Default = null)]
+        [Option(HelpText = "Password for local Administrator to be used if DoLocalAdminSessionEnum is set", Default = null)]
         public string LocalAdminPassword { get; set; }
 
         [Option(HelpText = "Override domain controller to pull LDAP from. This option can result in data loss", Default = null)]

diff --git a/src/Runtime/ObjectProcessors.cs b/src/Runtime/ObjectProcessors.cs
@@ -38,7 +38,7 @@ public ObjectProcessors(IContext context, ILogger log)
             _ldapPropertyProcessor = new LDAPPropertyProcessor(context.LDAPUtils);
             _domainTrustProcessor = new DomainTrustProcessor(context.LDAPUtils);
             _computerAvailability = new ComputerAvailability(context.PortScanTimeout, skipPortScan: context.Flags.SkipPortScan, skipPasswordCheck: context.Flags.SkipPasswordAgeCheck);
-            _computerSessionProcessor = new ComputerSessionProcessor(context.LDAPUtils, LocalAdminSessionEnum: context.Flags.LocalAdminSessionEnum);
+            _computerSessionProcessor = new ComputerSessionProcessor(context.LDAPUtils, doLocalAdminSessionEnum: context.Flags.DoLocalAdminSessionEnum, localAdminUsername: context.LocalAdminUsername, localAdminPassword: context.LocalAdminPassword);
             _groupProcessor = new GroupProcessor(context.LDAPUtils);
             _containerProcessor = new ContainerProcessor(context.LDAPUtils);
             _gpoLocalGroupProcessor = new GPOLocalGroupProcessor(context.LDAPUtils);

diff --git a/src/Sharphound.cs b/src/Sharphound.cs
@@ -372,9 +372,7 @@ await options.WithParsedAsync(async options =>
                         DCOnly = dconly,
                         PrettyPrint = options.PrettyPrint,
                         SearchForest = options.SearchForest,
-                        LocalAdminSessionEnum = options.LocalAdminSessionEnum,
-                        LocalAdminUsername = options.LocalAdminUsername,
-                        LocalAdminPassword = options.LocalAdminPassword
+                        DoLocalAdminSessionEnum = options.DoLocalAdminSessionEnum,
                     };
 
                     var ldapOptions = new LDAPConfig
@@ -401,7 +399,7 @@ await options.WithParsedAsync(async options =>
                     }
 
                     
-                        IContext context = new BaseContext(logger, ldapOptions, flags)
+                    IContext context = new BaseContext(logger, ldapOptions, flags)
                     {
                         DomainName = options.Domain,
                         CacheFileName = options.CacheName,
@@ -422,7 +420,6 @@ await options.WithParsedAsync(async options =>
                         LoopInterval = options.LoopInterval,
                         ZipPassword = options.ZipPassword,
                         IsFaulted = false,
-                        LocalAdminSessionEnum = options.LocalAdminSessionEnum,
                         LocalAdminUsername = options.LocalAdminUsername,
                         LocalAdminPassword = options.LocalAdminPassword