Land #5702, vprint_* optional parameter

bug/bundler_fix
William Vu 2015-07-13 18:47:22 +00:00
commit 0a5119a4ac
No known key found for this signature in database
GPG Key ID: 68BD00CE25866743
5 changed files with 10 additions and 10 deletions

View File

@ -1,6 +1,6 @@
module Msf::Module::UI::Line::Verbose
# Verbose version of #print_line
def vprint_line(msg)
def vprint_line(msg='')
print_line(msg) if datastore['VERBOSE'] || framework.datastore['VERBOSE']
end
end
end

View File

@ -1,21 +1,21 @@
module Msf::Module::UI::Message::Verbose
# Verbose version of #print_error
def vprint_error(msg)
def vprint_error(msg='')
print_error(msg) if datastore['VERBOSE'] || framework.datastore['VERBOSE']
end
# Verbose version of #print_good
def vprint_good(msg)
def vprint_good(msg='')
print_good(msg) if datastore['VERBOSE'] || framework.datastore['VERBOSE']
end
# Verbose version of #print_status
def vprint_status(msg)
def vprint_status(msg='')
print_status(msg) if datastore['VERBOSE'] || framework.datastore['VERBOSE']
end
# Verbose version of #print_warning
def vprint_warning(msg)
def vprint_warning(msg='')
print_warning(msg) if datastore['VERBOSE'] || framework.datastore['VERBOSE']
end
end
end

View File

@ -221,6 +221,6 @@ class Metasploit3 < Msf::Auxiliary
# Report a jenkins information note for future analysis, tied to this service
report_note(:host => rhost, :port => rport, :proto => 'tcp', :ntype => 'jenkins.info', :data => jinfo)
vprint_line('')
vprint_line
end
end

View File

@ -118,7 +118,7 @@ class Metasploit3 < Msf::Auxiliary
return
end
vprint_line("")
vprint_line
vprint_line(res.body)
f = ::File.basename(fname)

View File

@ -208,7 +208,7 @@ class Metasploit3 < Msf::Post
dbvis = "\"#{dbvis}\""
cmd = "#{dbvis} #{args}"
resp = cmd_exec(cmd)
vprint_line("")
vprint_line
vprint_status("#{resp}")
if resp =~ /denied|failed/i
error = true