Enforce correct transfer settled flag (backport #12371) #12379
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
![mergify[bot]](https://avatars.githubusercontent.com/in/10562?s=60&v=4){kind=small}
For messages published to RabbitMQ, RabbitMQ honors the transfer `settled` field, no matter what value the sender settle mode was set to in the attach frame. Therefore, prior to this commit, a client could send a transfer with `settled=true` even though sender settle mode was set to `unsettled` in the attach frame. This commit enforces that the publisher sets only transfer `settled` fields that are valid with the spec. If sender settle mode is: * `unsettled`, the transfer `settled` flag must be `false`. * `settled`, the transfer `settled` flag must be `true`. * `mixed`, the transfer `settled` flag can be `true` or `false`. (cherry picked from commit 9d7ebf3)
The shovel violated the AMQP 1.0 spec by sending transfers with settled=true under sender settle mode unsettled (in case of shovel ack-mode being on-publish). (cherry picked from commit c0fbc1a)
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.
For messages published to RabbitMQ, RabbitMQ honors the transfer
settledfield, no matter what value the sender settle mode was set to in the attach frame.Therefore, prior to this commit, a client could send a transfer with
settled=trueeven though sender settle mode was set tounsettledin the attach frame.This commit enforces that the publisher sets only transfer
settledfields that are valid with the spec.If sender settle mode is:
unsettled, the transfersettledflag must befalse.settled, the transfersettledflag must betrue.mixed, the transfersettledflag can betrueorfalse.This PR also fixes a bug in the AMQP 1.0 shovel:
The shovel violated the AMQP 1.0 spec by sending transfers with
settled=trueunder sender settle modeunsettledif shovelack-modeis set toon-publish.This PR will break shovels if:
ack-modevalueon-publishGiven all three combinations combined are extremely rare,
on-publishalone is already a rare setting (on-confirmwhich is the default, orno-ackmake much more sense thanon-publish), I think it's fine to backport this PR tov4.0.x. In case someone hits this combination, the user can change theack-mode.This is an automatic backport of pull request #12371 done by [Mergify](https://mergify.com).