Address PR feedback

cgranleese-r7 · Sep 19, 2024 · 8ab3b6c · 8ab3b6c
1 parent 7acea08
commit 8ab3b6c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/spec/acceptance/command_shell_spec.rb b/spec/acceptance/command_shell_spec.rb
@@ -411,7 +411,7 @@ def get_file_attachment_contents(path)
 
  validated_lines.each do |test_line|
  test_line = Acceptance::CommandShell.uncolorize(test_line)
- expect(test_line).to_not include('FAILED', '[-] FAILED', '[-] Exception', '[-] '), "Unexpected error: #{test_line}"
+ expect(test_line).to_not include('FAILED', '[-] '), "Unexpected error: #{test_line}"
  end
 
  # Assert all expected lines are present

diff --git a/spec/support/acceptance/command_shell/linux.rb b/spec/support/acceptance/command_shell/linux.rb
@@ -3,10 +3,10 @@ module Acceptance::CommandShell
  payloads: [
  {
  name: "cmd/unix/reverse_bash",
- extension: "",
+ extension: ".sh",
  platforms: [:linux],
  executable: true,
- execute_cmd: ["${payload_path}"],
+ execute_cmd: ["sh ${payload_path}"],
  generate_options: {
  '-f': "raw"
  },

diff --git a/test/modules/post/test/cmd_exec.rb b/test/modules/post/test/cmd_exec.rb
@@ -38,6 +38,8 @@ def show_args_binary
  { path: 'show_args.exe', cmd: "#{pwd}\\show_args.exe" }
  elsif session.platform == 'windows' && session.type == 'shell'
  { path: 'show_args.exe', cmd: 'show_args.exe' }
+ elsif session.platform == 'windows' && session.arch == 'php'
+ { path: 'show_args.exe', cmd: '.\\show_args.exe' }
  elsif session.platform == 'windows'
  { path: 'show_args.exe', cmd: './show_args.exe' }
  elsif session.type == 'meterpreter' && session.arch == 'java'