requested change resolved, PR #20418

Author: H4k1l

modules/auxiliary/analyze/crack_windows.rb

@@ -30,9 +30,8 @@ def initialize
       'Actions' => [
         ['john', { 'Description' => 'Use John the Ripper' }],
         ['hashcat', { 'Description' => 'Use Hashcat' }],
-        ['auto', { 'Description' => 'Use either John the Ripper or Hashcat, if both are present, use Hashcat' }] 
       ],
-      'DefaultAction' => 'auto',
+      'DefaultAction' => 'john',
       'Notes' => {
         'Stability' => [CRASH_SAFE],
         'SideEffects' => [],
@@ -63,11 +62,9 @@ def half_lm_regex
   def show_command(cracker_instance)
     return unless datastore['ShowCommand']
 
-    newaction = getaction()
-
-    if newaction == 'john'
+    if action.name == 'john'
       cmd = cracker_instance.john_crack_command
-    elsif newaction == 'hashcat'
+    elsif action.name == 'hashcat'
       cmd = cracker_instance.hashcat_crack_command
     end
     print_status("   Cracking Command: #{cmd.join(' ')}")
@@ -99,16 +96,13 @@ def process_cracker_results(results, cred)
   end
 
   def check_results(passwords, results, hash_type, method)
-
-    newaction = getaction()
-
     passwords.each do |password_line|
       password_line.chomp!
       next if password_line.blank?
 
       fields = password_line.split(':')
       cred = { 'hash_type' => hash_type, 'method' => method }
-      if newaction == 'john'
+      if action.name == 'john'
         # If we don't have an expected minimum number of fields, this is probably not a hash line
         next unless fields.count > 2
 
@@ -142,7 +136,7 @@ def check_results(passwords, results, hash_type, method)
           cred['password'] = john_lm_upper_to_ntlm(password, nt_hash)
         end
         next if cred['password'].nil?
-      elsif newaction == 'hashcat'
+      elsif action.name == 'hashcat'
         next unless fields.count >= 2
 
         cred['core_id'] = fields.shift
@@ -169,9 +163,6 @@ def check_results(passwords, results, hash_type, method)
   end
 
   def run
-
-    newaction = getaction()
-
     tbl = cracker_results_table
 
     # array of hashes in jtr_format in the db, converted to an OR combined regex
@@ -187,7 +178,7 @@ def run
 
     # build our job list
     hash_types_to_crack.each do |hash_type|
-      job = hash_job(hash_type, newaction)
+      job = hash_job(hash_type, action.name)
       if job.nil?
         print_status("No #{hash_type} found to crack")
       else
@@ -205,7 +196,7 @@ def run
     # Inner array format: db_id, hash_type, username, password, method_of_crack
     results = []
 
-    cracker = new_password_cracker(newaction)
+    cracker = new_password_cracker(action.name)
 
     # generate our wordlist and close the file handle.
     wordlist = wordlist_file
@@ -229,7 +220,7 @@ def run
       # dupe our original cracker so we can safely change options between each run
       cracker_instance = cracker.dup
       cracker_instance.format = format
-      if newaction == 'john'
+      if action.name == 'john'
         cracker_instance.fork = datastore['FORK']
       end
 
@@ -240,7 +231,7 @@ def run
       job['cred_ids_left_to_crack'] = job['cred_ids_left_to_crack'] - results.map { |i| i[0].to_i } # remove cracked hashes from the hash list
       next if job['cred_ids_left_to_crack'].empty?
 
-      if newaction == 'john'
+      if action.name == 'john'
         print_status "Cracking #{format} hashes in single mode..."
         cracker_instance.mode_single(wordlist.path)
         show_command cracker_instance
@@ -283,7 +274,7 @@ def run
         print_status "Cracking #{format} hashes in wordlist mode..."
         cracker_instance.mode_wordlist(wordlist.path)
         # Turn on KoreLogic rules if the user asked for it
-        if newaction == 'john' && datastore['KORELOGIC']
+        if action.name == 'john' && datastore['KORELOGIC']
           cracker_instance.rules = 'KoreLogicRules'
           print_status 'Applying KoreLogic ruleset...'
         end
@@ -308,24 +299,4 @@ def run
       end
     end
   end
- 
-  def getaction
-    newaction = action.name
-    if action.name == 'auto'
-      path = Rex::FileUtils.find_full_path('hashcat') ||
-      Rex::FileUtils.find_full_path('hashcat.exe')
-      if path
-        newaction = 'hashcat'
-      else
-        path = Rex::FileUtils.find_full_path('john') ||
-        Rex::FileUtils.find_full_path('john.exe')
-        if path
-          newaction = 'john'
-        else
-          raise PasswordCrackerNotFoundError, 'No suitable john/hashcat binary was found on the system'
-        end
-      end
-    end
-    return newaction
-  end
 end