Fix file upload in PowerShell

smashery · Sep 25, 2024 · a7aa213 · a7aa213
1 parent 583f93a
commit a7aa213
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/lib/msf/base/sessions/powershell.rb b/lib/msf/base/sessions/powershell.rb
@@ -56,7 +56,7 @@ def self.to_cmd(executable, args)
     # - Side-step any PowerShell magic
     # If someone specifically wants to use the PowerShell magic, they can use other APIs
 
-    needs_wrapping_chars = ['$', '`', '(', ')', '@', '>', '<', '{','}', '&', ',', ' ']
+    needs_wrapping_chars = ['$', '`', '(', ')', '@', '>', '<', '{','}', '&', ',', ' ', ';']
 
     result = ""
     cmd_and_args = [executable] + args

diff --git a/lib/msf/core/post/file.rb b/lib/msf/core/post/file.rb
@@ -740,6 +740,7 @@ def _write_file_powershell_fragment(file_name, data, offset, chunk_size, append
     else
       file_mode = 'Create'
     end
+    file_name = file_name.gsub("'","''")
     pwsh_code = <<~PSH
       try {
       $encoded='#{encoded_chunk}';

diff --git a/test/modules/post/test/cmd_exec.rb b/test/modules/post/test/cmd_exec.rb
@@ -202,7 +202,6 @@ def test_cmd_exec_stderr
           true
         else
           output = cmd_exec("cmd.exe", "/c echo #{test_string} 1>&2")
-          print_status("line is #{output}")
           output.rstrip == test_string
         end
       else
-Original file line number
+Diff line change
@@ Expand Up / @@ -202,7 +202,6 @@ def test_cmd_exec_stderr @@
               true
             else
               output = cmd_exec("cmd.exe", "/c echo #{test_string} 1>&2")
-              print_status("line is #{output}")
               output.rstrip == test_string
             end
           else
@@ Expand Down @@