Fix/68930 gen signature clean key#68934
Open
lubinatien wants to merge 2 commits intosaltstack:3006.xfrom
Open
Conversation
added 2 commits
April 13, 2026 17:06
gen_signature() was signing the raw pub key file content (which includes a trailing newline), but get_pub_str() sends clean_key(pub) to minions. This mismatch caused verify_pubkey_sig() to always fail when master_use_pubkey_signature was enabled. Apply clean_key() to the file content before signing so the signature matches what minions receive and verify against. Fixes: saltstack#68930
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
2 participants
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?
Applies
clean_key()to the pub key content ingen_signature()before signing, so the signature matches whatget_pub_str()sends to minions.What issues does this PR fix or reference?
Fixes #68930
Previous Behavior
gen_signature()signed the raw pub key file content (which includes a trailing newline from PEM encoding). Meanwhile,get_pub_str()sendsclean_key(pub)to minions. When minions calledverify_pubkey_sig(), the signature never matched the received content, causingmaster_use_pubkey_signature: Trueto always fail verification.New Behavior
gen_signature()now appliesclean_key()to the file content before signing. The signed content matches what minions receive viaget_pub_str(), soverify_pubkey_sig()succeeds.This is the same pattern applied in #66153 for the minion key auth path in
salt/channel/server.py.Merge requirements satisfied?
[NOTICE] Bug fixes or features added to Salt require tests.
Commits signed with GPG?
No