[master] salt.channel.server.handle_message: be more defensive #66909
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
salt-project-bot-prod-environment
bot
changed the title
twangboy
requested changes
Sep 20, 2024
|
@twangboy will do, still looking at that. thanks |
it's possible _encrypt_private can throw depending on what key backend is used; so we should guard against any possible unhandled exceptions in this critical codepath. We already do this when wrapping the payload_handler, so we just move the other code in the same try.
|
@twangboy I didn't change anything but pushed the changelog.md, it seems to be passing minus one test. would you mind a sanity check/merge? Thanks 👍 |
twangboy
approved these changes
Sep 23, 2024
Akm0d
approved these changes
Sep 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.
What does this PR do?
it's possible _encrypt_private can throw depending on what key backend is used; so we should guard against any possible unhandled exceptions in this critical codepath. We already do this when wrapping the payload_handler, so we just move the other code in the same try.
I've also added some tests to cover different scenarios in handle_message as its untested atm.
Merge requirements satisfied?
[NOTICE] Bug fixes or features added to Salt require tests.
Commits signed with GPG?
No