Fix adapted payload stage encoding #17721
Merged
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
|
Excellent! Thank you - this will pay dividends when we upstream w^x stagers as stage encoding needs RWX which doesn't play well there. Should also let me clean up the RC4 x86 hackery - register pressure requires X on the memory region being decrypted whereas x64 handles decryption just fine with RW. |
|
Old and busted: New and improved: More testing: |
Release NotesThis fixes an issue where payloads that were adapted failed when stage encoding was enabled because the stage encoding was based on the stager arch and platform values. These values were always the same until we introduced adapted payloads, which can vary. |
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 fixes issue #17720 where payloads that were adapted were failing when stage encoding was enabled. This was due to the stage encoding assuming that the stage arch+platform were the same as the payload / stager. The adapters break this assumption by allowing them to be different values.
This update modifies the Stager mixin to use the new
stage_archandstage_platformvalues for determining compatible encoders. These new attributes default to the payload values but are set to the adapted values by adapted payloads. This ensures that the stage is able to be encoded correctly by properly selecting a compatible encoder. TheEncodedPayloadclass was also updated to allow an explicitArchandPlatformto be specified which is used by the stager to pass the stage information for use instead of the original payloads.This also updates the Windows shell stage to honor the
EnableStageEncodingoption by not overridingenable_stage?. Instead theEnableStageEncodingoption is set as a default value since it makes sense but this way users can still turn it off if they'd like.Verification
Start msfconsole and try payloads in staged and unstaged configurations that are both adapted and not adapted.
run TARGET=Command PAYLOAD=cmd/windows/powershell/shell/reverse_tcp EnableStageEncoding=truerun TARGET=Command PAYLOAD=cmd/windows/powershell/shell/reverse_tcp EnableStageEncoding=falserun TARGET=Command PAYLOAD=cmd/windows/powershell/shell_reverse_tcprun TARGET=Automatic PAYLOAD=windows/x64/meterpreter/reverse_tcp EnableStageEncoding=true