-
Notifications
You must be signed in to change notification settings - Fork 5.5k
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
ssh: allow all additional ssh key types #60128
Conversation
d904837
to
3cecf4c
Compare
Hey @MEschenbacher are you still wanting to make more changes to this PR? We can get this into Si just need to keep moving along |
The PR should be complete as far as changes to code are concerned. Are you fine with the changes themselves? I'm assuming in order to move along, I need to check all boxes? |
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.
This will require a changelog file.
Okay, I'm now waiting for the final call as to whether we allow any pubkey type or continue maintaining an allowlist of types. |
Continue maintaining a list for now please. |
60c0d85
to
6bc50ea
Compare
Maintaining an allow list for now and rebased on master. I'm not sure if https://github.com/saltstack/salt/blob/master/salt/states/ssh_auth.py and https://github.com/saltstack/salt/blob/master/salt/states/ssh_auth.py need some care, too. The regex look to be only allowing |
6bc50ea
to
1a315ca
Compare
f7cbae2
to
8e51968
Compare
I think the debian test is the last one to address here, and there's only one, and then we should be good to go! |
020db98
to
f95cd61
Compare
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.
Pre-commit and tests need to be fixed still.
I've added a few tests and I'm not sure if they assert that all salt modules and states with a ssh key type accept the additional key types. As far as the failing test for debian jinja filters is concerned: need to look into it. |
The jinja filters tests is a know failing test that someone else is working on and is not related to this PR. The pre-commit and lint test failures will need to be cleaned up though. |
I went ahead and pushed a fix for pre-commit and lint. Just waiting on the test results. |
@MEschenbacher is this still WIP? Or is it ready for review and merge? |
Ready for review and merge. |
Congratulations on your first PR being merged! 🎉 |
What does this PR do?
Propose a fix for #59429 by extending the list of allowed ssh public key types in
salt/modules/ssh.py
as of openssh 8.5.What issues does this PR fix or reference?
Fixes: #59429
Merge requirements satisfied?
[NOTICE] Bug fixes or features added to Salt require tests.
Commits signed with GPG?
Yes
Please review Salt's Contributing Guide for best practices.
See GitHub's page on GPG signing for more information about signing commits with GPG.