infosecn1nja
/
metasploit-framework
mirror of https://github.com/infosecn1nja/metasploit-framework.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Land #2815 - Change gsub hardtabs

bug/bundler_fix
sinn3r 2013-12-31 15:58:21 -06:00
parent 20c2eb248e 841f67d392
commit 184bd1e0b2
No known key found for this signature in database
GPG Key ID: 2384DB4EF06F730B
67 changed files with 90 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/auxiliary/admin/edirectory/edirectory_edirutil.rb
View File

@ -130,7 +130,7 @@ class Metasploit3 < Msf::Auxiliary
</SOAP-ENV:Body>
</SOAP-ENV:Envelope>|
template = template.gsub(/^\t\t/, '')
template = template.gsub(/^ {4}/, '')
template = template.gsub(/\n/, '')
connect

2
modules/exploits/linux/http/webid_converter.rb
View File

@ -99,7 +99,7 @@ class Metasploit3 < Msf::Exploit::Remote
);
?>
eof
currencies_php = currencies_php.gsub(/^\t\t\t/, '')
currencies_php = currencies_php.gsub(/^ {6}/, '')
pwd = client.fs.dir.pwd
print_status("#{peer} - Searching currencies.php file from #{pwd}")

2
modules/exploits/multi/browser/java_storeimagearray.rb
View File

@ -127,7 +127,7 @@ class Metasploit3 < Msf::Exploit::Remote
</body>
</html>
|
html = html.gsub(/^\t\t/, '')
html = html.gsub(/^ {4}/, '')
return html
end

2
modules/exploits/multi/browser/opera_historysearch.rb
View File

@ -166,7 +166,7 @@ class Metasploit3 < Msf::Exploit::Remote
send_not_found(cli)
return
end
content.gsub!(/^\t{4}/, '')
content.gsub!(/^ {8}/, '')
content.gsub!(/\t/, ' ')
send_response_html(cli, content, headers)

2
modules/exploits/multi/http/qdpm_upload_exec.rb
View File

@ -83,7 +83,7 @@ class Metasploit3 < Msf::Exploit::Remote
exec("#{fname}");
?>
|
php = php.gsub(/^\t\t/, '').gsub(/\n/, ' ')
php = php.gsub(/^ {4}/, '').gsub(/\n/, ' ')
return php
end

2
modules/exploits/osx/browser/mozilla_mchannel.rb
View File

@ -147,7 +147,7 @@ class Metasploit3 < Msf::Exploit::Remote
HTML
# remove the extra tabs
html = html.gsub(/^\t\t/, '')
html = html.gsub(/^ {4}/, '')
print_status("Sending #{self.name}")
send_response_html(cli, html, { 'Content-Type' => 'text/html' })

2
modules/exploits/windows/browser/adobe_flash_mp4_cprt.rb
View File

@ -263,7 +263,7 @@ pluginspage="http://www.macromedia.com/go/getflashplayer">
</html>
|
html = html.gsub(/^\t\t/, '')
html = html.gsub(/^ {4}/, '')
print_status("Sending html")
send_response(cli, html, {'Content-Type'=>'text/html'})

2
modules/exploits/windows/browser/adobe_flash_otf_font.rb
View File

@ -200,7 +200,7 @@ class Metasploit3 < Msf::Exploit::Remote
</html>
|
html = html.gsub(/^\t\t/, '')
html = html.gsub(/^ {4}/, '')
print_status("Sending HTML")
send_response(cli, html, {'Content-Type'=>'text/html'})

2
modules/exploits/windows/browser/adobe_flash_rtmp.rb
View File

@ -415,7 +415,7 @@ class Metasploit3 < Msf::Exploit::Remote
</html>
|
html = html.gsub(/^\t\t/, '')
html = html.gsub(/^ {4}/, '')
print_status("Sending html")
send_response(cli, html, {'Content-Type'=>'text/html'})

2
modules/exploits/windows/browser/adobe_flash_sps.rb
View File

