Lookup user from ~/.ssh/config #628
Merged
Conversation
This file contains 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
|
@stacywsmith and @vnitinv to review |
vnitinv
reviewed
Dec 5, 2016
| @@ -833,11 +833,11 @@ def __init__(self, *vargs, **kvargs): | |||
| self._conf_ssh_private_key_file = None | |||
| # user can get updated by ssh_config | |||
| self._ssh_config = kvargs.get('ssh_config') | |||
| self._sshconf_lkup() | |||
There was a problem hiding this comment.
I agree adding this line which will override self._conf_ssh_private_key_file None value set in line 833 if that is configured in ssh config file.
vnitinv
reviewed
Dec 5, 2016
| # but if user or private key is explicit from call, then use it. | ||
| self._auth_user = kvargs.get('user') or self._conf_auth_user or \ | ||
| self._auth_user | ||
| self._ssh_private_key_file = kvargs.get('ssh_private_key_file') \ | ||
| or self._conf_ssh_private_key_file | ||
| self._ssh_private_key_file = kvargs.get('ssh_private_key_file') |
There was a problem hiding this comment.
why "or self._conf_ssh_private_key_file" was removed. If user has configured private key file in ssh config file, by removing the code the value will be set to None only.
There was a problem hiding this comment.
Yes, you are right. I don't know why I removed it. I have amended the commit.
vnitinv
reviewed
Dec 5, 2016
Due to a change in commit b03e611, the user wasn't extracted from user (or specified) SSH configuration. Add back the call to parse SSH configuration. Also, don't use the parsed private keyfile as it will be done automatically by the underlying Paramiko. Using the parsed key doesn't work, either because this is a list and not a string or because it is encrypted and I am using an agent.
vincentbernat
force-pushed
the
fix/user-from-ssh-config
branch
from
e1187aa
to
9d91b76
Compare
vincentbernat
added a commit
to vincentbernat/py-junos-eznc
that referenced
this pull request
Jan 13, 2017
This is a followup of Juniper#628 where this change was initially pushed but reverted because I didn't remember why I did it. Before Juniper#628, when an identity is provided in the SSH configuration, it was not copied in `_conf_ssh_private_key_file` due to a bug. After fixing the bug in Juniper#628, the key is now copied. However, the SSH configuration is provided to the `connect()` method which will use it if needed. Therefore, this is not needed. Moreover, if the key is provided by an agent and/or encrypted, this won't work as, later in the code, `allow_agent` will be set to `False` due to the presence of a private key.
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.
Due to a change in commit b03e611, the user wasn't extracted from
user (or specified) SSH configuration. Add back the call to parse SSH
configuration.
Also, don't use the parsed private keyfile as it will be done
automatically by the underlying Paramiko. Using the parsed key doesn't
work, either because this is a list and not a string or because it is
encrypted and I am using an agent.