Add PHP adapters and refactor PHP payloads#20160
Merged
bwatters-r7 merged 6 commits intorapid7:masterfrom Jun 9, 2025
Merged
Conversation
df92d85 to
6308762
Compare
jvoisin
reviewed
May 11, 2025
6308762 to
e009e14
Compare
sjanusz-r7
reviewed
May 15, 2025
lib/msf/core/payload/php.rb
Outdated
|
|
||
| @dis = dis | ||
| dis = options[:disabled_varname] || vars[:disabled_varname] | ||
| dis = '$' + dis unless dis.start_with?('$') |
Contributor
There was a problem hiding this comment.
Is this expected to be misaligned like this?
I would think rubocop would have caught this, but maybe it gets aligned with the = further down in the file?
e009e14 to
ed2d73d
Compare
6 tasks
bwatters-r7
reviewed
May 22, 2025
a033d51 to
029f4b7
Compare
Contributor
Author
|
I need to rebase this again now that #19976 was landed. I didn't realize there was already a PR to do some of this but this still adds a second adapter and some much needed refactoring. |
d472a5d to
6c05ffb
Compare
bwatters-r7
approved these changes
Jun 6, 2025
Contributor
Release NotesAdds two PHP adapters, one for going to ARCH_CMD and one for coming from ARCH_CMD. |
Contributor
Author
|
I saw this was approved and release notes have been written. Should it be merged? |
4 tasks
This file contains hidden or 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
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 adds two PHP adapters, one for going to ARCH_CMD and one for coming from ARCH_CMD. This requires changes added to rapid7/rex-random_identifier#16 to define the PHP language that's now used in a few places. While refactoring code, it became pretty clear that the function to generate a PHP stub that executes a command had been copy-pasted quite a few times. There's now a mixing method providing it in a single location. It shouldn't be necessary moving forward though because module authors can just use the adapter now which does the same thing, no new target definition required.
Three payloads were removed that were effectively just invocations of Perl commands from PHP. There are ARCH_CMD equivalents of those payloads, so keeping them and refactoring them was redundant and unnecessary.
php/unix/cmd/*payloadscmd/unix/php/payloads