Fixing issues

cgranleese-r7 · Aug 23, 2024 · 08af266 · 08af266
1 parent 633a888
commit 08af266
Show file tree

Hide file tree

Showing 7 changed files with 133 additions and 75 deletions.
diff --git a/.github/workflows/meterpreter_acceptance.yml b/.github/workflows/meterpreter_acceptance.yml
@@ -213,10 +213,20 @@ jobs:
           # https://github.com/ruby/setup-ruby/tree/d2b39ad0b52eca07d23f3aa14fdf2a3fcc1f411c#windows
           bundler: 2.2.33
 
-      - name: Move mettle gem into framework
-        if: ${{ matrix.meterpreter.name == 'mettle' && (contains(github.event.issue.labels.*.name, 'mettle-testing-branch')) }}
+      # Copying mettle gem into framework - macOS
+      - name: Move mettle gem - macOS
+        if: ${{ matrix.meterpreter.name == 'mettle' && runner.os == 'macos' }}
+        #        if: contains(github.event.issue.labels.*.name, 'mettle-label')
+        run: |
+          cp /Users/runner/work/metasploit-framework/metasploit-framework/mettle/pkg/metasploit_payloads-mettle-${{ env.METTLE_VERSION }}.pre.dev.gem /Users/runner/work/metasploit-framework/metasploit-framework/metasploit-framework
+        working-directory: metasploit-framework
+
+      # Copying mettle gem into framework - macOS
+      - name: Move mettle gem
+        if: ${{ matrix.meterpreter.name == 'mettle' && runner.os != 'macos' }}
+        #        if: contains(github.event.issue.labels.*.name, 'mettle-label')
         run: |
-          cp ./mettle/pkg/metasploit_payloads-mettle-${{ env.METTLE_VERSION }}.pre.dev.gem ./metasploit-framework
+          cp /home/runner/work/metasploit-framework/metasploit-framework/mettle/pkg/metasploit_payloads-mettle-${{ env.METTLE_VERSION }}.pre.dev.gem /home/runner/work/metasploit-framework/metasploit-framework/metasploit-framework
         working-directory: metasploit-framework
 
       - name: Install mettle gem
@@ -243,7 +253,9 @@ jobs:
         if: ${{ (matrix.meterpreter.name == 'java') && (runner.os != 'Windows') }}
 #        if: ${{ (matrix.meterpreter.name == 'java') && (runner.os != 'Windows') && (contains(github.event.issue.labels.*.name, 'payload-testing-branch')) }}
         run: |
+          cd ..
           docker run --rm -w "$(pwd)" -v "$(pwd):$(pwd)" rapid7/msf-ubuntu-x64-meterpreter:latest /bin/bash -c "cd metasploit-payloads/java && make clean && make android && mvn -P deploy package"
+        working-directory: metasploit-payloads
 
       - name: Build Windows payloads via Visual Studio 2019 Build (Windows)
         shell: cmd

diff --git a/spec/acceptance/command_shell_spec.rb b/spec/acceptance/command_shell_spec.rb
@@ -56,7 +56,7 @@
         describe(
           Acceptance::CommandShell.human_name_for_payload(payload_config).to_s,
           if: (
-            Acceptance::CommandShell.run_meterpreter?(command_shell_config) &&
+            Acceptance::CommandShell.run_command_shell?(command_shell_config) &&
               Acceptance::CommandShell.supported_platform?(payload_config)
           )
         ) do
@@ -191,7 +191,7 @@ def get_file_attachment_contents(path)
                   # So only run this test when config_index == 0
                   payload_config_index == 0 && Acceptance::CommandShell.supported_platform?(payload_config)
                   # Run if ENV['METERPRETER'] = 'java php' etc
-                  Acceptance::CommandShell.run_meterpreter?(command_shell_config) &&
+                  Acceptance::CommandShell.run_command_shell?(command_shell_config) &&
                     # Only run payloads / tests, if the host machine can run them
                     Acceptance::CommandShell.supported_platform?(payload_config)
                 )
