Permalink
Browse files

Remove spurious cli.peerhost in output

  • Loading branch information...
1 parent 1f577b2 commit 9cdd8912c5e28c5adab3bc5ba97bf6d6aaa58319 @egypt egypt committed Apr 20, 2012
Showing with 293 additions and 295 deletions.
  1. +1 −1 modules/exploits/multi/browser/firefox_escape_retval.rb
  2. +1 −1 modules/exploits/multi/browser/firefox_queryinterface.rb
  3. +3 −5 modules/exploits/multi/browser/firefox_xpi_bootstrapped_addon.rb
  4. +1 −1 modules/exploits/multi/browser/itms_overflow.rb
  5. +6 −7 modules/exploits/multi/browser/java_atomicreferencearray.rb
  6. +4 −4 modules/exploits/multi/browser/java_calendar_deserialize.rb
  7. +5 −5 modules/exploits/multi/browser/java_getsoundbank_bof.rb
  8. +2 −2 modules/exploits/multi/browser/java_rhino.rb
  9. +2 −2 modules/exploits/multi/browser/java_rmi_connection_impl.rb
  10. +5 −5 modules/exploits/multi/browser/java_setdifficm_bof.rb
  11. +2 −4 modules/exploits/multi/browser/java_signed_applet.rb
  12. +2 −2 modules/exploits/multi/browser/java_trusted_chain.rb
  13. +1 −1 modules/exploits/multi/browser/mozilla_compareto.rb
  14. +1 −1 modules/exploits/multi/browser/mozilla_navigatorjava.rb
  15. +1 −1 modules/exploits/multi/browser/opera_configoverwrite.rb
  16. +2 −2 modules/exploits/multi/browser/opera_historysearch.rb
  17. +5 −5 modules/exploits/multi/browser/qtjava_pointer.rb
  18. +1 −1 modules/exploits/osx/browser/mozilla_mchannel.rb
  19. +1 −1 modules/exploits/osx/browser/safari_libtiff.rb
  20. +2 −2 modules/exploits/osx/browser/software_update.rb
  21. +2 −2 modules/exploits/windows/browser/adobe_cooltype_sing.rb
  22. +4 −4 modules/exploits/windows/browser/adobe_flash_sps.rb
  23. +1 −1 modules/exploits/windows/browser/adobe_flashplayer_avm.rb
  24. +1 −1 modules/exploits/windows/browser/adobe_flashplayer_flash10o.rb
  25. +1 −1 modules/exploits/windows/browser/adobe_flashplayer_newfunction.rb
  26. +1 −1 modules/exploits/windows/browser/adobe_flatedecode_predictor02.rb
  27. +1 −1 modules/exploits/windows/browser/adobe_geticon.rb
  28. +1 −1 modules/exploits/windows/browser/adobe_jbig2decode.rb
  29. +1 −1 modules/exploits/windows/browser/adobe_media_newplayer.rb
  30. +2 −2 modules/exploits/windows/browser/adobe_shockwave_rcsl_corruption.rb
  31. +1 −1 modules/exploits/windows/browser/adobe_utilprintf.rb
  32. +1 −1 modules/exploits/windows/browser/aim_goaway.rb
  33. +1 −1 modules/exploits/windows/browser/amaya_bdo.rb
  34. +1 −1 modules/exploits/windows/browser/aol_ampx_convertfile.rb
  35. +1 −1 modules/exploits/windows/browser/aol_icq_downloadagent.rb
  36. +1 −1 modules/exploits/windows/browser/apple_itunes_playlist.rb
  37. +1 −1 modules/exploits/windows/browser/ask_shortformat.rb
  38. +2 −2 modules/exploits/windows/browser/asus_net4switch_ipswcom.rb
  39. +1 −1 modules/exploits/windows/browser/athocgov_completeinstallation.rb
  40. +1 −1 modules/exploits/windows/browser/autodesk_idrop.rb
  41. +1 −1 modules/exploits/windows/browser/aventail_epi_activex.rb
  42. +1 −1 modules/exploits/windows/browser/awingsoft_web3d_bof.rb
  43. +2 −2 modules/exploits/windows/browser/awingsoft_winds3d_sceneurl.rb
  44. +1 −1 modules/exploits/windows/browser/baofeng_storm_onbeforevideodownload.rb
  45. +1 −1 modules/exploits/windows/browser/barcode_ax49.rb
  46. +3 −3 modules/exploits/windows/browser/c6_messenger_downloaderactivex.rb
  47. +1 −1 modules/exploits/windows/browser/ca_brightstor_addcolumn.rb
  48. +1 −1 modules/exploits/windows/browser/chilkat_crypt_writefile.rb
  49. +1 −1 modules/exploits/windows/browser/cisco_anyconnect_exec.rb
  50. +2 −2 modules/exploits/windows/browser/citrix_gateway_actx.rb
  51. +1 −1 modules/exploits/windows/browser/communicrypt_mail_activex.rb
  52. +1 −1 modules/exploits/windows/browser/creative_software_cachefolder.rb
  53. +3 −3 modules/exploits/windows/browser/dell_webcam_crazytalk.rb
  54. +2 −2 modules/exploits/windows/browser/dxstudio_player_exec.rb
  55. +1 −1 modules/exploits/windows/browser/ea_checkrequirements.rb
  56. +2 −2 modules/exploits/windows/browser/enjoysapgui_comp_download.rb
  57. +1 −1 modules/exploits/windows/browser/enjoysapgui_preparetoposthtml.rb
  58. +1 −1 modules/exploits/windows/browser/facebook_extractiptc.rb
  59. +1 −1 modules/exploits/windows/browser/gom_openurl.rb
  60. +2 −2 modules/exploits/windows/browser/greendam_url.rb
  61. +2 −2 modules/exploits/windows/browser/hp_easy_printer_care_xmlcachemgr.rb
  62. +2 −2 modules/exploits/windows/browser/hp_easy_printer_care_xmlsimpleaccessor.rb
  63. +1 −1 modules/exploits/windows/browser/hp_loadrunner_addfile.rb
  64. +1 −1 modules/exploits/windows/browser/hp_loadrunner_addfolder.rb
  65. +1 −1 modules/exploits/windows/browser/hpmqc_progcolor.rb
  66. +1 −1 modules/exploits/windows/browser/hyleos_chemviewx_activex.rb
  67. +2 −1 modules/exploits/windows/browser/ibmegath_getxmlvalue.rb
  68. +1 −1 modules/exploits/windows/browser/ibmlotusdomino_dwa_uploadmodule.rb
  69. +1 −1 modules/exploits/windows/browser/ie_iscomponentinstalled.rb
  70. +2 −2 modules/exploits/windows/browser/ie_unsafe_scripting.rb
  71. +1 −1 modules/exploits/windows/browser/imgeviewer_tifmergemultifiles.rb
  72. +1 −2 modules/exploits/windows/browser/intrust_annotatex_add.rb
  73. +1 −1 modules/exploits/windows/browser/java_basicservice_impl.rb
  74. +3 −2 modules/exploits/windows/browser/java_codebase_trust.rb
  75. +1 −1 modules/exploits/windows/browser/java_docbase_bof.rb
  76. +3 −3 modules/exploits/windows/browser/java_mixer_sequencer.rb
  77. +9 −8 modules/exploits/windows/browser/java_ws_arginject_altjvm.rb
  78. +8 −7 modules/exploits/windows/browser/java_ws_vmargs.rb
  79. +1 −1 modules/exploits/windows/browser/juniper_sslvpn_ive_setupdll.rb
  80. +1 −1 modules/exploits/windows/browser/kazaa_altnet_heap.rb
  81. +1 −1 modules/exploits/windows/browser/logitechvideocall_start.rb
  82. +1 −1 modules/exploits/windows/browser/lpviewer_url.rb
  83. +1 −1 modules/exploits/windows/browser/macrovision_downloadandexecute.rb
  84. +2 −2 modules/exploits/windows/browser/macrovision_unsafe.rb
  85. +1 −1 modules/exploits/windows/browser/mcafee_mcsubmgr_vsprintf.rb
  86. +1 −1 modules/exploits/windows/browser/mcafeevisualtrace_tracetarget.rb
  87. +1 −1 modules/exploits/windows/browser/mirc_irc_url.rb
  88. +1 −1 modules/exploits/windows/browser/mozilla_reduceright.rb
  89. +2 −2 modules/exploits/windows/browser/ms05_054_onload.rb
  90. +1 −1 modules/exploits/windows/browser/ms06_001_wmf_setabortproc.rb
  91. +1 −1 modules/exploits/windows/browser/ms06_013_createtextrange.rb
  92. +1 −1 modules/exploits/windows/browser/ms06_055_vml_method.rb
  93. +1 −1 modules/exploits/windows/browser/ms06_057_webview_setslice.rb
  94. +1 −1 modules/exploits/windows/browser/ms06_067_keyframe.rb
  95. +1 −1 modules/exploits/windows/browser/ms06_071_xml_core.rb
  96. +9 −9 modules/exploits/windows/browser/ms07_017_ani_loadimage_chunksize.rb
  97. +2 −2 modules/exploits/windows/browser/ms08_041_snapshotviewer.rb
  98. +1 −1 modules/exploits/windows/browser/ms08_053_mediaencoder.rb
  99. +1 −1 modules/exploits/windows/browser/ms08_070_visual_studio_msmask.rb
  100. +4 −4 modules/exploits/windows/browser/ms08_078_xml_corruption.rb
  101. +1 −1 modules/exploits/windows/browser/ms09_002_memory_corruption.rb
  102. +1 −1 modules/exploits/windows/browser/ms09_043_owc_htmlurl.rb
  103. +1 −1 modules/exploits/windows/browser/ms09_043_owc_msdso.rb
  104. +1 −1 modules/exploits/windows/browser/ms09_072_style_object.rb
  105. +1 −1 modules/exploits/windows/browser/ms10_002_aurora.rb
  106. +3 −3 modules/exploits/windows/browser/ms10_002_ie_object.rb
  107. +1 −1 modules/exploits/windows/browser/ms10_018_ie_tabular_activex.rb
  108. +7 −7 modules/exploits/windows/browser/ms10_022_ie_vbscript_winhlp32.rb
  109. +5 −5 modules/exploits/windows/browser/ms10_026_avi_nsamplespersec.rb
  110. +6 −6 modules/exploits/windows/browser/ms10_042_helpctr_xss_cmd_exec.rb
  111. +5 −5 modules/exploits/windows/browser/ms10_046_shortcut_icon_dllloader.rb
  112. +2 −2 modules/exploits/windows/browser/ms10_090_ie_css_clip.rb
  113. +3 −3 modules/exploits/windows/browser/ms12_004_midi.rb
  114. +3 −3 modules/exploits/windows/browser/msvidctl_mpeg2.rb
  115. +1 −1 modules/exploits/windows/browser/mswhale_checkforupdates.rb
  116. +2 −2 modules/exploits/windows/browser/nctaudiofile2_setformatlikesample.rb
  117. +1 −1 modules/exploits/windows/browser/nis2004_antispam.rb
  118. +1 −1 modules/exploits/windows/browser/nis2004_get.rb
  119. +1 −1 modules/exploits/windows/browser/novelliprint_callbackurl.rb
  120. +1 −1 modules/exploits/windows/browser/novelliprint_datetime.rb
  121. +1 −1 modules/exploits/windows/browser/novelliprint_executerequest.rb
  122. +1 −1 modules/exploits/windows/browser/novelliprint_executerequest_dbg.rb
  123. +1 −1 modules/exploits/windows/browser/novelliprint_getdriversettings.rb
  124. +1 −1 modules/exploits/windows/browser/novelliprint_getdriversettings_2.rb
  125. +1 −1 modules/exploits/windows/browser/novelliprint_target_frame.rb
  126. +2 −2 modules/exploits/windows/browser/oracle_dc_submittoexpress.rb
  127. +1 −1 modules/exploits/windows/browser/orbit_connecting.rb
  128. +1 −1 modules/exploits/windows/browser/pcvue_func.rb
  129. +2 −2 modules/exploits/windows/browser/persits_xupload_traversal.rb
  130. +2 −2 modules/exploits/windows/browser/real_arcade_installerdlg.rb
  131. +1 −1 modules/exploits/windows/browser/realplayer_cdda_uri.rb
  132. +1 −1 modules/exploits/windows/browser/realplayer_console.rb
  133. +1 −1 modules/exploits/windows/browser/realplayer_import.rb
  134. +2 −2 modules/exploits/windows/browser/realplayer_qcp.rb
  135. +1 −1 modules/exploits/windows/browser/realplayer_smil.rb
  136. +1 −1 modules/exploits/windows/browser/roxio_cineplayer.rb
  137. +1 −1 modules/exploits/windows/browser/safari_xslt_output.rb
  138. +1 −1 modules/exploits/windows/browser/sapgui_saveviewtosessionfile.rb
  139. +1 −1 modules/exploits/windows/browser/softartisans_getdrivename.rb
  140. +1 −1 modules/exploits/windows/browser/sonicwall_addrouteentry.rb
  141. +2 −2 modules/exploits/windows/browser/symantec_altirisdeployment_downloadandinstall.rb
  142. +1 −1 modules/exploits/windows/browser/symantec_altirisdeployment_runcmd.rb
  143. +2 −2 modules/exploits/windows/browser/symantec_appstream_unsafe.rb
  144. +1 −1 modules/exploits/windows/browser/symantec_backupexec_pvcalendar.rb
  145. +1 −1 modules/exploits/windows/browser/symantec_consoleutilities_browseandsavefile.rb
  146. +2 −2 modules/exploits/windows/browser/systemrequirementslab_unsafe.rb
  147. +1 −1 modules/exploits/windows/browser/teechart_pro.rb
  148. +1 −1 modules/exploits/windows/browser/trendmicro_extsetowner.rb
  149. +1 −1 modules/exploits/windows/browser/trendmicro_officescan.rb
  150. +1 −1 modules/exploits/windows/browser/tumbleweed_filetransfer.rb
  151. +3 −3 modules/exploits/windows/browser/ultramjcam_openfiledig_bof.rb
  152. +1 −1 modules/exploits/windows/browser/ultraoffice_httpupload.rb
  153. +1 −1 modules/exploits/windows/browser/verypdf_pdfview.rb
  154. +1 −1 modules/exploits/windows/browser/viscom_movieplayer_drawtext.rb
  155. +2 −2 modules/exploits/windows/browser/vlc_amv.rb
  156. +12 −12 modules/exploits/windows/browser/webdav_dll_hijacker.rb
  157. +1 −1 modules/exploits/windows/browser/webex_ucf_newobject.rb
  158. +1 −1 modules/exploits/windows/browser/winamp_playlist_unc.rb
  159. +1 −1 modules/exploits/windows/browser/winamp_ultravox.rb
  160. +1 −1 modules/exploits/windows/browser/windvd7_applicationtype.rb
  161. +1 −1 modules/exploits/windows/browser/xmplay_asx.rb
  162. +1 −1 modules/exploits/windows/browser/yahoomessenger_fvcom.rb
  163. +1 −1 modules/exploits/windows/browser/yahoomessenger_server.rb
  164. +2 −2 modules/exploits/windows/browser/zenturiprogramchecker_unsafe.rb
