Skip to content

Commit ebdefa4

Browse files
committed
Run acceptance tests against old versions
1 parent e32fb1c commit ebdefa4

File tree

6 files changed

+16
-870
lines changed

6 files changed

+16
-870
lines changed

.github/workflows/ldap_acceptance.yml

Lines changed: 0 additions & 161 deletions
This file was deleted.

.github/workflows/meterpreter_acceptance.yml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ jobs:
6262
java_meterpreter_compilation:
6363
name: Compile Java Meterpreter
6464
runs-on: ubuntu-latest
65-
if: ${{ contains(github.event.pull_request.labels.*.name, 'payload-testing-branch') }}
65+
if: ${{ always() }}
6666

6767
env:
6868
metasploitPayloadsCommit: ${{ github.event.inputs.metasploitPayloadsCommit || 'master' }}
@@ -128,8 +128,8 @@ jobs:
128128

129129
env:
130130
RAILS_ENV: test
131-
metasploitPayloadsCommit: ${{ github.event.inputs.metasploitPayloadsCommit || 'master' }}
132-
mettleCommit: ${{ github.event.inputs.mettleCommit|| 'master' }}
131+
metasploitPayloadsCommit: ${{ 'master' }}
132+
mettleCommit: ${{ 'master' }}
133133
HOST_RUNNER_IMAGE: ${{ matrix.os }}
134134
SESSION: 'meterpreter/${{ matrix.meterpreter.name }}'
135135
SESSION_RUNTIME_VERSION: ${{ matrix.meterpreter.runtime_version }}
@@ -180,41 +180,42 @@ jobs:
180180
# └── metasploit-payloads (Only if the "payload-testing-branch" GitHub label is applied)
181181
# └── mettle (Only if the "payload-testing-mettle-branch" GitHub label is applied)
182182
- name: Checkout mettle
183-
if: ${{ matrix.meterpreter.name == 'mettle' && contains(github.event.pull_request.labels.*.name, 'payload-testing-mettle-branch') }}
183+
if: ${{ matrix.meterpreter.name == 'mettle' }}
184184
uses: actions/checkout@v4
185185
with:
186-
repository: rapid7/mettle
186+
repository: smashery/mettle
187187
path: mettle
188188
ref: ${{ env.mettleCommit }}
189189

190190
- name: Get mettle version
191-
if: ${{ matrix.meterpreter.name == 'mettle' && contains(github.event.pull_request.labels.*.name, 'payload-testing-mettle-branch') }}
191+
if: ${{ matrix.meterpreter.name == 'mettle' }}
192192
run: |
193193
echo "METTLE_VERSION=$(grep -oh '[0-9].[0-9].[0-9]*' lib/metasploit_payloads/mettle/version.rb)" | tee -a $GITHUB_ENV
194194
working-directory: mettle
195195

196196
- name: Prerequisite mettle gem setup
197-
if: ${{ matrix.meterpreter.name == 'mettle' && contains(github.event.pull_request.labels.*.name, 'payload-testing-mettle-branch') }}
197+
if: ${{ matrix.meterpreter.name == 'mettle' }}
198198
run: |
199199
set -x
200200
ruby -pi.bak -e "gsub(/${{ env.METTLE_VERSION }}/, '${{ env.METTLE_VERSION }}-dev')" lib/metasploit_payloads/mettle/version.rb
201201
working-directory: mettle
202202

203203
- name: Compile mettle payloads
204-
if: ${{ matrix.meterpreter.name == 'mettle' && runner.os != 'macos' && contains(github.event.pull_request.labels.*.name, 'payload-testing-mettle-branch') }}
204+
if: ${{ matrix.meterpreter.name == 'mettle' && runner.os != 'macos' }}
205205
run: |
206206
docker run --rm=true --tty --volume=$(pwd):/mettle --workdir=/mettle rapid7/build:mettle rake mettle:build mettle:check
207207
rake build
208208
working-directory: mettle
209209

