Fix new flags, add some console output for created files, update readme

Author: coj337

ReadMe.md

@@ -56,6 +56,9 @@ TheSprayer.exe -p Passwords.txt -f
 -a, --AttemptsRemaining    Amount of attempts to leave per-account before lockout (Default: 2)
 -c, --Continuous           Continuously spray credentials, waiting between attempts to prevent lockout.
 -n, --NoDb                 Disable using a DB to store previously sprayed creds.
+--Users                    Outputs a list of all users to the specified file
+--UsersCsv                 Outputs a list of all users along with their domain info to the specified CSV file
+--Policy                   Outputs the password policy(ies) to the terminal
 -f, --Force                Force authentication attempts, even users close to lockout
 --help                     Display this help screen.
 ```

TheSprayer/CommandLineOptions.cs

@@ -19,7 +19,7 @@ public class CommandLineOptions
         [Option('u', "UserList", Required = false, HelpText = "A file containing a line delimited list of usernames or a single user to try")]
         public string UserList { get; set; }
 
-        [Option('p', "PasswordList", Required = true, HelpText = "A file containing a line delimited list of passwords or a single password to try")]
+        [Option('p', "PasswordList", Required = false, HelpText = "A file containing a line delimited list of passwords or a single password to try")]
         public string PasswordList { get; set; }
 
         [Option('o', "OutFile", Required = false, HelpText = "File to output found credentials")]
@@ -34,13 +34,13 @@ public class CommandLineOptions
         [Option('n', "NoDb", Required = false, HelpText = "Disable using a DB to store previously sprayed creds.")]
         public bool NoDb { get; set; }
 
-        [Option("Users", Required = false, HelpText = "Outputs a list of all users")]
+        [Option("Users", Required = false, HelpText = "Outputs a list of all users to the specified file")]
         public string OutputUsers { get; set; }
 
-        [Option("UsersCsv", Required = false, HelpText = "Outputs a list of all users along with their domain info to a CSV file")]
+        [Option("UsersCsv", Required = false, HelpText = "Outputs a list of all users along with their domain info to the specified CSV file")]
         public string OutputUsersCsv { get; set; }
 
-        [Option("PassPol", Required = false, HelpText = "Outputs the password polic(ies) to the terminal")]
+        [Option("Policy", Required = false, HelpText = "Outputs the password policy(ies) to the terminal")]
         public bool OutputPasswordPolicy { get; set; }
 
         [Option('f', "Force", Required = false, HelpText = "Force authentication attempts, even users close to lockout")]

TheSprayer/Program.cs

@@ -53,13 +53,15 @@ public static void Main(string[] args)
                 if (!string.IsNullOrWhiteSpace(o.OutputUsers))
                 {
                     var users = adService.GetAllDomainUsers().Select(u => u.SamAccountName);
-                    File.WriteAllLines(o.OutputUsers, users);
+                    File.WriteAllLines(o.OutputUsers + ".txt", users);
+                    Console.WriteLine($"{o.OutputUsers + ".txt"} created.");
                     return;
                 }
                 if (!string.IsNullOrWhiteSpace(o.OutputUsersCsv))
                 {
                     var users = adService.GetAllDomainUsers();
-                    File.WriteAllText(o.OutputUsers, users.ToCsv());
+                    File.WriteAllText(o.OutputUsersCsv + ".csv", users.ToCsv());
+                    Console.WriteLine($"{o.OutputUsersCsv + ".csv"} created.");
                     return;
                 }
                 else if (o.OutputPasswordPolicy) //Output the password policy to the terminal and exit
@@ -75,7 +77,7 @@ public static void Main(string[] args)
                     Console.WriteLine();
                     foreach (var fineGrainedPolicy in fineGrainedPolicies)
                     {
-                        ConsoleHelpers.PrintPasswordPolicy(defaultPolicy);
+                        ConsoleHelpers.PrintPasswordPolicy(fineGrainedPolicy);
                         Console.WriteLine();
                     }