@ -163,7 +163,7 @@ class Metasploit3 < Msf::Exploit::Remote
</html>
|
html = html.gsub(/^\t\t/, '')
html = html.gsub(/^ {4}/, '')
print_status("Sending HTML")
send_response(cli, html, {'Content-Type'=>'text/html'})

2
modules/exploits/windows/browser/adobe_flashplayer_arrayindexing.rb
View File

@ -164,7 +164,7 @@ class Metasploit3 < Msf::Exploit::Remote
</html>
EOS
html = html.gsub(/^\t\t/, '')
html = html.gsub(/^ {4}/, '')
print_status("Sending #{self.name} HTML")
send_response(cli, html, { 'Content-Type' => 'text/html' })

2
modules/exploits/windows/browser/adobe_flashplayer_flash10o.rb
View File

@ -259,7 +259,7 @@ class Metasploit3 < Msf::Exploit::Remote
</html>
EOS
html = html.gsub(/^\t\t/, "")
html = html.gsub(/^ {4}/, "")
print_status("Sending HTML to...")
send_response(cli, html, {'Content-Type' => "text/html"} )

2
modules/exploits/windows/browser/apple_quicktime_rdrf.rb
View File

@ -98,7 +98,7 @@ class Metasploit4 < Msf::Exploit::Remote
</html>
|
html.gsub(/^\t\t/, '')
html.gsub(/^ {4}/, '')
end

2
modules/exploits/windows/browser/blackice_downloadimagefileurl.rb
View File

@ -128,7 +128,7 @@ class Metasploit3 < Msf::Exploit::Remote
EOS
#Clear the extra tabs
content = content.gsub(/^\t\t/, '')
content = content.gsub(/^ {4}/, '')
print_status("Sending exploit HTML")
send_response_html(cli, content)

2
modules/exploits/windows/browser/cisco_playerpt_setsource.rb
View File

@ -251,7 +251,7 @@ class Metasploit3 < Msf::Exploit::Remote
</html>
MYHTML
html = html.gsub(/^\t\t/, '')
html = html.gsub(/^ {4}/, '')
print_status("Sending html")
send_response(cli, html, {'Content-Type'=>'text/html'})

2
modules/exploits/windows/browser/cisco_playerpt_setsource_surl.rb
View File

@ -429,7 +429,7 @@ class Metasploit3 < Msf::Exploit::Remote
</html>
MYHTML
html = html.gsub(/^\t\t/, '')
html = html.gsub(/^ {4}/, '')
print_status("Sending html")
send_response(cli, html, {'Content-Type'=>'text/html'})

2
modules/exploits/windows/browser/citrix_gateway_actx.rb
View File

@ -184,7 +184,7 @@ class Metasploit3 < Msf::Exploit::Remote
</html>
EOS
html = html.gsub(/^\t\t/, '')
html = html.gsub(/^ {4}/, '')
print_status("Sending #{self.name} HTML")
send_response(cli, html, { 'Content-Type' => 'text/html' })

2
modules/exploits/windows/browser/clear_quest_cqole.rb
View File

@ -108,7 +108,7 @@ class Metasploit3 < Msf::Exploit::Remote
</html>
EOS
html = html.gsub(/^\t\t/, '')
html = html.gsub(/^ {4}/, '')
print_status("#{cli.peerhost}:#{cli.peerport} - Sending html")
send_response(cli, html, {'Content-Type'=>'text/html'})

2
modules/exploits/windows/browser/crystal_reports_printcontrol.rb
View File

@ -306,7 +306,7 @@ class Metasploit3 < Msf::Exploit::Remote
end
html = load_exploit_html(my_target, cli)
html = html.gsub(/^\t\t/, '')
html = html.gsub(/^ {4}/, '')
print_status("Sending HTML...")
send_response(cli, html, {'Content-Type'=>'text/html'})
end

2
modules/exploits/windows/browser/hp_alm_xgo_setshapenodetype_exec.rb
View File

