Land #6528, tilde expansion and more for OptPath

lib/msf/core/opt_path.rb

@@ -12,6 +12,10 @@ class OptPath < OptBase
     return 'path'
   end
 
+  def normalize(value)
+    value.nil? ? value : File.expand_path(value)
+  end
+
   def validate_on_assignment?
     false
   end
@@ -23,7 +27,7 @@ class OptPath < OptBase
       if value =~ /^memory:\s*([0-9]+)/i
         return false unless check_memory_location($1)
       else
-        unless File.exist?(value)
+        unless File.exist?(File.expand_path(value))
           return false
         end
       end

modules/auxiliary/scanner/ssh/ssh_identify_pubkeys.rb

@@ -46,7 +46,7 @@ class MetasploitModule < Msf::Auxiliary
       [
         Opt::RPORT(22),
         OptPath.new('KEY_FILE', [false, 'Filename of one or several cleartext public keys.'])
-      ], self.class
+      ]
     )
 
     register_advanced_options(
@@ -59,7 +59,9 @@ class MetasploitModule < Msf::Auxiliary
       ]
     )
 
-    deregister_options('RHOST','PASSWORD','PASS_FILE','BLANK_PASSWORDS','USER_AS_PASS')
+    deregister_options(
+      'RHOST','PASSWORD','PASS_FILE','BLANK_PASSWORDS','USER_AS_PASS', 'USERPASS_FILE', 'DB_ALL_PASS', 'DB_ALL_CREDS'
+    )
 
     @good_credentials = {}
     @good_key = ''
@@ -71,6 +73,10 @@ class MetasploitModule < Msf::Auxiliary
     datastore['KEY_DIR']
   end
 
+  def key_file
+    datastore['KEY_FILE']
+  end
+
   def rport
     datastore['RPORT']
   end
@@ -95,8 +101,8 @@ class MetasploitModule < Msf::Auxiliary
     this_key = []
     in_key = false
     keyfile.split("\n").each do |line|
-      if line =~ /ssh-(dss|rsa)\s+/
-        keys << line
+      if /(?<key>ssh-(?:dss|rsa)\s+.*)/ =~ line
+        keys << key
         next
       end
       in_key = true if(line =~ /^-----BEGIN [RD]SA (PRIVATE|PUBLIC) KEY-----/)
@@ -162,8 +168,8 @@ class MetasploitModule < Msf::Auxiliary
 
   def do_login(ip, port, user)
 
-    if datastore['KEY_FILE'] and File.readable?(datastore['KEY_FILE'])
-      keys = read_keyfile(datastore['KEY_FILE'])
+    if key_file && File.readable?(key_file)
+      keys = read_keyfile(key_file)
       cleartext_keys = pull_cleartext_keys(keys)
       msg = "#{ip}:#{rport} SSH - Trying #{cleartext_keys.size} cleartext key#{(cleartext_keys.size > 1) ? "s" : ""} per user."
     elsif datastore['SSH_KEYFILE_B64'] && !datastore['SSH_KEYFILE_B64'].empty?

spec/lib/msf/core/opt_path_spec.rb

@@ -6,6 +6,7 @@ require 'msf/core/option_container'
 RSpec.describe Msf::OptPath do
   valid_values = [
     { :value => __FILE__, :normalized => __FILE__   },
+    { :value => '~', :normalized => ::File.expand_path('~')  },
   ]
   invalid_values = [
     { :value => "yer mom", },