-
Notifications
You must be signed in to change notification settings - Fork 5.6k
ssh_auth and ssh fixes for 3006.x and 3007.x #68405
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
piterpunk
wants to merge
5
commits into
saltstack:3006.x
Choose a base branch
from
piterpunk:ssh_auth_fixes_3006.x
base: 3006.x
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
+504
−68
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
Author
|
While testing, I check #63434 and it seems to already being fixed somewhere in time. |
df85c32 to
5615b2f
Compare
bdrx312
reviewed
Oct 18, 2025
5615b2f to
002b46d
Compare
Contributor
|
Thanks. Nice job. |
bdrx312
reviewed
Oct 23, 2025
Contributor
bdrx312
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good.
9e056c2 to
67421cc
Compare
twangboy
approved these changes
Oct 31, 2025
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 changes the how
ssh_auth.presentandssh_auth.absenthandles when the keys to be added or removed comes from a source file. This fixes:optionshandling when using source file;Added in this patch is a fix to handle keys with @ and . in their encryption types and many tests to execution module
ssh.pyand state modulessh_auth.py:ssh_auth.pyagainst all supported OpenSSH 8.7 key types;ssh.set_auth_key_from_fileis correctly called fromssh_auth.presentsending theoptionsif specified;ssh.rm_auth_key_from_fileis correctly called fromssh_auth.absentssh.set_auth_key_from_fileandssh.rm_auth_key_from_filecorrectly handles multiple keysssh.set_auth_key_from_fileandssh.rm_auth_key_from_fileaccept keys with @ and .ssh.set_auth_key_from_fileandssh.rm_auth_key_from_fileparses multiple words commentsssh._validate_keysagainst all encryption keys supported by OpenSSH 8.7, with options, without options, with simple comments, with multiple word comments and even without any comment.I hope this set of tests are enough to prevent any regression and warranty that reading keys from source works flawlessly.
What issues does this PR fix or reference?
Fixes #68403
Fixes #61299
Fixes #60769
Fixes #57447
Fixes #40078
Tests #63434
Previous Behavior
optionsweren't respected when reading keys from fileNew Behavior
optionsoverwrites those in the key when reading keys from fileMerge requirements satisfied?
Commits signed with GPG?
No