@ -262,7 +262,7 @@ class Metasploit3 < Msf::Exploit::Remote
end
html = load_exploit_html(my_target, cli)
html = html.gsub(/^\t\t/, '')
html = html.gsub(/^ {4}/, '')
print_status("Sending HTML...")
send_response(cli, html, {'Content-Type'=>'text/html'})
end

2
modules/exploits/windows/browser/hp_loadrunner_writefilebinary.rb
View File

@ -248,7 +248,7 @@ class Metasploit3 < Msf::Exploit::Remote
end
html = load_exploit_html(my_target, cli)
html = html.gsub(/^\t\t/, '')
html = html.gsub(/^ {4}/, '')
print_status("Sending HTML...")
send_response(cli, html, {'Content-Type'=>'text/html'})
end

2
modules/exploits/windows/browser/hp_loadrunner_writefilestring.rb
View File

@ -142,7 +142,7 @@ class Metasploit3 < Msf::Exploit::Remote
send_not_found(cli)
return
end
html = html.gsub(/^\t\t/, '')
html = html.gsub(/^ {4}/, '')
print_status("Sending HTML...")
send_response(cli, html, {'Content-Type'=>'text/html'})
end

2
modules/exploits/windows/browser/ibm_spss_c1sizer.rb
View File

@ -375,7 +375,7 @@ class Metasploit3 < Msf::Exploit::Remote
end
html = load_exploit_html(my_target, cli)
html = html.gsub(/^\t\t/, '')
html = html.gsub(/^ {4}/, '')
print_status("Sending HTML...")
send_response(cli, html, {'Content-Type'=>'text/html'})
end

2
modules/exploits/windows/browser/ibm_tivoli_pme_activex_bof.rb
View File

@ -231,7 +231,7 @@ class Metasploit3 < Msf::Exploit::Remote
</html>
HTML
html = html.gsub(/^\t\t/, '')
html = html.gsub(/^ {4}/, '')
print_status("Sending html")
send_response(cli, html, {'Content-Type'=>'text/html'})

2
modules/exploits/windows/browser/ie_cbutton_uaf.rb
View File

@ -247,7 +247,7 @@ class Metasploit3 < Msf::Exploit::Remote
end
html = load_exploit_html(my_target, cli)
html = html.gsub(/^\t\t/, '')
html = html.gsub(/^ {4}/, '')
print_status("Sending HTML...")
send_response(cli, html, {'Content-Type'=>'text/html'})
end

2
modules/exploits/windows/browser/ie_cgenericelement_uaf.rb
View File

@ -227,7 +227,7 @@ class Metasploit3 < Msf::Exploit::Remote
end
html = load_exploit_html(my_target, cli)
html = html.gsub(/^\t\t/, '')
html = html.gsub(/^ {4}/, '')
print_status("Sending HTML...")
send_response(cli, html, {'Content-Type'=>'text/html'})
end

2
modules/exploits/windows/browser/ie_execcommand_uaf.rb
View File

@ -334,7 +334,7 @@ class Metasploit3 < Msf::Exploit::Remote
return
end
html = html.gsub(/^\t\t/, '')
html = html.gsub(/^ {4}/, '')
send_response(cli, html, {'Content-Type'=>'text/html'})

2
modules/exploits/windows/browser/indusoft_issymbol_internationalseparator.rb
View File

@ -276,7 +276,7 @@ class Metasploit3 < Msf::Exploit::Remote
end
html = load_exploit_html(my_target, cli)
html = html.gsub(/^\t\t/, '')
html = html.gsub(/^ {4}/, '')
print_status("Sending HTML...")
send_response(cli, html, {'Content-Type'=>'text/html'})
end

2
modules/exploits/windows/browser/inotes_dwa85w_bof.rb
View File

@ -281,7 +281,7 @@ class Metasploit3 < Msf::Exploit::Remote
end
html = load_exploit_html(my_target, cli)
html = html.gsub(/^\t\t/, '')
html = html.gsub(/^ {4}/, '')
print_status("Sending HTML...")
send_response(cli, html, {'Content-Type'=>'text/html'})
end

2
modules/exploits/windows/browser/intrust_annotatex_add.rb
View File

