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

Land #4832 @wvu-r7 remove and merge duplicate hash key initializers

bug/bundler_fix
Brent Cook 2015-02-24 08:38:09 -06:00
parent 1efb4331b2 f3cad229d3
commit cf913e521c
No known key found for this signature in database
GPG Key ID: 1FFAA0B24B708F96
14 changed files with 12 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/rex/proto/http/server.rb
View File

@ -81,7 +81,6 @@ class Server
"htm" => "text/htm",
"jpg" => "image/jpeg",
"jpeg" => "image/jpeg",
"jpeg" => "image/jpeg",
"gif" => "image/gif",
"png" => "image/png",
"bmp" => "image/bmp",

4
modules/auxiliary/scanner/http/http_login.rb
View File

@ -22,10 +22,6 @@ class Metasploit3 < Msf::Auxiliary
super(
'Name' => 'HTTP Login Utility',
'Description' => 'This module attempts to authenticate to an HTTP service.',
'References' =>
[
],
'Author' => [ 'hdm' ],
'References' =>
[

1
modules/exploits/windows/backupexec/name_service.rb
View File

@ -41,7 +41,6 @@ class Metasploit3 < Msf::Exploit::Remote
{
'Space' => 1024,
'MinNops' => 512,
'MinNops' => 512,
'StackAdjustment' => -3500,
},
'Platform' => %w{ win },

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

@ -48,7 +48,7 @@ class Metasploit3 < Msf::Exploit::Remote
'DefaultOptions' =>
{
'EXITFUNC' => 'process',
'InitialAutoRunScript' => 'migrate -f'
},
'Payload' =>
{
@ -57,10 +57,6 @@ class Metasploit3 < Msf::Exploit::Remote
'BadChars' => "\x00\x0d\x0a\x5c",
'PrependEncoder' => "\x81\xc4\x54\xf2\xff\xff" # Stack adjustment # add esp, -3500
},
'DefaultOptions' =>
{
'InitialAutoRunScript' => 'migrate -f'
},
'Platform' => 'win',
'Targets' =>
[

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

@ -52,17 +52,13 @@ class Metasploit3 < Msf::Exploit::Remote
'DefaultOptions' =>
{
'EXITFUNC' => 'process',
'InitialAutoRunScript' => 'migrate -f'
},
'Payload' =>
{
'Space' => 1024,
'DisableNops' => true,
},
'DefaultOptions' =>
{
'InitialAutoRunScript' => 'migrate -f'
},
'Platform' => 'win',
'Targets' =>
[

1
modules/exploits/windows/browser/ms13_090_cardspacesigninhelper.rb
View File

@ -109,7 +109,6 @@ class Metasploit3 < Msf::Exploit::Remote
"CardSpaceSigninHelper" => rand_text_alpha(5 + rand(5)),
"get_code" => rand_text_alpha(5 + rand(5)),
"code" => rand_text_alpha(5 + rand(5)),
"massage_array" => rand_text_alpha(5 + rand(5)),
"required_claims" => rand_text_alpha(5 + rand(5)),
"massage_array" => rand_text_alpha(5 + rand(5)),
"massage_array_length" => rand_text_alpha(5 + rand(5)),

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

@ -51,6 +51,7 @@ class Metasploit3 < Msf::Exploit::Remote
'DefaultOptions' =>
{
'EXITFUNC' => 'process',
'InitialAutoRunScript' => 'migrate -f'
},
'Payload' =>
{
@ -59,10 +60,6 @@ class Metasploit3 < Msf::Exploit::Remote
'BadChars' => "",
'PrependEncoder' => "\x81\xc4\x54\xf2\xff\xff" # Stack adjustment # add esp, -3500
},
'DefaultOptions' =>
{
'InitialAutoRunScript' => 'migrate -f'
},
'Platform' => 'win',
'Targets' =>
[

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

@ -48,6 +48,7 @@ class Metasploit3 < Msf::Exploit::Remote
'DefaultOptions' =>
{
'EXITFUNC' => 'process',
'InitialAutoRunScript' => 'migrate -f'
},
'Payload' =>
{
@ -55,10 +56,6 @@ class Metasploit3 < Msf::Exploit::Remote
'DisableNops' => true,
'BadChars' => ""
},
'DefaultOptions' =>
{
'InitialAutoRunScript' => 'migrate -f'
},
'Platform' => 'win',
'Targets' =>
[

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

@ -56,17 +56,13 @@ class Metasploit3 < Msf::Exploit::Remote
'DefaultOptions' =>
{
'EXITFUNC' => 'process',
'InitialAutoRunScript' => 'migrate -f'
},
'Payload' =>
{
'Space' => 948,
'DisableNops' => true,
},
'DefaultOptions' =>
{
'InitialAutoRunScript' => 'migrate -f'
},
'Platform' => 'win',
'Targets' =>
[

7
modules/exploits/windows/http/hp_pcm_snac_update_certificates.rb
View File

@ -40,17 +40,14 @@ class Metasploit3 < Msf::Exploit::Remote
'Arch' => ARCH_JAVA,
'DefaultOptions' =>
{
'SHELL' => 'cmd.exe'
'SHELL' => 'cmd.exe',
'SSL' => true
},
'Targets' =>
[
[ 'HP ProCurve Manager 4.0 SNAC Server', {} ]
],
'DefaultTarget' => 0,
'DefaultOptions' =>
{
'SSL' => true,
},
'DisclosureDate' => 'Sep 09 2013'))
register_options(

7
modules/exploits/windows/http/hp_pcm_snac_update_domain.rb
View File

@ -40,17 +40,14 @@ class Metasploit3 < Msf::Exploit::Remote
'Arch' => ARCH_JAVA,
'DefaultOptions' =>
{
'SHELL' => 'cmd.exe'
'SHELL' => 'cmd.exe',
'SSL' => true
},
'Targets' =>
[
[ 'HP ProCurve Manager 4.0 SNAC Server', {} ]
],
'DefaultTarget' => 0,
'DefaultOptions' =>
{
'SSL' => true,
},
'DisclosureDate' => 'Sep 09 2013'))
register_options(

8
modules/exploits/windows/local/pxeexploit.rb
View File

@ -30,6 +30,8 @@ class Metasploit3 < Msf::Exploit::Remote
'DefaultOptions' =>
{
'EXITFUNC' => 'thread',
'FILENAME' => 'update1',
'SERVEONCE' => true # once they reboot; don't infect again - you'll kill them!
},
'Payload' =>
{
@ -47,11 +49,7 @@ class Metasploit3 < Msf::Exploit::Remote
],
'Privileged' => true,
'Stance' => Msf::Exploit::Stance::Passive,
'DefaultTarget' => 0,
'DefaultOptions' => {
'FILENAME' => 'update1',
'SERVEONCE' => true # once they reboot; don't infect again - you'll kill them!
}
'DefaultTarget' => 0
)
register_options(

1
modules/exploits/windows/mssql/mssql_linkcrawler.rb
View File

@ -49,7 +49,6 @@ class Metasploit3 < Msf::Exploit::Remote
['URL','http://msdn.microsoft.com/en-us/library/ms188279.aspx'],
['URL','http://www.exploit-monday.com/2011_10_16_archive.html']
],
'Platform' => 'win',
'DisclosureDate' => 'Jan 1 2000',
'Targets' =>
[

1
modules/exploits/windows/scada/winlog_runtime_2.rb
View File

@ -44,7 +44,6 @@ class Metasploit3 < Msf::Exploit::Remote
'BadChars' => "\x00",
'DisableNops' => true,
},
'Platform' => 'win',
'Targets' =>
[
[ 'Sielco Sistemi Winlog 2.07.14/2.07.16 - Ceramics Kiln Project',