Land rapid7#8056, Fix how the psh mixin issues Meterpreter commands

Author: Brent Cook

Gemfile.lock

@@ -14,7 +14,7 @@ PATH
       metasploit-concern
       metasploit-credential
       metasploit-model
-      metasploit-payloads (= 1.2.18)
+      metasploit-payloads (= 1.2.19)
       metasploit_data_models
       metasploit_payloads-mettle (= 0.1.7)
       msgpack
@@ -190,7 +190,7 @@ GEM
       activemodel (~> 4.2.6)
       activesupport (~> 4.2.6)
       railties (~> 4.2.6)
-    metasploit-payloads (1.2.18)
+    metasploit-payloads (1.2.19)
     metasploit_data_models (2.0.14)
       activerecord (~> 4.2.6)
       activesupport (~> 4.2.6)

lib/msf/core/post/windows/powershell.rb

@@ -29,7 +29,7 @@ def initialize(info = {})
         # Returns true if powershell is installed
         #
         def have_powershell?
-          cmd_exec('cmd.exe /c "echo. | powershell get-host"') =~ /Name.*Version.*InstanceId/m
+          cmd_exec('cmd.exe', '/c "echo. | powershell get-host"') =~ /Name.*Version.*InstanceId/m
         end
 
         #
@@ -88,9 +88,9 @@ def execute_script(script, greedy_kill = false)
             script = encode_script(script.to_s)
           end
 
-          ps_string = "#{ps_bin} -EncodedCommand #{script} -InputFormat None"
-          vprint_good "EXECUTING:\n#{ps_string}"
-          cmd_out = session.sys.process.execute(ps_string, nil, { 'Hidden' => true, 'Channelized' => true })
+          ps_string = "-EncodedCommand #{script} -InputFormat None"
+          vprint_good "EXECUTING:\n#{ps_bin} #{ps_string}"
+          cmd_out = session.sys.process.execute(ps_bin, ps_string, { 'Hidden' => true, 'Channelized' => true })
 
           # Subtract prior PIDs from current
           if greedy_kill

metasploit-framework.gemspec

@@ -65,7 +65,7 @@ Gem::Specification.new do |spec|
   # are needed when there's no database
   spec.add_runtime_dependency 'metasploit-model'
   # Needed for Meterpreter
-  spec.add_runtime_dependency 'metasploit-payloads', '1.2.18'
+  spec.add_runtime_dependency 'metasploit-payloads', '1.2.19'
   # Needed for the next-generation POSIX Meterpreter
   spec.add_runtime_dependency 'metasploit_payloads-mettle', '0.1.7'
   # Needed by msfgui and other rpc components