@ -240,7 +240,7 @@ class Metasploit3 < Msf::Exploit::Remote
print_status("Sending #{self.name}")
#Remove the extra tabs from content
content = content.gsub(/^\t\t/, '')
content = content.gsub(/^ {4}/, '')
# Transmit the response to the client
send_response_html(cli, content)

2
modules/exploits/windows/browser/java_mixer_sequencer.rb
View File

@ -181,7 +181,7 @@ class Metasploit3 < Msf::Exploit::Remote
</html>
|
html = html.gsub(/^\t\t/, '')
html = html.gsub(/^ {4}/, '')
print_status("Sending HTML")
send_response(cli, html, {'Content-Type'=>'text/html'})

2
modules/exploits/windows/browser/mozilla_mchannel.rb
View File

@ -339,7 +339,7 @@ class Metasploit3 < Msf::Exploit::Remote
HTML
#Remove the extra tabs
html = html.gsub(/^\t\t/, '')
html = html.gsub(/^ {4}/, '')
print_status("Sending HTML...")
send_response_html(cli, html, { 'Content-Type' => 'text/html' })

6
modules/exploits/windows/browser/mozilla_reduceright.rb
View File

@ -221,7 +221,7 @@ class Metasploit3 < Msf::Exploit::Remote
obj.reduceRight(f,1,2,3);
JS
js = js.gsub(/^\t\t/, '')
js = js.gsub(/^ {4}/, '')
if datastore['OBFUSCATE']
js = ::Rex::Exploitation::JSObfu.new(js)
@ -313,7 +313,7 @@ class Metasploit3 < Msf::Exploit::Remote
js.obfuscate
end
js = js.gsub(/^\t\t/, '')
js = js.gsub(/^ {4}/, '')
html = <<-HTML
<html>
@ -330,7 +330,7 @@ class Metasploit3 < Msf::Exploit::Remote
end
html = html.gsub(/^\t\t/, '')
html = html.gsub(/^ {4}/, '')
print_status("Sending #{self.name}")
send_response(cli, html, {'Content-Type'=>'text/html'})

4
modules/exploits/windows/browser/ms10_026_avi_nsamplespersec.rb
View File

@ -150,7 +150,7 @@ class Metasploit3 < Msf::Exploit::Remote
</html>
|
html = html.gsub(/^\t\t\t/, '')
html = html.gsub(/^ {6}/, '')
print_status("Sending trigger loader")
send_response_html(cli, html)
@ -212,7 +212,7 @@ class Metasploit3 < Msf::Exploit::Remote
</html>
|
html = html.gsub(/^\t\t/, '')
html = html.gsub(/^ {4}/, '')
print_status("Sending #{self.name}")
send_response_html(cli, html)

2
modules/exploits/windows/browser/ms11_081_option.rb
View File

@ -230,7 +230,7 @@ class Metasploit3 < Msf::Exploit::Remote
end
html = load_exploit_html(my_target, cli)
html = html.gsub(/^\t\t/, '')
html = html.gsub(/^ {4}/, '')
print_status("Sending HTML...")
send_response(cli, html, {'Content-Type'=>'text/html'})
end

2
modules/exploits/windows/browser/ms11_093_ole32.rb
View File

@ -165,7 +165,7 @@ class Metasploit3 < Msf::Exploit::Remote
</html>
|
html = html.gsub(/^\t\t/, '')
html = html.gsub(/^ {4}/, '')
print_status("Sending html")
send_response(cli, html, {'Content-Type'=>'text/html'})

2
modules/exploits/windows/browser/ms12_004_midi.rb
View File

@ -323,7 +323,7 @@ class Metasploit3 < Msf::Exploit::Remote
</html>
|
html = html.gsub(/^\t\t/, '')
html = html.gsub(/^ {4}/, '')
print_status("Sending html to #{cli.peerhost}:#{cli.peerport}...")
send_response(cli, html, {'Content-Type'=>'text/html'})

2
modules/exploits/windows/browser/ms12_037_same_id.rb
View File

