Builds metasploit-payload gem as part of acceptance tests #19575
+28
−3
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
cgranleese-r7
force-pushed
the
adds-gem-handling-to-accpetance-tests
branch
from
94c84de
to
5a20fcb
Compare
cgranleese-r7
added
payload-testing-mettle-branch
cgranleese-r7
force-pushed
the
adds-gem-handling-to-accpetance-tests
branch
from
5a20fcb
to
31e780b
Compare
jvoisin
reviewed
Oct 21, 2024
| @@ -159,7 +159,7 @@ jobs: | |||
| - name: Get mettle version | |||
| if: ${{ matrix.meterpreter.name == 'mettle' && inputs.build_mettle }} | |||
| run: | | |||
| echo "METTLE_VERSION=$(grep -oh '[0-9].[0-9].[0-9]*' lib/metasploit_payloads/mettle/version.rb)" | tee -a $GITHUB_ENV | |||
| echo "METTLE_VERSION=$(ruby -ne 'puts $& if /[0-9].[0-9].[0-9]*/' lib/metasploit_payloads/mettle/version.rb)" | tee -a $GITHUB_ENV | |||
There was a problem hiding this comment.
Suggested change
| echo "METTLE_VERSION=$(ruby -ne 'puts $& if /[0-9].[0-9].[0-9]*/' lib/metasploit_payloads/mettle/version.rb)" | tee -a $GITHUB_ENV | |
| echo "METTLE_VERSION=$(ruby -ne 'puts $& if /[0-9][.][0-9][.][0-9]*/' lib/metasploit_payloads/mettle/version.rb)" | tee -a $GITHUB_ENV |
Otherwise, . will match any character.
There was a problem hiding this comment.
@cgranleese-r7 It'd be worth verifying that the old/new regexes supports multiple digit releases too, i.e. 1.10.0
There was a problem hiding this comment.
Hopefully this link works - https://regex101.com/r/W8QwSG/1
I looked at this again this morning and @adfoster-r7 was right, it wasn't matching 1.10.0. So I have landed on the following regex, which seems to cover everything I need 🤞:
\d+\.?(\*|\d+\.)?(\*|\d+)
This will match:
- 1.1
- 11.1
- 1.11
- 11.11
- 111.111.1
- 111.111.111
- 1.0.0
- 1.1.0
There was a problem hiding this comment.
It might be more future proof things to use:
ruby -ne "puts Regexp.last_match(1) if /VERSION\s+=\s+'([^']+)'/" lib/metasploit_payloads/mettle/version.rb
That way you'll be able to handle words etc in releases, such as VERSION = '1.11.0.beta1' etc
cgranleese-r7
force-pushed
the
adds-gem-handling-to-accpetance-tests
branch
6 times, most recently
from
8dc0883
to
a349615
Compare
adfoster-r7
reviewed
Oct 22, 2024
| - name: Get metasploit-payloads version | ||
| if: ${{ inputs.build_metasploit_payloads && matrix.meterpreter.name != 'mettle' }} | ||
| shell: bash | ||
| run: echo "METASPLOIT_PAYLOADS_VERSION=$(ruby -ne 'puts Regexp.last_match(1) if /VERSION\s+=\s+'([^']+)'/' gem/lib/metasploit-payloads/version.rb)" | tee -a $GITHUB_ENV |
There was a problem hiding this comment.
The quote handling here needs some extra cycles to work 👍
cgranleese-r7
force-pushed
the
adds-gem-handling-to-accpetance-tests
branch
2 times, most recently
from
959fbfb
to
0fca57d
Compare
cgranleese-r7
force-pushed
the
adds-gem-handling-to-accpetance-tests
branch
from
0fca57d
to
86f9554
Compare
adfoster-r7
approved these changes
Oct 24, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR adds support for metasploit-payloads gem being built as part of the acceptance testing. Continuation off #19564.
Verification
payload-testing-branchandpayload-testing-mettle-branchlabels applied, ensure those jobs build the appropriate gems as part of the workflows