@@ -331,9 +331,9 @@ def get_file_attachment_contents(path)
                 it(
                   "#{Acceptance::CommandShell.current_platform}/#{command_shell_runtime_name} command shell successfully opens a session for the #{payload_config[:name].inspect} payload and passes the #{module_test[:name].inspect} tests",
                   if: (
-                    Acceptance::CommandShell.run_meterpreter?(command_shell_config) &&
+                    Acceptance::CommandShell.run_command_shell?(command_shell_config) &&
                       # Run if ENV['METERPRETER_MODULE_TEST'] = 'post/test/cmd_exec' etc
-                      Acceptance::CommandShell.run_meterpreter_module_test?(module_test[:name]) &&
+                      Acceptance::CommandShell.run_command_shell_module_test?(module_test[:name]) &&
                       # Only run payloads / tests, if the host machine can run them
                       Acceptance::CommandShell.supported_platform?(payload_config) &&
                       Acceptance::CommandShell.supported_platform?(module_test) &&

diff --git a/spec/support/acceptance/command_shell.rb b/spec/support/acceptance/command_shell.rb
@@ -15,22 +15,21 @@ def self.current_platform
   end
 
 
-  # TODO
-  # Allows restricting the tests of a specific Meterpreter's test suite with the METERPRETER environment variable
-  # @return [TrueClass, FalseClass] True if the given Meterpreter should be run, false otherwise.
-  def self.run_meterpreter?(meterpreter_config)
-    return true if ENV['METERPRETER'].blank?
+  # Allows restricting the tests of a specific command shell's test suite with the command shell environment variable
+  # @return [TrueClass, FalseClass] True if the given command shell should be run, false otherwise.
+  def self.run_command_shell?(command_shell_config)
+    return true if ENV['COMMAND_SHELL'].blank?
 
-    name = meterpreter_config[:name].to_s
-    ENV['METERPRETER'].include?(name)
+    name = command_shell_config[:name].to_s
+    ENV['COMMAND_SHELL'].include?(name)
   end
 
-  # Allows restricting the tests of a specific Meterpreter's test suite with the METERPRETER environment variable
-  # @return [TrueClass, FalseClass] True if the given Meterpreter should be run, false otherwise.
-  def self.run_meterpreter_module_test?(module_test)
-    return true if ENV['METERPRETER_MODULE_TEST'].blank?
+  # Allows restricting the tests of a specific command shell's test suite with the command shell environment variable
+  # @return [TrueClass, FalseClass] True if the given command shell should be run, false otherwise.
+  def self.run_command_shell_module_test?(module_test)
+    return true if ENV['COMMAND_SHELL_MODULE_TEST'].blank?
 
-    ENV['METERPRETER_MODULE_TEST'].include?(module_test)
+    ENV['COMMAND_SHELL_MODULE_TEST'].include?(module_test)
   end
 
   # @param [String] string A console string with ANSI escape codes present

diff --git a/spec/support/acceptance/command_shell/cmd.rb b/spec/support/acceptance/command_shell/cmd.rb
@@ -1,5 +1,3 @@
-# TODO: Not sure this should be under Meterpreter long term, but adding here for testing for now
-
 module Acceptance::CommandShell
   CMD = {
     payloads: [
@@ -143,10 +141,7 @@ module Acceptance::CommandShell
             known_failures: []
           },
           windows: {
-            known_failures: [
-              "[-] FAILED: should write REG_EXPAND_SZ values",
-              "[-] FAILED: should write REG_SZ unicode values"
-            ]
+            known_failures: []
           }
         }
       }

diff --git a/spec/support/acceptance/command_shell/linux.rb b/spec/support/acceptance/command_shell/linux.rb
@@ -1,5 +1,3 @@
-# TODO: Not sure this should be under Meterpreter long term, but adding here for testing for now
-
 module Acceptance::CommandShell
   LINUX = {
     payloads: [

diff --git a/spec/support/acceptance/command_shell/powershell.rb b/spec/support/acceptance/command_shell/powershell.rb
@@ -1,5 +1,3 @@
-# TODO: Not sure this should be under Meterpreter long term, but adding here for testing for now
-
 module Acceptance::CommandShell
   POWERSHELL = {
     payloads: [
@@ -144,7 +142,6 @@ module Acceptance::CommandShell
           },
           windows: {
             known_failures: [
-              "[-] FAILED: should write REG_EXPAND_SZ values",
               "[-] FAILED: should write REG_SZ unicode values"
             ]
           }