update powershell specs for rex-powershell 0.1.77

Author: jmartin-tech

modules/payloads/singles/cmd/windows/powershell_bind_tcp.rb

@@ -10,7 +10,7 @@
 
 module MetasploitModule
 
-  CachedSize = 1501
+  CachedSize = 1518
 
   include Msf::Payload::Single
   include Rex::Powershell::Command

modules/payloads/singles/cmd/windows/powershell_reverse_tcp.rb

@@ -10,7 +10,7 @@
 
 module MetasploitModule
 
-  CachedSize = 1509
+  CachedSize = 1526
 
   include Msf::Payload::Single
   include Rex::Powershell::Command

modules/payloads/singles/windows/powershell_bind_tcp.rb

@@ -15,7 +15,7 @@
 ###
 module MetasploitModule
 
-  CachedSize = 1501
+  CachedSize = 1518
 
   include Msf::Payload::Windows::Exec
   include Rex::Powershell::Command

modules/payloads/singles/windows/powershell_reverse_tcp.rb

@@ -15,7 +15,7 @@
 ###
 module MetasploitModule
 
-  CachedSize = 1509
+  CachedSize = 1526
 
   include Msf::Payload::Windows::Exec
   include Msf::Payload::Windows::Powershell

modules/payloads/singles/windows/x64/powershell_bind_tcp.rb

@@ -15,7 +15,7 @@
 ###
 module MetasploitModule
 
-  CachedSize = 1501
+  CachedSize = 1518
 
   include Msf::Payload::Windows::Exec_x64
   include Rex::Powershell::Command

modules/payloads/singles/windows/x64/powershell_reverse_tcp.rb

@@ -15,7 +15,7 @@
 ###
 module MetasploitModule
 
-  CachedSize = 1509
+  CachedSize = 1526
 
   include Msf::Payload::Windows::Exec_x64
   include Msf::Payload::Windows::Powershell

spec/lib/msf/core/exploit/powershell_spec.rb

@@ -313,14 +313,9 @@ def decompress(code)
         subject.datastore['Powershell::method'] = 'msil'
         subject.options.validate(subject.datastore)
       end
-      it 'should raise an exception' do
-        except = false
-        begin
-          subject.cmd_psh_payload(payload, arch)
-        rescue RuntimeError
-          except = true
-        end
-        expect(except).to be_truthy
+      it 'should generate a command line' do
+        code = subject.cmd_psh_payload(payload, arch)
+        expect(decompress(code).include?('System.Reflection.MethodInfo')).to be_truthy
       end
     end
 
@@ -396,10 +391,10 @@ def decompress(code)
       end
     end
 
-    context 'when use single quotes' do
-      it 'should wrap in single quotes' do
-        code = subject.cmd_psh_payload(payload, arch, {:use_single_quotes => true})
-        expect(code.include?(' -c \'')).to be_truthy
+    context 'when wrap double quotes' do
+      it 'should wrap in double quotes' do
+        code = subject.cmd_psh_payload(payload, arch, {:wrap_double_quotes => true})
+        expect(code.include?(' -c "')).to be_truthy
       end
     end
   end
@@ -449,7 +444,8 @@ def decompress(code)
                     [:sta, true],
                     [:noprofile, true],
                     [:windowstyle, "hidden"],
-                    [:command, "Z"]
+                    [:command, "Z"],
+                    [:wrap_double_quotes, true]
     ]
 
     permutations = (0..command_args.length).to_a.combination(2).map{|i,j| command_args[i...j]}
@@ -464,20 +460,21 @@ def decompress(code)
           opts[:shorten] = false
           long_args = subject.generate_psh_args(opts)
 
-          opt_length = opts.length - 1
-
           expect(short_args).not_to be_nil
           expect(long_args).not_to be_nil
-          expect(short_args.count('-')).to eql opt_length
-          expect(long_args.count('-')).to eql opt_length
           expect(short_args[0]).not_to eql " "
           expect(long_args[0]).not_to eql " "
           expect(short_args[-1]).not_to eql " "
           expect(long_args[-1]).not_to eql " "
 
           if opts[:command]
-            expect(long_args[-10..-1]).to eql "-Command Z"
-            expect(short_args[-4..-1]).to eql "-c Z"
+            if opts[:wrap_double_quotes]
+              expect(long_args[-12..-1]).to eql "-Command \"Z\""
+              expect(short_args[-6..-1]).to eql "-c \"Z\""
+            else
+              expect(long_args[-10..-1]).to eql "-Command Z"
+              expect(short_args[-4..-1]).to eql "-c Z"
+            end
           end
        end
       end