Refine SSH auth ordering and password fallback#144
Merged
skshetry merged 7 commits intoMay 16, 2026
Conversation
for more information, see https://pre-commit.ci
shcheklein
force-pushed
the
fix-ssh-auth-ordering-kbdint-fallback
branch
2 times, most recently
from
9538b1d to
5794215
Compare
shcheklein
force-pushed
the
fix-ssh-auth-ordering-kbdint-fallback
branch
from
5794215 to
7148f99
Compare
skshetry
reviewed
May 13, 2026
| if login_info.get("client_keys") or login_info.get("passphrase") is not None: | ||
| preferred_auth.append("publickey") | ||
| if login_info.get("password") is not None: | ||
| preferred_auth.extend(("password", "keyboard-interactive")) |
Collaborator
There was a problem hiding this comment.
I think this should be reverse, to match with asyncssh.
:param preferred_auth:
A list of authentication methods the client should attempt to
use in order of preference. By default, the preferred list is
gssapi-keyex, gssapi-with-mic, hostbased, publickey,
keyboard-interactive, and then password. This list may be
limited by which auth methods are implemented by the client
and which methods the server accepts.
Suggested change
| preferred_auth.extend(("password", "keyboard-interactive")) | |
| preferred_auth.extend(("keyboard-interactive", "password")) |
Collaborator
There was a problem hiding this comment.
@shcheklein, I think you need to also fix the assertions in the tests.
skshetry
reviewed
May 13, 2026
Co-authored-by: skshetry <18718008+skshetry@users.noreply.github.com>
for more information, see https://pre-commit.ci
skshetry
approved these changes
May 16, 2026
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.
Built on top of #143 and #141
This rewrites the earlier SSH password prompt fix around a narrower, protocol-aware auth selection strategy while keeping the keyboard-interactive password fallback fix.
Changes:
password,keyboard-interactivefor password-based loginspublickeywhen explicit key material is configuredpreferred_authconstructionThis should address unnecessary publickey/passphrase prompts without breaking servers which expose password login only through
keyboard-interactive.