@@ -92,7 +92,7 @@ def on_request_uri(cli, request)
# Re-generate the payload
return if ((p = regenerate_payload(cli)) == nil)
- print_status("Sending #{self.name} to #{cli.peerhost}:#{cli.peerport}...")
+ print_status("Sending #{self.name}")
send_response_html(cli, generate_html(p), { 'Content-Type' => 'text/html; charset=utf-8' })
handler(cli)
end
@@ -68,7 +68,7 @@ def on_request_uri(cli, request)
# Re-generate the payload
return if ((p = regenerate_payload(cli)) == nil)
- print_status("Sending #{self.name} to #{cli.peerhost}:#{cli.peerport}...")
+ print_status("Sending #{self.name}")
send_response_html(cli, generate_html(p), { 'Content-Type' => 'text/html' })
handler(cli)
end
@@ -90,23 +90,21 @@ def initialize( info = {} )
end
def on_request_uri( cli, request )
- msg = "#{cli.peerhost.ljust(16)} #{self.shortname}"
-
if not request.uri.match(/\.xpi$/i)
if not request.uri.match(/\/$/)
send_redirect( cli, get_resource() + '/', '')
return
end
- print_status("#{msg} Handling request..." )
+ print_status("Handling request..." )
send_response_html( cli, generate_html, { 'Content-Type' => 'text/html' } )
return
end
p = regenerate_payload(cli)
if not p
- print_error("#{msg} Failed to generate the payload.")
+ print_error("Failed to generate the payload.")
# Send them a 404 so the browser doesn't hang waiting for data
# that will never come.
send_not_found(cli)
@@ -219,7 +217,7 @@ def on_request_uri( cli, request )
<script><![CDATA[window.addEventListener("load", function(e) { startup(); }, false);]]></script>
</overlay>|)
- print_status("#{msg} Sending xpi and waiting for user to click 'accept'...")
+ print_status("Sending xpi and waiting for user to click 'accept'...")
send_response( cli, zip.pack, { 'Content-Type' => 'application/x-xpinstall' } )
handler( cli )
end
@@ -115,7 +115,7 @@ def on_request_uri(cli, request)
print_status("Generating HTML container...")
page = generate_itms_page(payload.encoded)
#print_status("=> #{page}")
- print_status("Sending itms page to #{cli.peerhost}:#{cli.peerport}")
+ print_status("Sending itms page")
header = { 'Content-Type' => 'text/html' }
send_response_html(cli, page, header)
@@ -101,19 +101,18 @@ def on_request_uri( cli, request )
data = ""
host = ""
port = ""
- peer = "#{cli.peerhost}:#{cli.peerport}"
if not request.uri.match(/\.jar$/i)
if not request.uri.match(/\/$/)
send_redirect( cli, get_resource() + '/', '')
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 @@ def on_request_uri( cli, request )
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 @@ def on_request_uri( cli, request )
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 @@ def on_request_uri( cli, request )
return
end
- print_status( "#{peer} - sending jar..." )
+ print_status("Sending jar")
send_response( cli, generate_jar(), { 'Content-Type' => "application/octet-stream" } )
handler( cli )
@@ -110,7 +110,7 @@ def on_request_uri( cli, request )
return
end
- print_status("#{self.name} handling request from #{cli.peerhost}:#{cli.peerport}...")
+ print_status("#{self.name} handling request")
payload = regenerate_payload( cli )
if not payload
@@ -123,11 +123,11 @@ def on_request_uri( cli, request )
jar = payload.encoded
host = datastore['LHOST']
port = datastore['LPORT']
- print_status( "Payload will be a Java reverse shell to #{host}:#{port} from #{cli.peerhost}..." )
+ print_status("Payload will be a Java reverse shell")
else
port = datastore['LPORT']
datastore['RHOST'] = cli.peerhost
- print_status( "Payload will be a Java bind shell on #{cli.peerhost}:#{port}..." )
+ print_status("Payload will be a Java bind shell")
end
if jar
print_status( "Generated jar to drop (#{jar.length} bytes)." )
@@ -155,7 +155,7 @@ def on_request_uri( cli, request )
return
end
- print_status( "#{self.name} sending Applet.jar to #{cli.peerhost}:#{cli.peerport}..." )
+ print_status( "Sending Applet.jar" )
send_response( cli, generate_jar(), { 'Content-Type' => "application/octet-stream" } )
handler( cli )
@@ -116,13 +116,13 @@ def on_request_uri(cli, req)
if (target.name =~ /Automatic/)
case req.headers['User-Agent']
when /Windows/i
- print_status("Choosing a Windows target for #{cli.peerhost}:#{cli.peerport}...")
+ print_status("Choosing a Windows target")
@targetcache[cli.peerhost][:target] = self.targets[1]
when /PPC Mac OS X/i
- print_status("Choosing a Mac OS X PPC target for #{cli.peerhost}:#{cli.peerport}...")
+ print_status("Choosing a Mac OS X PPC target")
@targetcache[cli.peerhost][:target] = self.targets[2]
when /Intel Mac OS X/i
- print_status("Choosing a Mac OS X x86 target for #{cli.peerhost}:#{cli.peerport}...")
+ print_status("Choosing a Mac OS X x86 target")
@targetcache[cli.peerhost][:target] = self.targets[3]
else
print_status("Unknown target for: #{req.headers['User-Agent']}")
@@ -151,7 +151,7 @@ def on_request_uri(cli, req)
end
# Display the applet loading HTML
- print_status("Sending HTML to #{cli.peerhost}:#{cli.peerport}...")
+ print_status("Sending HTML")
send_response_html(cli, generate_html(payload.encoded),
{
'Content-Type' => 'text/html',
@@ -161,7 +161,7 @@ def on_request_uri(cli, req)
end
# Send the actual applet over
- print_status("Sending applet to #{cli.peerhost}:#{cli.peerport}...")
+ print_status("Sending applet")
send_response(cli, generate_applet(cli, req),
{
'Content-Type' => 'application/octet-stream',
@@ -79,7 +79,7 @@ def on_request_uri( cli, request )
return
end
- print_status("#{self.name} handling request from #{cli.peerhost}:#{cli.peerport}...")
+ print_status("#{self.name} handling request")
send_response_html( cli, generate_html, { 'Content-Type' => 'text/html' } )
return
@@ -105,7 +105,7 @@ def on_request_uri( cli, request )
fd.close
end
- print_status( "Sending Applet.jar to #{cli.peerhost}:#{cli.peerport}..." )
+ print_status("Sending Applet.jar")
send_response( cli, jar.pack, { 'Content-Type' => "application/octet-stream" } )
handler( cli )
@@ -69,7 +69,7 @@ def on_request_uri( cli, request )
return
end
- print_status("#{self.name} handling request from #{cli.peerhost}:#{cli.peerport}...")
+ print_status("#{self.name} handling request")
send_response_html(cli, generate_html, { 'Content-Type' => 'text/html' })
return
@@ -100,7 +100,7 @@ def on_request_uri( cli, request )
fd.close
end
- print_status("#{self.name} Sending Applet.jar to #{cli.peerhost}:#{cli.peerport}...")
+ print_status("Sending Applet.jar")
send_response(cli, jar.pack, { 'Content-Type' => "application/octet-stream" })
handler(cli)
@@ -105,13 +105,13 @@ def on_request_uri(cli, req)
if (target.name =~ /Automatic/)
case req.headers['User-Agent']
when /Windows/i
- print_status("Choosing a Windows target for #{cli.peerhost}:#{cli.peerport}...")
+ print_status("Choosing a Windows target")
@targetcache[cli.peerhost][:target] = self.targets[1]
when /PPC Mac OS X/i
- print_status("Choosing a Mac OS X PPC target for #{cli.peerhost}:#{cli.peerport}...")
+ print_status("Choosing a Mac OS X PPC target")
@targetcache[cli.peerhost][:target] = self.targets[2]
when /Intel Mac OS X/i
- print_status("Choosing a Mac OS X x86 target for #{cli.peerhost}:#{cli.peerport}...")
+ print_status("Choosing a Mac OS X x86 target")
@targetcache[cli.peerhost][:target] = self.targets[3]
else
print_status("Unknown target for: #{req.headers['User-Agent']}")
@@ -140,7 +140,7 @@ def on_request_uri(cli, req)
end
# Display the applet loading HTML
- print_status("Sending HTML to #{cli.peerhost}:#{cli.peerport}...")
+ print_status("Sending HTML")
send_response_html(cli, generate_html(payload.encoded),
{
'Content-Type' => 'text/html',
@@ -150,7 +150,7 @@ def on_request_uri(cli, req)
end
# Send the actual applet over
- print_status("Sending applet to #{cli.peerhost}:#{cli.peerport}...")
+ print_status("Sending applet")
send_response(cli, generate_applet(cli, req),
{
'Content-Type' => 'application/octet-stream',
@@ -124,7 +124,7 @@ def on_request_uri( cli, request )
return
end
- print_status( "Handling request from #{cli.peerhost}:#{cli.peerport}..." )
+ print_status( "Handling request" )
send_response_html( cli, generate_html, { 'Content-Type' => 'text/html' } )
return
@@ -150,9 +150,7 @@ def on_request_uri( cli, request )
jar.sign(@key, @cert, @ca_certs)
#File.open("payload.jar", "wb") { |f| f.write(jar.to_s) }
- print_status(
- "Sending #{datastore['APPLETNAME']}.jar to #{cli.peerhost}. "+
- "Waiting for user to click 'accept'...")
+ print_status("Sending #{datastore['APPLETNAME']}.jar. Waiting for user to click 'accept'...")
send_response( cli, jar.to_s, { 'Content-Type' => "application/octet-stream" } )
handler( cli )
@@ -79,7 +79,7 @@ def on_request_uri( cli, request )
return
end
- print_status("#{self.name} handling request from #{cli.peerhost}:#{cli.peerport}...")
+ print_status("#{self.name} handling request")
send_response_html( cli, generate_html, { 'Content-Type' => 'text/html' } )
return
@@ -107,7 +107,7 @@ def on_request_uri( cli, request )
fd.close
end
- print_status( "Sending Applet.jar to #{cli.peerhost}:#{cli.peerport}..." )
+ print_status( "Sending Applet.jar" )
send_response( cli, jar.pack, { 'Content-Type' => "application/octet-stream" } )
handler( cli )
@@ -77,7 +77,7 @@ def on_request_uri(cli, request)
# Re-generate the payload
return if ((p = regenerate_payload(cli)) == nil)
- print_status("Sending #{self.name} to #{cli.peerhost}:#{cli.peerport}...")
+ print_status("Sending #{self.name}")
send_response_html(cli, generate_html(p), { 'Content-Type' => 'text/html' })
# Handle the payload
@@ -100,7 +100,7 @@ def on_request_uri(cli, request)
# Re-generate the payload
return if ((p = regenerate_payload(cli)) == nil)
- print_status("Sending #{self.name} to #{cli.peerhost}:#{cli.peerport}...")
+ print_status("Sending #{self.name}")
send_response_html(cli, generate_html(p), { 'Content-Type' => 'text/html' })
# Handle the payload
@@ -83,7 +83,7 @@ def on_request_uri(cli, request)
case request.uri
when get_resource
- print_status("Sending #{self.name} to #{cli.peerhost}:#{cli.peerport}...")
+ print_status("Sending #{self.name}")
content = "<body><script>"
content << generate_evil_js(cli, request)
content << "</script></body>"
@@ -148,7 +148,7 @@ def on_request_uri(cli, request)
#{html_ftr}
^
when get_resource()
- print_status("Sending #{self.name} to #{cli.peerhost} for request #{request.uri}")
+ print_status("Sending #{self.name} for request #{request.uri}")
js = %Q^
if (window.opera) {
@@ -168,7 +168,7 @@ def on_request_uri(cli, request)
#{html_ftr}
^
else
- print_status("Sending 404 to #{cli.peerhost} for request #{request.uri}")
+ print_status("Sending 404 for request #{request.uri}")
send_not_found(cli)
return
end
@@ -106,13 +106,13 @@ def on_request_uri(cli, req)
if (target.name =~ /Automatic/)
case req.headers['User-Agent']
when /Windows/i
- print_status("Choosing a Windows target for #{cli.peerhost}:#{cli.peerport}...")
+ print_status("Choosing a Windows target")
@targetcache[cli.peerhost][:target] = self.targets[1]
when /PPC Mac OS X/i
- print_status("Choosing a Mac OS X PPC target for #{cli.peerhost}:#{cli.peerport}...")
+ print_status("Choosing a Mac OS X PPC target")
@targetcache[cli.peerhost][:target] = self.targets[2]
when /Intel Mac OS X/i
- print_status("Choosing a Mac OS X x86 target for #{cli.peerhost}:#{cli.peerport}...")
+ print_status("Choosing a Mac OS X x86 target")
@targetcache[cli.peerhost][:target] = self.targets[3]
end
end
@@ -139,13 +139,13 @@ def on_request_uri(cli, req)
end
# Display the applet loading HTML
- print_status("Sending HTML to #{cli.peerhost}:#{cli.peerport}...")
+ print_status("Sending HTML")
send_response_html(cli, generate_html(), { 'Content-Type' => 'text/html' })
return
end
# Send the actual applet over
- print_status("Sending applet to #{cli.peerhost}:#{cli.peerport}...")
+ print_status("Sending applet")
send_response(cli, generate_applet(cli, req), { 'Content-Type' => 'application/octet-stream' })
# Handle the payload
@@ -150,7 +150,7 @@ def on_request_uri(cli, request)
# remove the extra tabs
html = html.gsub(/^\t\t/, '')
- print_status("Sending #{self.name} to #{cli.peerhost}:#{cli.peerport}...")
+ print_status("Sending #{self.name}")
send_response_html(cli, html, { 'Content-Type' => 'text/html' })
# handle the payload
@@ -69,7 +69,7 @@ def on_request_uri(cli, req)
# Grab reference to the target
t = target
- print_status("Sending #{self.name} to #{cli.peerhost}:#{cli.peerport}...")
+ print_status("Sending #{self.name}")
# Transmit the compressed response to the client
send_response(cli, generate_tiff(p, t), { 'Content-Type' => 'image/tiff' })
@@ -140,10 +140,10 @@ def on_request_uri(cli, request)
}
if request.uri =~ /\.sucatalog$/
- print_status("Sending initial distribution package to #{cli.peerhost}:#{cli.peerport}")
+ print_status("Sending initial distribution package")
body = generate_catalog(server)
elsif request.uri =~ /\.dist$/
- print_status("Sending distribution script to #{cli.peerhost}:#{cli.peerport}")
+ print_status("Sending distribution script")
return if ((p = regenerate_payload(cli)) == nil)
body = generate_dist(p.encoded)
else
Oops, something went wrong.

0 comments on commit 9cdd891

Please sign in to comment.