infosecn1nja
/
metasploit-framework
mirror of https://github.com/infosecn1nja/metasploit-framework.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Allow report_auth_info() to accept a Host object instead of an address like all the other methods. 

git-svn-id: file:///home/svn/framework3/trunk@12415 4d416f70-5f16-0410-b530-b9f4589650da
unstable
HD Moore 2011-04-24 00:48:05 +00:00
parent 9d715a1492
commit 5918e6c0ac
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/msf/core/db.rb
View File

@ -892,7 +892,7 @@ class DBManager
# report_vuln() now. # report_vuln() now.
# #
# opts must contain # opts must contain
# :host -- an IP address # :host -- an IP address or Host object reference
# :port -- a port number # :port -- a port number
# #
# opts can contain # opts can contain
@ -917,8 +917,12 @@ class DBManager
def report_auth_info(opts={}) def report_auth_info(opts={})
return if not active return if not active
raise ArgumentError.new("Missing required option :host") if opts[:host].nil? raise ArgumentError.new("Missing required option :host") if opts[:host].nil?
raise ArgumentError.new("Invalid address for :host") unless validate_ips(opts[:host])
raise ArgumentError.new("Missing required option :port") if opts[:port].nil? raise ArgumentError.new("Missing required option :port") if opts[:port].nil?
if opts[:host].kind_of?(Host) or validate_ips(opts[:host])
raise ArgumentError.new("Invalid address or object for :host")
end
host = opts.delete(:host) host = opts.delete(:host)
ptype = opts.delete(:type) || "password" ptype = opts.delete(:type) || "password"
token = [opts.delete(:user), opts.delete(:pass)] token = [opts.delete(:user), opts.delete(:pass)]