Only use username from ssh config as default#470
Open
hexahurz wants to merge 1 commit into
Open
Conversation
hexahurz
force-pushed
the
overwrite_username
branch
from
2cd9cb2 to
38c2aaf
Compare
Member
|
Hi, thank you for your contribution. Could you provide test cases for the fix, please? |
If a username is specified in the `Login` keyword, it should supersede the username from the ssh config.
hexahurz
force-pushed
the
overwrite_username
branch
from
38c2aaf to
8c455db
Compare
Author
|
Rebased and added tests. |
Author
|
Hi @Noordsestern, Any feedback, comments, or thoughts? Or am I done and you will pick this up for the next release? Just making sure you're not waiting for anything from me... |
There was a problem hiding this comment.
Pull request overview
Updates SSHLibrary’s ssh-config username handling so that a username explicitly provided to Login is not overridden by ~/.ssh/config, while keeping ssh-config as a default source when no username is supplied.
Changes:
- Adjust password-based
_loginto only apply the ssh-config username when the caller did not provide a username. - Add an acceptance test covering “explicit username overrides ssh-config user”.
- Extend acceptance-test docs/resources to include a new
test_user_hostnamessh-config host alias.
Reviewed changes
Copilot reviewed 4 out of 4 changed files in this pull request and generated 3 comments.
| File | Description |
|---|---|
| src/SSHLibrary/client.py | Changes ssh-config username application logic for password-based login to preserve explicitly provided usernames. |
| atest/resources/common.robot | Adds ${TEST_USER_HOSTNAME} variable for the new acceptance test. |
| atest/README.rst | Documents adding test_user_hostname to ~/.ssh/config for running acceptance tests. |
| atest/login.robot | Adds a new acceptance test asserting explicit username supersedes ssh-config user. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Comment on lines
+887
to
+890
| self.config.host, username_from_config, self.config.port, proxy_cmd = \ | ||
| self._read_login_ssh_config(hostname, username, self.config.port, proxy_cmd) | ||
| if not username or username == b'None': | ||
| username = username_from_config |
Comment on lines
+889
to
+890
| if not username or username == b'None': | ||
| username = username_from_config |
Comment on lines
+73
to
+75
| Login With Specified User Differing From Config File | ||
| [Setup] Open Connection ${TEST_USER_HOSTNAME} prompt=${PROMPT} | ||
| Login ${USERNAME} ${PASSWORD} read_config=True |
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
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.
If a username is specified in the
Loginkeyword, it should supersede the username from the ssh config.