Bugfix/68493 invalid master key#68750
Draft
harshang03 wants to merge 2 commits intosaltstack:masterfrom
Draft
Conversation
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.
What does this PR do?
Hardens master pubkey validation so minions don’t fail with “Invalid master key” after restart when the cached key is empty/invalid, and improves recovery/logging.
Normalizes/reads/writes master pubkeys and detects invalid cached keys (salt/utils/minion.py).
Compares normalized keys and updates stored pubkey on verified rotation; fails fast if local key is unreadable (salt/crypt.py).
Logs actionable guidance and cleans invalid cached key during minion/syndic connect loops (salt/minion.py).
What issues does this PR fix or reference?
Fixes #68493
Previous Behavior
A restart could leave an empty/invalid minion_master.pub, causing “Invalid master key” errors and preventing reconnection until the file was manually removed.
New Behavior
Invalid/empty cached master keys are detected, logged with guidance, and removed so the minion can re-authenticate; verified key rotations update the cached key safely.
Merge requirements satisfied?
[NOTICE] Bug fixes or features added to Salt require tests.
Commits signed with GPG?
No