From fc42a0057bb62d53088f1b5cfcb1453199484b6e Mon Sep 17 00:00:00 2001 From: Stephen Bradshaw Date: Tue, 20 Aug 2024 14:33:35 +1000 Subject: [PATCH 1/3] Exclude passwords from all notifications with exclude_password opt --- credmaster.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/credmaster.py b/credmaster.py index a0884d2..ef016d0 100755 --- a/credmaster.py +++ b/credmaster.py @@ -304,10 +304,15 @@ def Execute(self, args): if self.userenum: notify.notify_update("Info: Starting Userenum.", self.notify_obj) else: - notify.notify_update(f"Info: Starting Spray.\nPass: {password}", self.notify_obj) - + if self.notify_obj['exclude_password']: + notify.notify_update(f"Info: Starting Spray.", self.notify_obj) + else: + notify.notify_update(f"Info: Starting Spray.\nPass: {password}", self.notify_obj) else: - notify.notify_update(f"Info: Spray Continuing.\nPass: {password}", self.notify_obj) + if self.notify_obj['exclude_password']: + notify.notify_update(f"Info: Spray Continuing.\nPassword #: {time_count}", self.notify_obj) + else: + notify.notify_update(f"Info: Spray Continuing.\nPass: {password}", self.notify_obj) if self.weekdaywarrior is not None: spray_days = { From 1ec3235a059b29d157ede8a2609fbec8a0eab9dc Mon Sep 17 00:00:00 2001 From: Stephen Bradshaw Date: Tue, 3 Sep 2024 15:25:25 +1000 Subject: [PATCH 2/3] More info in pwdless notify --- credmaster.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/credmaster.py b/credmaster.py index ef016d0..bb5739f 100755 --- a/credmaster.py +++ b/credmaster.py @@ -305,12 +305,12 @@ def Execute(self, args): notify.notify_update("Info: Starting Userenum.", self.notify_obj) else: if self.notify_obj['exclude_password']: - notify.notify_update(f"Info: Starting Spray.", self.notify_obj) + notify.notify_update(f"Info: Starting Spray ({self.passwordfile or self.userpassfile}).\nPassword #: {time_count}", self.notify_obj) else: notify.notify_update(f"Info: Starting Spray.\nPass: {password}", self.notify_obj) else: if self.notify_obj['exclude_password']: - notify.notify_update(f"Info: Spray Continuing.\nPassword #: {time_count}", self.notify_obj) + notify.notify_update(f"Info: Spray Continuing ({self.passwordfile or self.userpassfile}).\nPassword #: {time_count}", self.notify_obj) else: notify.notify_update(f"Info: Spray Continuing.\nPass: {password}", self.notify_obj) From 4655bbae1a23d9974264aca4342294781c741e24 Mon Sep 17 00:00:00 2001 From: Stephen Bradshaw Date: Tue, 3 Sep 2024 17:59:32 +1000 Subject: [PATCH 3/3] add count of passwords --- credmaster.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/credmaster.py b/credmaster.py index bb5739f..0a3fd6b 100755 --- a/credmaster.py +++ b/credmaster.py @@ -305,12 +305,12 @@ def Execute(self, args): notify.notify_update("Info: Starting Userenum.", self.notify_obj) else: if self.notify_obj['exclude_password']: - notify.notify_update(f"Info: Starting Spray ({self.passwordfile or self.userpassfile}).\nPassword #: {time_count}", self.notify_obj) + notify.notify_update(f"Info: Starting Spray ({self.passwordfile or self.userpassfile}).\nPassword #: {time_count} of {len(passwords)}", self.notify_obj) else: notify.notify_update(f"Info: Starting Spray.\nPass: {password}", self.notify_obj) else: if self.notify_obj['exclude_password']: - notify.notify_update(f"Info: Spray Continuing ({self.passwordfile or self.userpassfile}).\nPassword #: {time_count}", self.notify_obj) + notify.notify_update(f"Info: Spray Continuing ({self.passwordfile or self.userpassfile}).\nPassword #: {time_count} of {len(passwords)}", self.notify_obj) else: notify.notify_update(f"Info: Spray Continuing.\nPass: {password}", self.notify_obj)