Change the rest of print_*

unstable
sinn3r 2012-04-25 14:24:17 -05:00
parent 9189dea4e4
commit f77efbf89e
6 changed files with 15 additions and 15 deletions

View File

@ -65,7 +65,7 @@ class Metasploit3 < Msf::Auxiliary
content[cidx + 8, 8] = [ coff, clen ].pack("N*")
# Send the font on its merry way
print_status("Sending embedded font to #{cli.peerhost}:#{cli.peerport}...")
print_status("Sending embedded font...")
send_response_html(cli, content, { 'Content-Type' => 'application/octet-stream' })
else
var_title = Rex::Text.rand_text_alpha(6 + rand(32))
@ -80,7 +80,7 @@ body {
}
</style></head><body> #{var_body} </body></html>|
print_status("Sending HTML page with embedded font to #{cli.peerhost}:#{cli.peerport}...")
print_status("Sending HTML page with embedded font...")
send_response_html(cli, content, { 'Content-Type' => 'text/html' })
end
end

View File

@ -49,11 +49,11 @@ class Metasploit3 < Msf::Auxiliary
end
def on_request_uri(cli, request)
print_status("#{cli.peerhost}:#{cli.peerport} Request '#{request.method} #{request.uri}'")
print_status("Request '#{request.method} #{request.uri}'")
selected_headers = [ 'user-agent', 'origin', 'referer' ]
request.headers.each_key { |k|
next if not selected_headers.include? k.downcase
print_status("#{cli.peerhost}:#{cli.peerport} + #{k}: #{request.headers[k]}")
print_status("#{k}: #{request.headers[k]}")
}
return process_post(cli, request) if request.method == "POST"
@ -108,7 +108,7 @@ uploadFiles(results);
</html>
EOS
print_status("#{cli.peerhost}:#{cli.peerport} Sending payload HTML ...")
print_status("Sending payload HTML ...")
send_response_html(cli, html,
{
'Cache-Control' => 'public',
@ -133,7 +133,7 @@ setTimeout("document.location = '#{payload_fn}.html';", 500);
</html>
EOS
print_status("#{cli.peerhost}:#{cli.peerport} Sending initial HTML ...")
print_status("Sending initial HTML ...")
send_response_html(cli, html)
end
@ -167,7 +167,7 @@ EOS
e = results[k]
fn = e[:filename]
data = e[:data]
print_good("#{cli.peerhost}:#{cli.peerport} ! #{fn.inspect} contains #{data.inspect}")
print_good("#{fn.inspect} contains #{data.inspect}")
fn.gsub!(/[\/\\]/, '.')
fn.gsub!(/^\./, '')

View File

@ -62,7 +62,7 @@ class Metasploit3 < Msf::Auxiliary
unless cid
cid = generate_client_id(cli,request)
print_status("#{cli.peerhost} Assigning client identifier '#{cid}'")
print_status("Assigning client identifier '#{cid}'")
resp = create_response(302, 'Moved')
resp['Content-Type'] = 'text/html'
@ -177,15 +177,15 @@ class Metasploit3 < Msf::Auxiliary
:path_clean => store_loot("browser.keystrokes.clean", "text/plain", cli.peerhost, header, "keystrokes_clean_#{cid}.txt", "Browser Keystroke Logs (Clean)"),
:path_raw => store_loot("browser.keystrokes.raw", "text/plain", cli.peerhost, header, "keystrokes_clean_#{cid}.txt", "Browser Keystroke Logs (Raw)")
}
print_good("#{cli.peerhost} [#{cid}] Logging clean keystrokes to: #{@client_cache[cid][:path_clean]}")
print_good("#{cli.peerhost} [#{cid}] Logging raw keystrokes to: #{@client_cache[cid][:path_raw]}")
print_good("[#{cid}] Logging clean keystrokes to: #{@client_cache[cid][:path_clean]}")
print_good("[#{cid}] Logging raw keystrokes to: #{@client_cache[cid][:path_raw]}")
end
::File.open( @client_cache[cid][:path_clean], "a") { |fd| fd.puts nice }
::File.open( @client_cache[cid][:path_raw], "a") { |fd| fd.write(real) }
if nice.length > 0
print_good("#{cli.peerhost} [#{cid}] Keys: #{nice}")
print_good("[#{cid}] Keys: #{nice}")
end
nice

View File

@ -66,7 +66,7 @@ class Metasploit3 < Msf::Auxiliary
end
def on_request_uri(cli, request)
print_status("Request '#{request.uri}' from #{cli.peerhost}:#{cli.peerport}")
print_status("Request '#{request.uri}'...")
# If the host has not started auth, send 401 authenticate with only the NTLM option
if(!request.headers['Authorization'])

View File

@ -85,8 +85,8 @@ class Metasploit3 < Msf::Auxiliary
</doc>
EOS
print_status("#{cli.peerhost}:#{cli.peerport} Sending XSLT payload ...")
print_status("#{cli.peerhost}:#{cli.peerport} Destination file : #{path}")
print_status("Sending XSLT payload ...")
print_status("Destination file : #{path}")
send_response_html(cli, html, { 'Content-Type' => 'application/xml' })
end

View File

@ -90,7 +90,7 @@ EOS
def on_request_uri(cli,request)
# Transmit the response to the client
res = create_page()
print_status("Leaking PII to #{cli.peerhost}:#{cli.peerport}")
print_status("Leaking PII...")
send_response(cli, res, { 'Content-Type' => 'text/html' })
end