Adds auto option support, updates crack_database.rb accordingly

Author: msutovsky-r7

lib/metasploit/framework/password_crackers/cracker.rb

@@ -312,7 +312,7 @@ def binary_path
             end
             raise PasswordCrackerNotFoundError, 'No suitable john/hashcat binary was found on the system' unless path && ::File.file?(path)
 
-            path
+            return path
           end
         end
 
@@ -342,6 +342,7 @@ def cracker_version
             cmd = binary_path
             cmd << (' -V')
           end
+          puts cmd
           ::IO.popen(cmd, 'rb') do |fd|
             fd.each_line do |line|
               if cracker == 'john'
@@ -575,11 +576,13 @@ def show_command
 
         def get_hashcat
           # Look in the Environment PATH for the hashcat binary
+          self.cracker = 'hashcat'
           Rex::FileUtils.find_full_path('hashcat') ||
             Rex::FileUtils.find_full_path('hashcat.exe')
         end
 
         def get_john
+          self.cracker = 'john'
           # Look in the Environment PATH for the john binary
           Rex::FileUtils.find_full_path('john') ||
             Rex::FileUtils.find_full_path('john.exe')

lib/msf/core/auxiliary/password_cracker.rb

@@ -88,6 +88,9 @@ def new_password_cracker(cracking_application)
       rescue Metasploit::Framework::PasswordCracker::PasswordCrackerNotFoundError => e
         fail_with(Msf::Module::Failure::BadConfig, e.message)
       end
+
+      # redefine cracker is action is auto
+
       # throw this to a local variable since it causes a shell out to pull the version
       cracker_version = cracker.cracker_version
       if cracker.cracker == 'john' && (cracker_version.nil? || !cracker_version.include?('jumbo'))

modules/auxiliary/analyze/crack_databases.rb

@@ -34,8 +34,9 @@ def initialize
       'Actions' => [
         ['john', { 'Description' => 'Use John the Ripper' }],
         ['hashcat', { 'Description' => 'Use Hashcat' }],
+        ['auto', { 'Description' => 'Auto-selection of cracker' }]
       ],
-      'DefaultAction' => 'john',
+      'DefaultAction' => 'auto',
       'Notes' => {
         'Stability' => [CRASH_SAFE],
         'SideEffects' => [],
@@ -58,29 +59,29 @@ def initialize
   def show_command(cracker_instance)
     return unless datastore['ShowCommand']
 
-    if action.name == 'john'
+    if cracker_instance.cracker == 'john'
       cmd = cracker_instance.john_crack_command
-    elsif action.name == 'hashcat'
+    elsif cracker_instance.cracker == 'hashcat'
       cmd = cracker_instance.hashcat_crack_command
     end
     print_status("   Cracking Command: #{cmd.join(' ')}")
   end
 
-  def check_results(passwords, results, hash_type, method)
+  def check_results(passwords, results, hash_type, method, cracker_type)
     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 action.name == 'john'
+      if cracker_type == 'john'
         next unless fields.count >= 3
 
         cred['username'] = fields.shift
         cred['core_id'] = fields.pop
         cred['password'] = fields.join(':') # Anything left must be the password. This accounts for passwords with semi-colons in it
-      elsif action.name == 'hashcat'
+      elsif cracker_type == 'hashcat'
         next unless fields.count >= 2
 
         cred['core_id'] = fields.shift
@@ -109,7 +110,8 @@ def check_results(passwords, results, hash_type, method)
   end
 
   def run
-    tbl = tbl = cracker_results_table
+    tbl = cracker_results_table
+    cracker = new_password_cracker(action.name)
 
     # array of hashes in jtr_format in the db, converted to an OR combined regex
     hash_types_to_crack = []
@@ -128,7 +130,7 @@ def run
 
       # hashcat requires a format we dont have all the data for
       # in the current dumper, so this is disabled in module and lib
-      if action.name == 'john'
+      if cracker.cracker == 'john'
         hash_types_to_crack << 'oracle'
         hash_types_to_crack << 'dynamic_1506'
       end
@@ -143,7 +145,7 @@ def run
 
     # build our job list
     hash_types_to_crack.each do |hash_type|
-      job = hash_job(hash_type, action.name)
+      job = hash_job(hash_type, cracker.cracker)
       if job.nil?
         print_status("No #{hash_type} found to crack")
       else
@@ -161,8 +163,6 @@ def run
     # Inner array format: db_id, hash_type, username, password, method_of_crack
     results = []
 
-    cracker = new_password_cracker(action.name)
-
     # generate our wordlist and close the file handle.
     wordlist = wordlist_file
     unless wordlist
@@ -187,25 +187,25 @@ def run
       cracker_instance = cracker.dup
       cracker_instance.format = format
 
-      if action.name == 'john'
+      if cracker.cracker == 'john'
         cracker_instance.fork = datastore['FORK']
       end
 
       # first check if anything has already been cracked so we don't report it incorrectly
       print_status "Checking #{format} hashes already cracked..."
-      results = check_results(cracker_instance.each_cracked_password, results, format, 'Already Cracked/POT')
+      results = check_results(cracker_instance.each_cracked_password, results, format, 'Already Cracked/POT', cracker.cracker)
       vprint_good(append_results(tbl, results)) unless results.empty?
       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 action.name == 'john'
+      if cracker.cracker == 'john'
         print_status "Cracking #{format} hashes in single mode..."
         cracker_instance.mode_single(wordlist.path)
         show_command cracker_instance
         cracker_instance.crack do |line|
           vprint_status line.chomp
         end
-        results = check_results(cracker_instance.each_cracked_password, results, format, 'Single')
+        results = check_results(cracker_instance.each_cracked_password, results, format, 'Single', cracker.cracker)
         vprint_good(append_results(tbl, results)) unless results.empty?
         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?
@@ -216,7 +216,7 @@ def run
         cracker_instance.crack do |line|
           vprint_status line.chomp
         end
-        results = check_results(cracker_instance.each_cracked_password, results, format, 'Normal')
+        results = check_results(cracker_instance.each_cracked_password, results, format, 'Normal', cracker.cracker)
         vprint_good(append_results(tbl, results)) unless results.empty?
         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?
@@ -229,7 +229,7 @@ def run
         cracker_instance.crack do |line|
           vprint_status line.chomp
         end
-        results = check_results(cracker_instance.each_cracked_password, results, format, 'Incremental')
+        results = check_results(cracker_instance.each_cracked_password, results, format, 'Incremental', cracker.cracker)
         vprint_good(append_results(tbl, results)) unless results.empty?
         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?
@@ -239,7 +239,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 action.name == 'john' && datastore['KORELOGIC']
+        if cracker.cracker == 'john' && datastore['KORELOGIC']
           cracker_instance.rules = 'KoreLogicRules'
           print_status 'Applying KoreLogic ruleset...'
         end
@@ -248,7 +248,7 @@ def run
           vprint_status line.chomp
         end
 
-        results = check_results(cracker_instance.each_cracked_password, results, format, 'Wordlist')
+        results = check_results(cracker_instance.each_cracked_password, results, format, 'Wordlist', cracker.cracker)
         vprint_good(append_results(tbl, results)) unless results.empty?
         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?