@ -264,7 +264,7 @@ class Metasploit3 < Msf::Exploit::Remote
</HTML>
|
html = html.gsub(/^\t\t\t/, '')
html = html.gsub(/^ {6}/, '')
print_status("Sending html")
send_response(cli, html, {'Content-Type'=>'text/html'})

2
modules/exploits/windows/browser/ms13_009_ie_slayoutrun_uaf.rb
View File

@ -192,7 +192,7 @@ class Metasploit3 < Msf::Exploit::Remote
end
html = get_exploit(my_target, cli)
html = html.gsub(/^\t\t/, '')
html = html.gsub(/^ {4}/, '')
print_status "Sending HTML..."
send_response(cli, html, {'Content-Type'=>'text/html'})

27
modules/exploits/windows/browser/ms13_037_svg_dashstyle.rb
View File

@ -132,18 +132,18 @@ class Metasploit3 < Msf::Exploit::Remote
# Land the payload at 0x0c0c0c0c
# For IE 8
js = %Q|
var heap_obj = new heapLib.ie(0x20000);
var code = unescape("#{js_code}");
var nops = unescape("#{js_nops}");
while (nops.length < 0x80000) nops += nops;
var offset = nops.substring(0, #{my_target['Offset']});
var shellcode = offset + code + nops.substring(0, 0x800-code.length-offset.length);
while (shellcode.length < 0x40000) shellcode += shellcode;
var block = shellcode.substring(0, (0x80000-6)/2);
heap_obj.gc();
for (var i=1; i < 0x300; i++) {
heap_obj.alloc(block);
}
var heap_obj = new heapLib.ie(0x20000);
var code = unescape("#{js_code}");
var nops = unescape("#{js_nops}");
while (nops.length < 0x80000) nops += nops;
var offset = nops.substring(0, #{my_target['Offset']});
var shellcode = offset + code + nops.substring(0, 0x800-code.length-offset.length);
while (shellcode.length < 0x40000) shellcode += shellcode;
var block = shellcode.substring(0, (0x80000-6)/2);
heap_obj.gc();
for (var i=1; i < 0x300; i++) {
heap_obj.alloc(block);
}
|
js = heaplib(js, {:noobfu => true})
@ -398,7 +398,6 @@ function exploit(){
if my_target['Rop'] == :ntdll and request.uri !~ /#{@second_stage_url}/
html = html_info_leak
html = html.gsub(/^\t\t/, '')
print_status("Sending HTML to info leak...")
send_response(cli, html, {'Content-Type'=>'text/html'})
else
@ -410,7 +409,6 @@ function exploit(){
if leak == 0
html = load_exploit_html(my_target, cli)
html = html.gsub(/^\t\t/, '')
print_status("Sending HTML to trigger...")
send_response(cli, html, {'Content-Type'=>'text/html'})
return
@ -433,7 +431,6 @@ function exploit(){
end
html = load_exploit_html(my_target, cli)
html = html.gsub(/^\t\t/, '')
print_status("Sending HTML to trigger...")
send_response(cli, html, {'Content-Type'=>'text/html'})

2
modules/exploits/windows/browser/ms13_059_cflatmarkuppointer.rb
View File

@ -156,7 +156,7 @@ class Metasploit3 < Msf::Exploit::Remote
</html>
|
html.gsub(/^\t\t/, '')
html.gsub(/^ {4}/, '')
end
def on_request_uri(cli, request)

2
modules/exploits/windows/browser/msxml_get_definition_code_exec.rb
View File

@ -372,7 +372,7 @@ class Metasploit3 < Msf::Exploit::Remote
</html>
EOS
html = html.gsub(/^\t\t/, '')
html = html.gsub(/^ {4}/, '')
print_status("#{cli.peerhost}:#{cli.peerport} - Sending html")
send_response(cli, html, {'Content-Type'=>'text/html'})

2
modules/exploits/windows/browser/novell_groupwise_gwcls1_actvx.rb
View File

@ -269,7 +269,7 @@ class Metasploit3 < Msf::Exploit::Remote
end
html = load_exploit_html(my_target, cli)
html = html.gsub(/^\t\t/, '')
html = html.gsub(/^ {4}/, '')
print_status("Sending HTML...")
send_response(cli, html, {'Content-Type'=>'text/html'})
end

2
modules/exploits/windows/browser/ntr_activex_check_bof.rb
View File

@ -351,7 +351,7 @@ class Metasploit3 < Msf::Exploit::Remote
</html>
MYHTML
html = html.gsub(/^\t\t/, '')
html = html.gsub(/^ {4}/, '')
print_status("Sending html")
send_response(cli, html, {'Content-Type'=>'text/html'})

2
modules/exploits/windows/browser/ntr_activex_stopmodule.rb
View File

@ -160,7 +160,7 @@ class Metasploit3 < Msf::Exploit::Remote
</html>
MYHTML
html = html.gsub(/^\t\t/, '')
html = html.gsub(/^ {4}/, '')
print_status("Sending html")
send_response(cli, html, {'Content-Type'=>'text/html'})

2
modules/exploits/windows/browser/oracle_autovue_setmarkupmode.rb
View File

@ -396,7 +396,7 @@ class Metasploit3 < Msf::Exploit::Remote
</html>
MYHTML
html = html.gsub(/^\t\t/, '')
html = html.gsub(/^ {4}/, '')
print_status("Sending html")
send_response(cli, html, {'Content-Type'=>'text/html'})

4
modules/exploits/windows/browser/pcvue_func.rb
View File

@ -122,7 +122,7 @@ function main(){
}
EOS
js = js.gsub(/^\t\t/, '')
js = js.gsub(/^ {4}/, '')
#JS obfuscation on demand
if datastore['OBFUSCATE']
@ -146,7 +146,7 @@ EOS
EOS
#Remove the extra tabs from content
content = content.gsub(/^\t\t/, '')
content = content.gsub(/^ {4}/, '')
print_status("Sending #{self.name}")
send_response(cli, content, {'Content-Type'=>'text/html'})

2
modules/exploits/windows/browser/quickr_qp2_bof.rb
View File

@ -258,7 +258,7 @@ class Metasploit3 < Msf::Exploit::Remote
end
html = load_exploit_html(my_target, cli)
html = html.gsub(/^\t\t/, '')
html = html.gsub(/^ {4}/, '')
print_status("Sending HTML...")
send_response(cli, html, {'Content-Type'=>'text/html'})
end

2
modules/exploits/windows/browser/real_arcade_installerdlg.rb
View File

@ -102,7 +102,7 @@ class Metasploit3 < Msf::Exploit::Remote
EOS
# Remove extra tabs
html = html.gsub(/^\t\t/, "")
html = html.gsub(/^ {4}/, "")
print_status("Sending #{self.name}")
send_response(cli, html, { 'Content-Type' => 'text/html' })

2
modules/exploits/windows/browser/safari_xslt_output.rb
View File

@ -120,7 +120,7 @@ class Metasploit3 < Msf::Exploit::Remote
EOS
#Clear the extra tabs
content = content.gsub(/^\t\t/, '')
content = content.gsub(/^ {4}/, '')
print_status("Sending #{self.name}")
send_response(cli, content, {'Content-Type'=>'application/xml'})

2
modules/exploits/windows/browser/samsung_neti_wiewer_backuptoavi_bof.rb
View File

@ -150,7 +150,7 @@ class Metasploit3 < Msf::Exploit::Remote
</html>
EOS
html = html.gsub(/^\t\t/, '')
html = html.gsub(/^ {4}/, '')
print_status("Sending html")
send_response(cli, html, {'Content-Type'=>'text/html'})

2
modules/exploits/windows/browser/siemens_solid_edge_selistctrlx.rb
View File

@ -490,7 +490,7 @@ class Metasploit3 < Msf::Exploit::Remote
end
html = load_exploit_html(my_target)
html = html.gsub(/^\t\t/, '')
html = html.gsub(/^ {4}/, '')
print_status("Sending HTML...")
send_response(cli, html, {'Content-Type'=>'text/html'})
end

2
modules/exploits/windows/browser/synactis_connecttosynactis_bof.rb
View File

@ -183,7 +183,7 @@ class Metasploit3 < Msf::Exploit::Remote
</html>
|
html.gsub(/^\t\t/, '')
html.gsub(/^ {4}/, '')
end
def on_request_uri(cli, request)

2
modules/exploits/windows/browser/teechart_pro.rb
View File

@ -254,7 +254,7 @@ EOS
print_status("Sending #{self.name}")
#Remove the extra tabs from content
content = content.gsub(/^\t\t/, '')
content = content.gsub(/^ {4}/, '')
# Transmit the response to the client
send_response_html(cli, content)

4
modules/exploits/windows/browser/tom_sawyer_tsgetx71ex552.rb
View File

@ -203,7 +203,7 @@ class Metasploit3 < Msf::Exploit::Remote
var nops_padding = nops.substring(0, 0x73e-code.length-offset.length);
var shellcode = code + nops_padding + rop_chain + nops_90.substring(0, 0x800-code.length-nops_padding.length-rop_chain.length);
JS_ROP
js_shellcode = js_shellcode.gsub(/^\t\t\t/, '')
js_shellcode = js_shellcode.gsub(/^ {6}/, '')
end
js = <<-JS
@ -251,7 +251,7 @@ class Metasploit3 < Msf::Exploit::Remote
</html>
EOS
html = html.gsub(/^\t\t/, '')
html = html.gsub(/^ {4}/, '')
print_status("Sending html")
send_response(cli, html, {'Content-Type'=>'text/html'})

2
modules/exploits/windows/browser/vlc_amv.rb
View File

@ -234,7 +234,7 @@ class Metasploit3 < Msf::Exploit::Remote
EOS
#Remove extra tabs in HTML
html = html.gsub(/^\t\t/, "")
html = html.gsub(/^ {4}/, "")
print_status("Sending #{self.name}")
send_response( cli, html, {'Content-Type' => 'text/html'} )

2
modules/exploits/windows/browser/vlc_mms_bof.rb
View File

@ -204,7 +204,7 @@ class Metasploit3 < Msf::Exploit::Remote
EOS
#Remove extra tabs in HTML
html = html.gsub(/^\t\t/, "")
html = html.gsub(/^ {4}/, "")
print_status("Sending malicious page")
send_response( cli, html, {'Content-Type' => 'text/html'} )

2
modules/exploits/windows/browser/zenworks_helplauncher_exec.rb
View File

@ -157,7 +157,7 @@ class Metasploit3 < Msf::Exploit::Remote
EOS
# Remove extra tabs
html = html.gsub(/^\t\t/, "")
html = html.gsub(/^ {4}/, "")
print_status("Sending #{self.name}")
send_response(cli, html, { 'Content-Type' => 'text/html' })

4
modules/exploits/windows/fileformat/adobe_reader_u3d.rb
View File

@ -268,7 +268,7 @@ class Metasploit3 < Msf::Exploit::Remote
this.pageNum = 2;
JS
js = js.gsub(/^\t\t/,'')
js = js.gsub(/^ {4}/,'')
if datastore['OBFUSCATE']
js = ::Rex::Exploitation::JSObfu.new(js)
@ -315,7 +315,7 @@ class Metasploit3 < Msf::Exploit::Remote
</template2>
</xdp:xdp>|
xml = xml.gsub(/^\t\t/, '')
xml = xml.gsub(/^ {4}/, '')
return xml
end

2
modules/exploits/windows/fileformat/apple_quicktime_texml.rb
View File

@ -124,7 +124,7 @@ class Metasploit3 < Msf::Exploit::Remote
</text3GTrack>
eos
texml = texml.gsub(/^\t\t/,'')
texml = texml.gsub(/^ {4}/,'')
print_status("Creating '#{datastore['FILENAME']}'.")
file_create(texml)

8
modules/exploits/windows/fileformat/mcafee_showreport_exec.rb
View File

@ -174,7 +174,7 @@ class Metasploit3 < Msf::Exploit::Remote
</D:response>
BODY
body = body.gsub(/^\t\t/, '')
body = body.gsub(/^ {4}/, '')
if request["Depth"].to_i > 0
if path.scan("/").length < 2
@ -233,7 +233,7 @@ class Metasploit3 < Msf::Exploit::Remote
</D:propstat>
</D:response>
SHARE
share = share.gsub(/^\t\t/, '')
share = share.gsub(/^ {4}/, '')
return share
end
@ -275,7 +275,7 @@ class Metasploit3 < Msf::Exploit::Remote
FILES
end
files = files.gsub(/^\t\t\t/, '')
files = files.gsub(/^ {6}/, '')
return files
end
@ -316,7 +316,7 @@ class Metasploit3 < Msf::Exploit::Remote
</html>
HTML
html = html.gsub(/^\t\t/, '')
html = html.gsub(/^ {4}/, '')
file_create(html)
print_status("#{datastore['FILENAME']} must be run locally in order to execute our payload")

2
modules/exploits/windows/fileformat/ms12_005.rb
View File

@ -122,7 +122,7 @@ class Metasploit3 < Msf::Exploit::Remote
end
p = p.gsub(/^\t\t\t/, '')
p = p.gsub(/^ {6}/, '')
return p
end

2
modules/exploits/windows/http/cyclope_ess_sqli.rb
View File

@ -119,7 +119,7 @@ class Metasploit3 < Msf::Exploit::Remote
exec("#{fname}");
?>
|
php = php.gsub(/^\t\t/, '').gsub(/\n/, ' ')
php = php.gsub(/^ {4}/, '').gsub(/\n/, ' ')
return php
end

2
modules/exploits/windows/misc/itunes_extm3u_bof.rb
View File

@ -133,7 +133,7 @@ class Metasploit3 < Msf::Exploit::Remote
</html>
HTML_REDIR
ie_redir = ie_redir.gsub(/^\t\t\t/, '')
ie_redir = ie_redir.gsub(/^ {6}/, '')
return ie_redir
end

8
modules/exploits/windows/misc/wireshark_lua.rb
View File

@ -179,7 +179,7 @@ class Metasploit3 < Msf::Exploit::Remote
</D:response>
BODY
body = body.gsub(/^\t\t/, '')
body = body.gsub(/^ {4}/, '')
if request["Depth"].to_i > 0
if path.scan("/").length < 2
@ -242,7 +242,7 @@ class Metasploit3 < Msf::Exploit::Remote
</D:propstat>
</D:response>
SHARE
share = share.gsub(/^\t\t/, '')
share = share.gsub(/^ {4}/, '')
return share
end
@ -284,7 +284,7 @@ class Metasploit3 < Msf::Exploit::Remote
FILES
end
files = files.gsub(/^\t\t\t/, '')
files = files.gsub(/^ {6}/, '')
return files
end
@ -311,7 +311,7 @@ class Metasploit3 < Msf::Exploit::Remote
os.execute(#{var_temp_name})
LUA
lua_script = lua_script.gsub(/^\t\t/, '')
lua_script = lua_script.gsub(/^ {4}/, '')
return lua_script
end

2
modules/exploits/windows/mysql/scrutinizer_upload_exec.rb
View File

@ -92,7 +92,7 @@ class Metasploit3 < Msf::Exploit::Remote
exec("#{fname}");
?>
|
php = php.gsub(/^\t\t/, '').gsub(/\n/, ' ')
php = php.gsub(/^ {4}/, '').gsub(/\n/, ' ')
return php
end

2
modules/exploits/windows/scada/iconics_webhmi_setactivexguid.rb
View File

@ -211,7 +211,7 @@ class Metasploit3 < Msf::Exploit::Remote
</html>
EOS
html = html.gsub(/^\t\t/, "")
html = html.gsub(/^ {4}/, "")
print_status("Sending malicious page")
send_response(cli, html, {'Content-Type'=>'text/html'})