210210
- name: Compile mettle payloads - macOS
211-
if: ${{ matrix.meterpreter.name == 'mettle' && runner.os == 'macos' && contains(github.event.pull_request.labels.*.name, 'payload-testing-mettle-branch') }}
211+
if: ${{ matrix.meterpreter.name == 'mettle' && runner.os == 'macos' }}
212212
run: |
213213
make TARGET=x86_64-apple-darwin
214214
rake build
215215
working-directory: mettle
216216

217217
- name: Checkout metasploit-framework code
218+
if: ${{ always() }}
218219
uses: actions/checkout@v4
219220
with:
220221
path: metasploit-framework
@@ -230,7 +231,7 @@ jobs:
230231
working-directory: metasploit-framework
231232

232233
- name: Move mettle gem into framework
233-
if: ${{ matrix.meterpreter.name == 'mettle' && contains(github.event.pull_request.labels.*.name, 'payload-testing-mettle-branch') }}
234+
if: ${{ matrix.meterpreter.name == 'mettle' }}
234235
run: |
235236
cp ../mettle/pkg/metasploit_payloads-mettle-${{ env.METTLE_VERSION }}.pre.dev.gem .
236237
working-directory: metasploit-framework
@@ -260,7 +261,7 @@ jobs:
260261
cp -r $download_path/java-artifacts/data/* ./metasploit-framework/data
261262
262263
- name: Install mettle gem
263-
if: ${{ matrix.meterpreter.name == 'mettle' && contains(github.event.pull_request.labels.*.name, 'payload-testing-mettle-branch') }}
264+
if: ${{ matrix.meterpreter.name == 'mettle' }}
264265
run: |
265266
set -x
266267
bundle exec gem install metasploit_payloads-mettle-${{ env.METTLE_VERSION }}.pre.dev.gem
@@ -271,16 +272,15 @@ jobs:
271272
working-directory: metasploit-framework
272273

273274
- name: Checkout metasploit-payloads
274-
if: contains(github.event.pull_request.labels.*.name, 'payload-testing-branch')
275275
uses: actions/checkout@v4
276276
with:
277-
repository: rapid7/metasploit-payloads
277+
repository: smashery/metasploit-payloads
278278
path: metasploit-payloads
279279
ref: ${{ env.metasploitPayloadsCommit }}
280280

281281
- name: Build Windows payloads via Visual Studio 2019 Build (Windows)
282282
shell: cmd
283-
if: ${{ matrix.meterpreter.name == 'windows_meterpreter' && matrix.os == 'windows-2019' && contains(github.event.pull_request.labels.*.name, 'payload-testing-branch') }}
283+
if: ${{ matrix.meterpreter.name == 'windows_meterpreter' && matrix.os == 'windows-2019' }}
284284
run: |
285285
cd c/meterpreter
286286
git submodule init && git submodule update
@@ -289,15 +289,15 @@ jobs:
289289

290290
- name: Build Windows payloads via Visual Studio 2022 Build (Windows)
291291
shell: cmd
292-
if: ${{ matrix.meterpreter.name == 'windows_meterpreter' && matrix.os == 'windows-2022' && contains(github.event.pull_request.labels.*.name, 'payload-testing-branch') }}
292+
if: ${{ matrix.meterpreter.name == 'windows_meterpreter' && matrix.os == 'windows-2022' }}
293293
run: |
294294
cd c/meterpreter
295295
git submodule init && git submodule update
296296
make.bat
297297
working-directory: metasploit-payloads
298298

299299
- name: Build PHP, Python and Windows payloads
300-
if: ${{ (matrix.meterpreter.name == 'php' || matrix.meterpreter.name == 'python' || runner.os == 'Windows') && contains(github.event.pull_request.labels.*.name, 'payload-testing-branch') }}
300+
if: ${{ ((matrix.meterpreter.name == 'php') || (matrix.meterpreter.name == 'python') || (runner.os == 'Windows')) }}
301301
run: |
302302
make install-php install-python install-windows
303303
working-directory: metasploit-payloads

0 commit comments

Comments
 (0)