Land rapid7#3442, platform fix from dracu on freenode

wvu · Jun 11, 2014 · 746a429 · 746a429
2 parents 4b8961a + 0bac247
commit 746a429
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 10 deletions.
diff --git a/modules/exploits/multi/http/struts_code_exec_parameters.rb b/modules/exploits/multi/http/struts_code_exec_parameters.rb
@@ -45,7 +45,7 @@ def initialize(info = {})
           ['Windows Universal',
             {
               'Arch' => ARCH_X86,
-              'Platform' => 'windows'
+              'Platform' => 'win'
             }
           ],
           ['Linux Universal',
@@ -140,7 +140,7 @@ def exploit
       exec_cmd << "#c=#cl.loadClass('metasploit.Payload'),"
       exec_cmd << "#c.getMethod('main',new java.lang.Class[]{@java.lang.Class@forName('[Ljava.lang.String;')}).invoke("
       exec_cmd << "null,new java.lang.Object[]{new java.lang.String[0]})"
-    when 'windows'
+    when 'win'
       path = temp_path || './'
       payload_exe = "#{path}#{payload_exe}.exe"
       exec_cmd = "@java.lang.Runtime@getRuntime().exec('#{payload_exe}')"

diff --git a/modules/exploits/multi/http/struts_include_params.rb b/modules/exploits/multi/http/struts_include_params.rb
@@ -129,7 +129,7 @@ def exploit
       exec_cmd << "#c=#cl.loadClass('metasploit.Payload'),"
       exec_cmd << "#c.getMethod('main',new java.lang.Class[]{@java.lang.Class@forName('[Ljava.lang.String;')}).invoke("
       exec_cmd << "null,new java.lang.Object[]{new java.lang.String[0]})"
-    when 'windows'
+    when 'win'
       @payload_exe = "./#{@payload_exe}.exe"
       exec_cmd = "@java.lang.Runtime@getRuntime().exec('#{@payload_exe}')"
     else

diff --git a/modules/exploits/windows/local/s4u_persistence.rb b/modules/exploits/windows/local/s4u_persistence.rb
@@ -30,7 +30,7 @@ def initialize(info={})
           'Thomas McCarthy "smilingraccoon" <smilingraccoon[at]gmail.com>',
           'Brandon McCann "zeknox" <bmccann[at]accuvant.com>'
         ],
-      'Platform'      => [ 'windows' ],
+      'Platform'      => 'win',
       'SessionTypes'  => [ 'meterpreter' ],
       'Targets'       => [ [ 'Windows', {} ] ],
       'DisclosureDate' => 'Jan 2 2013', # Date of scriptjunkie's blog post

diff --git a/modules/post/windows/gather/local_admin_search_enum.rb b/modules/post/windows/gather/local_admin_search_enum.rb
@@ -30,7 +30,7 @@ def initialize(info={})
           'Thomas McCarthy "smilingraccoon" <smilingraccoon[at]gmail.com>',
           'Royce Davis "r3dy" <rdavis[at]accuvant.com>'
         ],
-      'Platform'     => [ 'windows'],
+      'Platform'     => 'win',
       'SessionTypes' => [ 'meterpreter' ]
       ))
 

diff --git a/modules/post/windows/manage/driver_loader.rb b/modules/post/windows/manage/driver_loader.rb
@@ -40,7 +40,7 @@ def initialize(info={})
       },
       'License'       => MSF_LICENSE,
       'Author'        => 'Borja Merino <bmerinofe[at]gmail.com>',
-      'Platform'      => 'windows',
+      'Platform'      => 'win',
       'SessionTypes'  => [ 'meterpreter' ]
     ))
 

diff --git a/modules/post/windows/manage/ie_proxypac.rb b/modules/post/windows/manage/ie_proxypac.rb
@@ -27,7 +27,7 @@ def initialize(info={})
           [ 'URL', 'https://www.youtube.com/watch?v=YGjIlbBVDqE&hd=1' ],
           [ 'URL', 'http://blog.scriptmonkey.eu/bypassing-group-policy-using-the-windows-registry' ]
         ],
-      'Platform'      => [ 'windows' ],
+      'Platform'      => 'win',
       'SessionTypes'  => [ 'meterpreter' ]
     ))
 

diff --git a/modules/post/windows/manage/portproxy.rb b/modules/post/windows/manage/portproxy.rb
@@ -16,7 +16,7 @@ def initialize(info={})
       },
       'License'       => MSF_LICENSE,
       'Author'        => [ 'Borja Merino <bmerinofe[at]gmail.com>'],
-      'Platform'      => [ 'windows' ],
+      'Platform'      => 'win',
       'SessionTypes'  => [ 'meterpreter' ]
     ))
 

diff --git a/modules/post/windows/manage/pptp_tunnel.rb b/modules/post/windows/manage/pptp_tunnel.rb
@@ -24,7 +24,7 @@ def initialize(info={})
         [
           [ 'URL', 'http://www.youtube.com/watch?v=vdppEZjMPCM&hd=1' ]
         ],
-      'Platform'      => 'windows',
+      'Platform'      => 'win',
       'SessionTypes'  => [ 'meterpreter' ]
     ))
 

diff --git a/modules/post/windows/manage/rpcapd_start.rb b/modules/post/windows/manage/rpcapd_start.rb
@@ -23,7 +23,7 @@ def initialize(info={})
         PORT will be used depending of the mode configured.},
       'License'       => MSF_LICENSE,
       'Author'        => [ 'Borja Merino <bmerinofe[at]gmail.com>'],
-      'Platform'      => [ 'windows' ],
+      'Platform'      => 'win',
       'SessionTypes'  => [ 'meterpreter' ]
     ))