Land #4543, Update john.conf with korelogic rules

lib/msf/core/auxiliary/jtr.rb

@@ -29,6 +29,7 @@ module Auxiliary::JohnTheRipper
         OptPath.new('CUSTOM_WORDLIST',      [false, 'The path to an optional custom wordlist']),
         OptInt.new('ITERATION_TIMOUT',      [false, 'The max-run-time for each iteration of cracking']),
         OptPath.new('JOHN_PATH',            [false, 'The absolute path to the John the Ripper executable']),
+        OptBool.new('KoreLogic',            [false, 'Apply the KoreLogic rules to Wordlist Mode(slower)', false]),
         OptBool.new('MUTATE',               [false, 'Apply common mutations to the Wordlist (SLOW)', false]),
         OptPath.new('POT',                  [false, 'The path to a John POT file to use instead of the default']),
         OptBool.new('USE_CREDS',            [false, 'Use existing credential data saved in the database', true]),

modules/auxiliary/analyze/jtr_aix.rb

@@ -43,6 +43,11 @@ class Metasploit3 < Msf::Auxiliary
       cracker_instance = cracker.dup
       cracker_instance.format = format
       print_status "Cracking #{format} hashes in normal wordlist mode..."
+      # Turn on KoreLogic rules if the user asked for it
+      if datastore['KoreLogic']
+        cracker_instance.rules = 'KoreLogicRules'
+        print_status "Applying KoreLogic ruleset..."
+      end
       cracker_instance.crack do |line|
         print_status line.chomp
       end

modules/auxiliary/analyze/jtr_crack_fast.rb

@@ -42,6 +42,11 @@ class Metasploit3 < Msf::Auxiliary
       cracker_instance = cracker.dup
       cracker_instance.format = format
       print_status "Cracking #{format} hashes in normal wordlist mode..."
+      # Turn on KoreLogic rules if the user asked for it
+      if datastore['KoreLogic']
+        cracker_instance.rules = 'KoreLogicRules'
+        print_status "Applying KoreLogic ruleset..."
+      end
       cracker_instance.crack do |line|
         print_status line.chomp
       end

modules/auxiliary/analyze/jtr_linux.rb

@@ -57,6 +57,11 @@ class Metasploit3 < Msf::Auxiliary
       cracker_instance = cracker.dup
       cracker_instance.format = format
       print_status "Cracking #{format} hashes in normal wordlist mode..."
+      # Turn on KoreLogic rules if the user asked for it
+      if datastore['KoreLogic']
+        cracker_instance.rules = 'KoreLogicRules'
+        print_status "Applying KoreLogic ruleset..."
+      end
       cracker_instance.crack do |line|
         print_status line.chomp
       end

modules/auxiliary/analyze/jtr_mssql_fast.rb

@@ -44,6 +44,11 @@ class Metasploit3 < Msf::Auxiliary
       cracker_instance = cracker.dup
       cracker_instance.format = format
       print_status "Cracking #{format} hashes in normal wordlist mode..."
+      # Turn on KoreLogic rules if the user asked for it
+      if datastore['KoreLogic']
+        cracker_instance.rules = 'KoreLogicRules'
+        print_status "Applying KoreLogic ruleset..."
+      end
       cracker_instance.crack do |line|
         print_status line.chomp
       end

modules/auxiliary/analyze/jtr_mysql_fast.rb

@@ -42,6 +42,11 @@ class Metasploit3 < Msf::Auxiliary
       cracker_instance = cracker.dup
       cracker_instance.format = format
       print_status "Cracking #{format} hashes in normal wordlist mode..."
+      # Turn on KoreLogic rules if the user asked for it
+      if datastore['KoreLogic']
+        cracker_instance.rules = 'KoreLogicRules'
+        print_status "Applying KoreLogic ruleset..."
+      end
       cracker_instance.crack do |line|
         print_status line.chomp
       end

modules/auxiliary/analyze/jtr_postgres_fast.rb

@@ -48,6 +48,11 @@ class Metasploit3 < Msf::Auxiliary
       cracker_instance = cracker.dup
       cracker_instance.format = format
       print_status "Cracking #{format} hashes in normal wordlist mode..."
+      # Turn on KoreLogic rules if the user asked for it
+      if datastore['KoreLogic']
+        cracker_instance.rules = 'KoreLogicRules'
+        print_status "Applying KoreLogic ruleset..."
+      end
       cracker_instance.crack do |line|
         print_status line.chomp
       end