Print target endpoint

If a module consistently print the target endpoint in all its print
functions, then we'll follow that.
bug/bundler_fix
sinn3r 2013-08-26 17:51:43 -05:00
parent 9f8051161f
commit 85ed9167f2
9 changed files with 9 additions and 14 deletions

View File

@ -85,7 +85,7 @@ class Metasploit3 < Msf::Auxiliary
print_status("#{target_url} - Apache Axis - Dumping administrative credentials")
if res.nil?
print_error("Connection timed out")
print_error("#{target_url} - Connection timed out")
return
end

View File

@ -64,7 +64,7 @@ class Metasploit3 < Msf::Auxiliary
}, 25)
if res.nil?
print_error("Connection timed out")
print_error("#{target_url} - Connection timed out")
return
end

View File

@ -93,7 +93,7 @@ class Metasploit3 < Msf::Auxiliary
end
if res.nil?
print_error("Connection timed out")
print_error("#{@peer} - Connection timed out")
return :abort
end

View File

@ -63,7 +63,7 @@ class Metasploit3 < Msf::Auxiliary
}, 25)
if res.nil?
print_error("Connection timed out")
print_error("#{target_url} - Connection timed out")
return
end

View File

@ -43,11 +43,6 @@ class Metasploit3 < Msf::Auxiliary
], self.class)
end
def target_url
uri = normalize_uri(datastore['URI'])
"http://#{vhost}:#{rport}#{datastore['URI']}"
end
def run_host(ip)
trav_strings = [
'../',
@ -72,7 +67,7 @@ class Metasploit3 < Msf::Auxiliary
}, 25)
if res.nil?
print_error("Connection timed out")
print_error("#{rhost}:#{rport} Connection timed out")
return
end

View File

@ -73,7 +73,7 @@ class Metasploit3 < Msf::Auxiliary
}, 25)
if res.nil?
print_error("Connection timed out")
print_error("#{target_url} - nginx - Connection timed out")
return
else
version = res.headers['Server']

View File

@ -87,7 +87,7 @@ class Metasploit3 < Msf::Auxiliary
})
if res.nil?
print_error("Connection timed out")
print_error("#{rhost}:#{rport} - Connection timed out")
return :abort
end

View File

@ -112,7 +112,7 @@ class Metasploit3 < Msf::Auxiliary
}, 20)
if res.nil?
print_error("Connection timed out")
print_error("#{target_url} - Connection timed out")
return :abort
end

View File

@ -91,7 +91,7 @@ class Metasploit3 < Msf::Auxiliary
}, 20)
if res.nil?
print_error("Connection timed out")
print_error("http://#{vhost}:#{rport} - Connection timed out")
return
end