From b074b5d784c2f9bed9c2f13d9cdc23e2a7d4335b Mon Sep 17 00:00:00 2001 From: Justin Bollinger Date: Mon, 2 Feb 2026 12:39:24 -0500 Subject: [PATCH] fixed wordlist display --- hate_crack/attacks.py | 7 +++++- hate_crack/main.py | 40 +++++++++++++++++------------------ tests/test_ui_menu_options.py | 20 +++++++++--------- 3 files changed, 36 insertions(+), 31 deletions(-) diff --git a/hate_crack/attacks.py b/hate_crack/attacks.py index f61ae59..2b7a276 100644 --- a/hate_crack/attacks.py +++ b/hate_crack/attacks.py @@ -73,7 +73,8 @@ def quick_crack(ctx: Any) -> None: print('0. To run without any rules') for i, file in enumerate(rule_files, start=1): print(f"{i}. {file}") - print('99. YOLO...run all of the rules') + print('98. YOLO...run all of the rules') + print('99. Back to Main Menu') while rule_choice is None: raw_choice = input( @@ -81,10 +82,14 @@ def quick_crack(ctx: Any) -> None: f'For example 1+1 will run {rule_files[0]} chained twice and 1,2 would run {rule_files[0]} and then {rule_files[1]} sequentially.\n' 'Choose wisely: ' ) + if raw_choice.strip() == '99': + return if raw_choice != '': rule_choice = raw_choice.split(',') if '99' in rule_choice: + return + if '98' in rule_choice: for rule in rule_files: selected_hcatRules.append(f"-r {ctx.hcatPath}/rules/{rule}") elif '0' in rule_choice: diff --git a/hate_crack/main.py b/hate_crack/main.py index 517135d..bf62d33 100755 --- a/hate_crack/main.py +++ b/hate_crack/main.py @@ -2014,16 +2014,16 @@ def get_main_menu_options(): "11": middle_combinator, "12": thorough_combinator, "13": bandrel_method, - "91": download_hashmob_rules, - "92": weakpass_wordlist_menu, - "93": download_hashmob_wordlists, - "94": weakpass_wordlist_menu, - "95": hashview_api, - "96": pipal, - "97": export_excel, - "98": show_results, - "99": show_readme, - "100": quit_hc, + "90": download_hashmob_rules, + "91": weakpass_wordlist_menu, + "92": download_hashmob_wordlists, + "93": weakpass_wordlist_menu, + "94": hashview_api, + "95": pipal, + "96": export_excel, + "97": show_results, + "98": show_readme, + "99": quit_hc, } # The Main Guts @@ -2276,16 +2276,16 @@ def main(): print("\t(11) Middle Combinator Attack") print("\t(12) Thorough Combinator Attack") print("\t(13) Bandrel Methodology") - print("\n\t(91) Download rules from Hashmob.net") - print("\n\t(92) Download wordlists from Weakpass") - print("\t(93) Download wordlists from Hashmob.net") - print("\t(94) Weakpass Wordlist Menu") - print("\t(95) Hashview API") - print("\t(96) Analyze hashes with Pipal") - print("\t(97) Export Output to Excel Format") - print("\t(98) Display Cracked Hashes") - print("\t(99) Display README") - print("\t(100) Quit") + print("\n\t(90) Download rules from Hashmob.net") + print("\n\t(91) Download wordlists from Weakpass") + print("\t(92) Download wordlists from Hashmob.net") + print("\t(93) Weakpass Wordlist Menu") + print("\t(94) Hashview API") + print("\t(95) Analyze hashes with Pipal") + print("\t(96) Export Output to Excel Format") + print("\t(97) Display Cracked Hashes") + print("\t(98) Display README") + print("\t(99) Quit") try: task = input("\nSelect a task: ") options[task]() diff --git a/tests/test_ui_menu_options.py b/tests/test_ui_menu_options.py index d700357..b2c82ba 100644 --- a/tests/test_ui_menu_options.py +++ b/tests/test_ui_menu_options.py @@ -22,16 +22,16 @@ MENU_OPTION_TEST_CASES = [ ("11", CLI_MODULE._attacks, "middle_combinator", "middle"), ("12", CLI_MODULE._attacks, "thorough_combinator", "thorough"), ("13", CLI_MODULE._attacks, "bandrel_method", "bandrel"), - ("91", CLI_MODULE, "download_hashmob_rules", "hashmob-rules"), - ("92", CLI_MODULE, "weakpass_wordlist_menu", "weakpass-menu"), - ("93", CLI_MODULE, "download_hashmob_wordlists", "hashmob-wordlists"), - ("94", CLI_MODULE, "weakpass_wordlist_menu", "weakpass-menu-secondary"), - ("95", CLI_MODULE, "hashview_api", "hashview"), - ("96", CLI_MODULE, "pipal", "pipal"), - ("97", CLI_MODULE, "export_excel", "export-excel"), - ("98", CLI_MODULE, "show_results", "show-results"), - ("99", CLI_MODULE, "show_readme", "show-readme"), - ("100", CLI_MODULE, "quit_hc", "quit"), + ("90", CLI_MODULE, "download_hashmob_rules", "hashmob-rules"), + ("91", CLI_MODULE, "weakpass_wordlist_menu", "weakpass-menu"), + ("92", CLI_MODULE, "download_hashmob_wordlists", "hashmob-wordlists"), + ("93", CLI_MODULE, "weakpass_wordlist_menu", "weakpass-menu-secondary"), + ("94", CLI_MODULE, "hashview_api", "hashview"), + ("95", CLI_MODULE, "pipal", "pipal"), + ("96", CLI_MODULE, "export_excel", "export-excel"), + ("97", CLI_MODULE, "show_results", "show-results"), + ("98", CLI_MODULE, "show_readme", "show-readme"), + ("99", CLI_MODULE, "quit_hc", "quit"), ]