From 19302e1c5ded21e4081c44392bf464bda009b11b Mon Sep 17 00:00:00 2001 From: Spencer McIntyre Date: Wed, 6 Nov 2024 17:35:40 -0500 Subject: [PATCH 1/4] Remove a test that should be working now --- spec/support/acceptance/session/java.rb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/spec/support/acceptance/session/java.rb b/spec/support/acceptance/session/java.rb index 99ca708eda06..029ce6e672f0 100644 --- a/spec/support/acceptance/session/java.rb +++ b/spec/support/acceptance/session/java.rb @@ -117,9 +117,7 @@ module Acceptance::Session known_failures: [] }, windows: { - known_failures: [ - "[-] [should delete a symbolic link target] failed to create the symbolic link" - ] + known_failures: [] } } }, From 7e2df70b14e675ae18fb0e359b3976d01d64605c Mon Sep 17 00:00:00 2001 From: Spencer McIntyre Date: Thu, 7 Nov 2024 14:02:57 -0500 Subject: [PATCH 2/4] Update the acceptance testing definition for now --- .../workflows/shared_meterpreter_acceptance.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/workflows/shared_meterpreter_acceptance.yml b/.github/workflows/shared_meterpreter_acceptance.yml index e595308e2652..68b5349811f9 100644 --- a/.github/workflows/shared_meterpreter_acceptance.yml +++ b/.github/workflows/shared_meterpreter_acceptance.yml @@ -36,15 +36,16 @@ jobs: java_meterpreter_compilation: name: Compile Java Meterpreter runs-on: ubuntu-latest - if: ${{ inputs.build_metasploit_payloads }} + # temporarily force compiling the java meterpreter by removing this conditional + #if: ${{ inputs.build_metasploit_payloads }} steps: - name: Checkout metasploit-payloads uses: actions/checkout@v4 with: - repository: rapid7/metasploit-payloads + repository: zeroSteiner/metasploit-payloads path: metasploit-payloads - ref: ${{ inputs.metasploit_payloads_commit }} + ref: fix/met/java/symlinks - name: Build Java and Android payloads run: | @@ -185,9 +186,9 @@ jobs: - name: Checkout metasploit-framework commit uses: actions/checkout@v4 with: - repository: rapid7/metasploit-framework + repository: zeroSteiner/metasploit-framework path: metasploit-framework - ref: ${{ inputs.metasploit_framework_commit }} + ref: fix/met/java-win-symlink-tests - name: Setup Ruby env: @@ -246,9 +247,9 @@ jobs: if: ${{ inputs.build_metasploit_payloads && matrix.meterpreter.name != 'mettle' }} uses: actions/checkout@v4 with: - repository: rapid7/metasploit-payloads + repository: zeroSteiner/metasploit-payloads path: metasploit-payloads - ref: ${{ inputs.metasploit_payloads_commit }} + ref: fix/met/java/symlinks - name: Get metasploit-payloads version if: ${{ inputs.build_metasploit_payloads && matrix.meterpreter.name != 'mettle' }} From 7994c1614139f41f49ee21d11a975f7d63eb9a4f Mon Sep 17 00:00:00 2001 From: Spencer McIntyre Date: Fri, 6 Dec 2024 11:55:12 -0500 Subject: [PATCH 3/4] Revert "Update the acceptance testing definition for now" This reverts commit 1ef34d7d8f12d5588914258f6e4e35ed923afcad. --- .../workflows/shared_meterpreter_acceptance.yml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/.github/workflows/shared_meterpreter_acceptance.yml b/.github/workflows/shared_meterpreter_acceptance.yml index 68b5349811f9..e595308e2652 100644 --- a/.github/workflows/shared_meterpreter_acceptance.yml +++ b/.github/workflows/shared_meterpreter_acceptance.yml @@ -36,16 +36,15 @@ jobs: java_meterpreter_compilation: name: Compile Java Meterpreter runs-on: ubuntu-latest - # temporarily force compiling the java meterpreter by removing this conditional - #if: ${{ inputs.build_metasploit_payloads }} + if: ${{ inputs.build_metasploit_payloads }} steps: - name: Checkout metasploit-payloads uses: actions/checkout@v4 with: - repository: zeroSteiner/metasploit-payloads + repository: rapid7/metasploit-payloads path: metasploit-payloads - ref: fix/met/java/symlinks + ref: ${{ inputs.metasploit_payloads_commit }} - name: Build Java and Android payloads run: | @@ -186,9 +185,9 @@ jobs: - name: Checkout metasploit-framework commit uses: actions/checkout@v4 with: - repository: zeroSteiner/metasploit-framework + repository: rapid7/metasploit-framework path: metasploit-framework - ref: fix/met/java-win-symlink-tests + ref: ${{ inputs.metasploit_framework_commit }} - name: Setup Ruby env: @@ -247,9 +246,9 @@ jobs: if: ${{ inputs.build_metasploit_payloads && matrix.meterpreter.name != 'mettle' }} uses: actions/checkout@v4 with: - repository: zeroSteiner/metasploit-payloads + repository: rapid7/metasploit-payloads path: metasploit-payloads - ref: fix/met/java/symlinks + ref: ${{ inputs.metasploit_payloads_commit }} - name: Get metasploit-payloads version if: ${{ inputs.build_metasploit_payloads && matrix.meterpreter.name != 'mettle' }} From 83fcc32780765c39e0432eae518b8b835bd382b8 Mon Sep 17 00:00:00 2001 From: Spencer McIntyre Date: Fri, 6 Dec 2024 12:26:38 -0500 Subject: [PATCH 4/4] Update metasploit-payloads gem to 2.0.189 Includes changes from: * rapid7/metasploit-payloads#731 * rapid7/metasploit-payloads#730 --- Gemfile.lock | 4 ++-- LICENSE_GEMS | 2 +- metasploit-framework.gemspec | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index f0a3b9493daf..ece0cc3b020a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -42,7 +42,7 @@ PATH metasploit-concern metasploit-credential metasploit-model - metasploit-payloads (= 2.0.187) + metasploit-payloads (= 2.0.189) metasploit_data_models metasploit_payloads-mettle (= 1.0.35) mqtt @@ -300,7 +300,7 @@ GEM activemodel (~> 7.0) activesupport (~> 7.0) railties (~> 7.0) - metasploit-payloads (2.0.187) + metasploit-payloads (2.0.189) metasploit_data_models (6.0.5) activerecord (~> 7.0) activesupport (~> 7.0) diff --git a/LICENSE_GEMS b/LICENSE_GEMS index 8c12d80f34b8..faca6f7267ff 100644 --- a/LICENSE_GEMS +++ b/LICENSE_GEMS @@ -90,7 +90,7 @@ metasploit-concern, 5.0.3, "New BSD" metasploit-credential, 6.0.11, "New BSD" metasploit-framework, 6.4.40, "New BSD" metasploit-model, 5.0.2, "New BSD" -metasploit-payloads, 2.0.187, "3-clause (or ""modified"") BSD" +metasploit-payloads, 2.0.189, "3-clause (or ""modified"") BSD" metasploit_data_models, 6.0.5, "New BSD" metasploit_payloads-mettle, 1.0.35, "3-clause (or ""modified"") BSD" method_source, 1.1.0, MIT diff --git a/metasploit-framework.gemspec b/metasploit-framework.gemspec index ddec5cf4b716..b2025223fe7c 100644 --- a/metasploit-framework.gemspec +++ b/metasploit-framework.gemspec @@ -74,7 +74,7 @@ Gem::Specification.new do |spec| # are needed when there's no database spec.add_runtime_dependency 'metasploit-model' # Needed for Meterpreter - spec.add_runtime_dependency 'metasploit-payloads', '2.0.187' + spec.add_runtime_dependency 'metasploit-payloads', '2.0.189' # Needed for the next-generation POSIX Meterpreter spec.add_runtime_dependency 'metasploit_payloads-mettle', '1.0.35' # Needed by msfgui and other rpc components