Kerberoast results limit fix

VbScrub · Dec 2, 2021 · 5fd0e92 · 5fd0e92
1 parent 25bb9dc
commit 5fd0e92
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 2 deletions.
diff --git a/GUI/Windows/AboutWindow.xaml.cs b/GUI/Windows/AboutWindow.xaml.cs
@@ -26,7 +26,7 @@ public AboutWindow()
         private void Window_Loaded(object sender, RoutedEventArgs e)
         {
             LblVersion.Text = UiHelpers.GetAppVersionString();
-            LblBuildDate.Text = "30th November 2021"; // TODO: Update build date label before compiling
+            LblBuildDate.Text = "2nd December 2021"; // TODO: Update build date label before compiling
         }
 
         private void WebsiteLnk_Click(object sender, RoutedEventArgs e)

diff --git a/GUI/Windows/Tabs/KerberoastTab.xaml.cs b/GUI/Windows/Tabs/KerberoastTab.xaml.cs
@@ -185,7 +185,15 @@ private void BtnExecute_Click(object sender, RoutedEventArgs e)
                     settings.Delay = delay;
                     settings.Jitter = jitter;
                 }
-                if ((bool)ChkLimitResults.IsChecked) { settings.ResultsLimit = Convert.ToInt32(TxtResultsLimit.Text); }
+                try
+                {
+                    if ((bool)ChkLimitResults.IsChecked) { settings.ResultsLimit = Convert.ToInt32(TxtResultsLimit.Text); }
+                }
+                catch (Exception ex)
+                {
+                    MessageBox.Show("Please specify a valid number of results to limit to", "Invalid Results Limit", MessageBoxButton.OK, MessageBoxImage.Warning);
+                    return;
+                }
                 if ((bool)RdoEnterprise.IsChecked) { settings.Enterprise = true; }
                 if ((bool)RdoAutoEnterprise.IsChecked) { settings.AutoEnterprise = true; }
 

diff --git a/Rubeus/lib/Roast.cs b/Rubeus/lib/Roast.cs
@@ -464,6 +464,11 @@ public static List<KerberoastResult> Kerberoast(KerberoastSettings settings)
 
                     foreach (IDictionary<string, Object> user in users)
                     {
+                        if (settings.ResultsLimit > 0 && results.Count == settings.ResultsLimit)
+                        {
+                            Console.WriteLine("[!] Hit results limit specified by user so not processing any more accounts");
+                            break;
+                        }
                         KerberoastResult roastResult = new KerberoastResult();
                         string samAccountName = (string)user["samaccountname"];
                         string distinguishedName = (string)user["distinguishedname"];

diff --git a/VersionHistory.md b/VersionHistory.md
@@ -6,6 +6,7 @@
 - Due to the change above, added an option to the Brute Forcer to skip the first AS-REQ without preauth if you want to speed things up but accept usernames being case sensitive 
 - Added support for requesting TGTs for usernames that contain UTF8 characters
 - Improved error messages when kerberoasting or AS-REP roasting
+- The option to limit the number of kerberoasting results actually works now
 
 ##### Version 0.3.0