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

Brent Cook · Brent Cook · commit cf913e521c96 · 2015-02-24T08:38:09.000-06:00
diff --git a/lib/rex/proto/http/server.rb b/lib/rex/proto/http/server.rb
@@ -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",
diff --git a/modules/auxiliary/scanner/http/http_login.rb b/modules/auxiliary/scanner/http/http_login.rb
@@ -22,10 +22,6 @@ def initialize
     super(
       'Name'           => 'HTTP Login Utility',
       'Description'    => 'This module attempts to authenticate to an HTTP service.',
-      'References'  =>
-        [
-
-        ],
       'Author'         => [ 'hdm' ],
       'References'     =>
         [
diff --git a/modules/exploits/windows/backupexec/name_service.rb b/modules/exploits/windows/backupexec/name_service.rb
@@ -41,7 +41,6 @@ module has been tested against Veritas 9.1 SP0, 9.1 SP1, and
         {
           'Space'    => 1024,
           'MinNops'  => 512,
-          'MinNops'  => 512,
           'StackAdjustment' => -3500,
         },
       'Platform'       => %w{ win },
diff --git a/modules/exploits/windows/browser/cisco_playerpt_setsource.rb b/modules/exploits/windows/browser/cisco_playerpt_setsource.rb
@@ -48,7 +48,7 @@ def initialize(info = {})
       'DefaultOptions' =>
         {
           'EXITFUNC' => 'process',
-
+          'InitialAutoRunScript' => 'migrate -f'
         },
       'Payload'        =>
         {
@@ -57,10 +57,6 @@ def initialize(info = {})
           'BadChars'    => "\x00\x0d\x0a\x5c",
           'PrependEncoder' => "\x81\xc4\x54\xf2\xff\xff" # Stack adjustment # add esp, -3500
         },
-      'DefaultOptions'  =>
-        {
-          'InitialAutoRunScript' => 'migrate -f'
-        },
       'Platform' => 'win',
       'Targets'        =>
         [
diff --git a/modules/exploits/windows/browser/cisco_playerpt_setsource_surl.rb b/modules/exploits/windows/browser/cisco_playerpt_setsource_surl.rb
@@ -52,17 +52,13 @@ def initialize(info = {})
       'DefaultOptions' =>
         {
           'EXITFUNC' => 'process',
-
+          'InitialAutoRunScript' => 'migrate -f'
         },
       'Payload'        =>
         {
           'Space' => 1024,
           'DisableNops' => true,
         },
-      'DefaultOptions'  =>
-        {
-          'InitialAutoRunScript' => 'migrate -f'
-        },
       'Platform' => 'win',
       'Targets'        =>
         [
diff --git a/modules/exploits/windows/browser/ms13_090_cardspacesigninhelper.rb b/modules/exploits/windows/browser/ms13_090_cardspacesigninhelper.rb
@@ -109,7 +109,6 @@ def exploit_template(cli, target_info)
       "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)),
diff --git a/modules/exploits/windows/browser/ntr_activex_check_bof.rb b/modules/exploits/windows/browser/ntr_activex_check_bof.rb
@@ -51,6 +51,7 @@ def initialize(info = {})
       'DefaultOptions' =>
         {
           'EXITFUNC' => 'process',
+          'InitialAutoRunScript' => 'migrate -f'
         },
       'Payload'        =>
         {
@@ -59,10 +60,6 @@ def initialize(info = {})
           'BadChars'    => "",
           'PrependEncoder' => "\x81\xc4\x54\xf2\xff\xff" # Stack adjustment # add esp, -3500
         },
-      'DefaultOptions'  =>
-        {
-          'InitialAutoRunScript' => 'migrate -f'
-        },
       'Platform' => 'win',
       'Targets'        =>
         [
diff --git a/modules/exploits/windows/browser/ntr_activex_stopmodule.rb b/modules/exploits/windows/browser/ntr_activex_stopmodule.rb
@@ -48,17 +48,14 @@ def initialize(info = {})
       'DefaultOptions' =>
         {
           'EXITFUNC' => 'process',
+          'InitialAutoRunScript' => 'migrate -f'
         },
       'Payload'        =>
         {
           'Space' => 1024,
           'DisableNops' => true,
           'BadChars'    => ""
         },
-      'DefaultOptions'  =>
-        {
-          'InitialAutoRunScript' => 'migrate -f'
-        },
       'Platform' => 'win',
       'Targets'        =>
         [
diff --git a/modules/exploits/windows/browser/oracle_autovue_setmarkupmode.rb b/modules/exploits/windows/browser/oracle_autovue_setmarkupmode.rb
@@ -56,17 +56,13 @@ def initialize(info = {})
       'DefaultOptions' =>
         {
           'EXITFUNC' => 'process',
-
+          'InitialAutoRunScript' => 'migrate -f'
         },
       'Payload'        =>
         {
           'Space' => 948,
           'DisableNops' => true,
         },
-      'DefaultOptions'  =>
-        {
-          'InitialAutoRunScript' => 'migrate -f'
-        },
       'Platform' => 'win',
       'Targets'        =>
         [
diff --git a/modules/exploits/windows/http/hp_pcm_snac_update_certificates.rb b/modules/exploits/windows/http/hp_pcm_snac_update_certificates.rb
@@ -40,17 +40,14 @@ def initialize(info = {})
       '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(
diff --git a/modules/exploits/windows/http/hp_pcm_snac_update_domain.rb b/modules/exploits/windows/http/hp_pcm_snac_update_domain.rb
@@ -40,17 +40,14 @@ def initialize(info = {})
       '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(
diff --git a/modules/exploits/windows/local/pxeexploit.rb b/modules/exploits/windows/local/pxeexploit.rb
@@ -30,6 +30,8 @@ def initialize
       'DefaultOptions' =>
         {
           'EXITFUNC' => 'thread',
+          'FILENAME' => 'update1',
+          'SERVEONCE' => true # once they reboot; don't infect again - you'll kill them!
         },
       'Payload'        =>
         {
@@ -47,11 +49,7 @@ def initialize
         ],
       '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(
diff --git a/modules/exploits/windows/mssql/mssql_linkcrawler.rb b/modules/exploits/windows/mssql/mssql_linkcrawler.rb
@@ -49,7 +49,6 @@ def initialize(info = {})
           ['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'        =>
         [
diff --git a/modules/exploits/windows/scada/winlog_runtime_2.rb b/modules/exploits/windows/scada/winlog_runtime_2.rb
@@ -44,7 +44,6 @@ def initialize(info = {})
           'BadChars' => "\x00",
           'DisableNops' => true,
         },
-      'Platform'       => 'win',
       'Targets'        =>
         [
           [ 'Sielco Sistemi Winlog 2.07.14/2.07.16 - Ceramics Kiln Project',

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,6 @@ module has been tested against Veritas 9.1 SP0, 9.1 SP1, and`
`41`	`41`	`{`
`42`	`42`	`'Space' => 1024,`
`43`	`43`	`'MinNops' => 512,`
`44`		`- 'MinNops' => 512,`
`45`	`44`	`'StackAdjustment' => -3500,`
`46`	`45`	`},`
`47`	`46`	`'Platform' => %w{ win },`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ def initialize(info = {})`
`48`	`48`	`'DefaultOptions' =>`
`49`	`49`	`{`
`50`	`50`	`'EXITFUNC' => 'process',`
`51`		`-`
	`51`	`+ 'InitialAutoRunScript' => 'migrate -f'`
`52`	`52`	`},`
`53`	`53`	`'Payload' =>`
`54`	`54`	`{`
`@@ -57,10 +57,6 @@ def initialize(info = {})`
`57`	`57`	`'BadChars' => "\x00\x0d\x0a\x5c",`
`58`	`58`	`'PrependEncoder' => "\x81\xc4\x54\xf2\xff\xff" # Stack adjustment # add esp, -3500`
`59`	`59`	`},`
`60`		`- 'DefaultOptions' =>`
`61`		`- {`
`62`		`- 'InitialAutoRunScript' => 'migrate -f'`
`63`		`- },`
`64`	`60`	`'Platform' => 'win',`
`65`	`61`	`'Targets' =>`
`66`	`62`	`[`
Original file line number	Diff line number	Diff line change
`@@ -52,17 +52,13 @@ def initialize(info = {})`
`52`	`52`	`'DefaultOptions' =>`
`53`	`53`	`{`
`54`	`54`	`'EXITFUNC' => 'process',`
`55`		`-`
	`55`	`+ 'InitialAutoRunScript' => 'migrate -f'`
`56`	`56`	`},`
`57`	`57`	`'Payload' =>`
`58`	`58`	`{`
`59`	`59`	`'Space' => 1024,`
`60`	`60`	`'DisableNops' => true,`
`61`	`61`	`},`
`62`		`- 'DefaultOptions' =>`
`63`		`- {`
`64`		`- 'InitialAutoRunScript' => 'migrate -f'`
`65`		`- },`
`66`	`62`	`'Platform' => 'win',`
`67`	`63`	`'Targets' =>`
`68`	`64`	`[`
Original file line number	Diff line number	Diff line change
`@@ -51,6 +51,7 @@ def initialize(info = {})`
`51`	`51`	`'DefaultOptions' =>`
`52`	`52`	`{`
`53`	`53`	`'EXITFUNC' => 'process',`
	`54`	`+ 'InitialAutoRunScript' => 'migrate -f'`
`54`	`55`	`},`
`55`	`56`	`'Payload' =>`
`56`	`57`	`{`
`@@ -59,10 +60,6 @@ def initialize(info = {})`
`59`	`60`	`'BadChars' => "",`
`60`	`61`	`'PrependEncoder' => "\x81\xc4\x54\xf2\xff\xff" # Stack adjustment # add esp, -3500`
`61`	`62`	`},`
`62`		`- 'DefaultOptions' =>`
`63`		`- {`
`64`		`- 'InitialAutoRunScript' => 'migrate -f'`
`65`		`- },`
`66`	`63`	`'Platform' => 'win',`
`67`	`64`	`'Targets' =>`
`68`	`65`	`[`
Original file line number	Diff line number	Diff line change
`@@ -48,17 +48,14 @@ def initialize(info = {})`
`48`	`48`	`'DefaultOptions' =>`
`49`	`49`	`{`
`50`	`50`	`'EXITFUNC' => 'process',`
	`51`	`+ 'InitialAutoRunScript' => 'migrate -f'`
`51`	`52`	`},`
`52`	`53`	`'Payload' =>`
`53`	`54`	`{`
`54`	`55`	`'Space' => 1024,`
`55`	`56`	`'DisableNops' => true,`
`56`	`57`	`'BadChars' => ""`
`57`	`58`	`},`
`58`		`- 'DefaultOptions' =>`
`59`		`- {`
`60`		`- 'InitialAutoRunScript' => 'migrate -f'`
`61`		`- },`
`62`	`59`	`'Platform' => 'win',`
`63`	`60`	`'Targets' =>`
`64`	`61`	`[`
Original file line number	Diff line number	Diff line change
`@@ -56,17 +56,13 @@ def initialize(info = {})`
`56`	`56`	`'DefaultOptions' =>`
`57`	`57`	`{`
`58`	`58`	`'EXITFUNC' => 'process',`
`59`		`-`
	`59`	`+ 'InitialAutoRunScript' => 'migrate -f'`
`60`	`60`	`},`
`61`	`61`	`'Payload' =>`
`62`	`62`	`{`
`63`	`63`	`'Space' => 948,`
`64`	`64`	`'DisableNops' => true,`
`65`	`65`	`},`
`66`		`- 'DefaultOptions' =>`
`67`		`- {`
`68`		`- 'InitialAutoRunScript' => 'migrate -f'`
`69`		`- },`
`70`	`66`	`'Platform' => 'win',`
`71`	`67`	`'Targets' =>`
`72`	`68`	`[`