From 29cbc6d0a7527fe761a4893c93800add37dc7e2f Mon Sep 17 00:00:00 2001 From: Stephen Bradshaw Date: Tue, 20 Aug 2024 12:12:35 +1000 Subject: [PATCH] Fix for trim option when a userpass file used --- credmaster.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/credmaster.py b/credmaster.py index a0884d2..87cfc9b 100755 --- a/credmaster.py +++ b/credmaster.py @@ -527,6 +527,17 @@ def spray_thread(self, api_key, api_dict, pluginargs): time.sleep(self.batch_delay * 60) cred = self.q_spray.get_nowait() + if self.trim: + # keep getting new cred entries until we get one for a unvalidated user + while cred["username"].lower() in [a["username"].lower() for a in self.results]: + if not self.q_spray.empty(): + cred = self.q_spray.get_nowait() + else: + break + + # queue empty but final cred is for already validated user + if cred["username"].lower() in [a["username"].lower() for a in self.results]: + break count += 1