Add options to cmd_psh_payload

Fill in validated datastore options for generating custom PSH
payloads

Author: RageLtMan

lib/msf/core/exploit/powershell.rb

@@ -14,6 +14,10 @@ def initialize(info = {})
         OptBool.new('Powershell::sub_vars', [true, 'Substitute variable names', false]),
         OptBool.new('Powershell::sub_funcs', [true, 'Substitute function names', false]),
         OptBool.new('Powershell::exec_in_place', [true, 'Produce PSH without executable wrapper', false]),
+        OptBool.new('Powershell::encode_final_payload', [true, 'Encode final payload for -EncodedCommand', false]),
+        OptBool.new('Powershell::encode_inner_payload', [true, 'Encode inner payload for -EncodedCommand', false]),
+        OptBool.new('Powershell::use_single_quotes', [true, 'Wraps the -Command argument in single quotes', false]),
+        OptBool.new('Powershell::no_equals', [true, 'Pad base64 until no "=" remains', false]),
         OptEnum.new('Powershell::method', [true, 'Payload delivery method', 'reflection', %w(net reflection old msil)]),
       ], self.class)
   end
@@ -188,11 +192,12 @@ def run_hidden_psh(ps_code, payload_arch, encoded)
   #
   # @return [String] Powershell command line with payload
   def cmd_psh_payload(pay, payload_arch, opts = {})
-    options.validate(datastore)    
-    opts[:persist] ||= datastore['Powershell::persist']
-    opts[:prepend_sleep] ||= datastore['Powershell::prepend_sleep']
-    opts[:method] ||= datastore['Powershell::method']
-    opts[:exec_in_place] ||= datastore['Powershell::exec_in_place']
+    options.validate(datastore)
+
+    [ :persist, :prepend_sleep, :exec_in_place, :encode_final_payload,
+      :encode_inner_payload, :use_single_quotes, :no_equals, :method ].map { |opt|
+      opts[opt] ||= datastore["Powershell::#{opt}"]
+    }
 
     unless opts.key? :shorten
       opts[:shorten] = (datastore['Powershell::method'] != 'old')