Fix TypeError on bare-string master responses to pillar requests #69260
Open
dwoz wants to merge 1 commit into
Open
Fix TypeError on bare-string master responses to pillar requests #69260dwoz wants to merge 1 commit into
dwoz wants to merge 1 commit into
Conversation
…tstack#69228) When the master returns a bare string error ("bad load", "Some exception handling minion payload", "Server-side exception handling payload") for a pillar request, the minion's crypted_transfer_decode_dictentry crashed with "TypeError: string indices must be integers" at ret["key"]. The "key" not in ret guard accidentally passed for strings (substring check), the post-reauth retry returned the same string, and the indexing blew up. Raise a clean AuthenticationError when the post-reauth response is still not a dict containing "key", so the caller can fail or retry instead of crashing. Matches the cluster_retry-decorated guard already on 3008.x / master (commit 2efc32e). Add a parametrized regression test covering all three server-side string error returns.
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
1 participant
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.
fixes #69228
When the master returns a bare string error ("bad load", "Some exception handling minion payload",
"Server-side exception handling payload") for a pillar request, the minion's crypted_transfer_decode_dictentry crashed with "TypeError: string indices must be integers" at ret["key"]. The "key" not in ret guard accidentally passed for strings (substring check), the post-reauth retry returned the same string, and the indexing blew up.
Raise a clean AuthenticationError when the post-reauth response is still not a dict containing "key", so the caller can fail or retry instead of crashing. Matches the cluster_retry-decorated guard already on 3008.x / master (commit 2efc32e).
Add a parametrized regression test covering all three server-side string error returns.