Explicitly set the IdentityAgent path when using the issue mode
#23
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
LeSuisse
force-pushed
the
issue-mode-explicit-identity-agent-path
branch
from
a39657e
to
13d6008
Compare
isometry
reviewed
Aug 22, 2023
main.go
Outdated
| @@ -111,6 +111,7 @@ func processCommand() int { | |||
| // override default ssh-agent socket | |||
| os.Setenv("SSH_AUTH_SOCK", agent.SocketFile()) | |||
| log.Debugf("set SSH_AUTH_SOCK to %q\n", agent.SocketFile()) | |||
| sshClient.PrependArgs([]string{"-o", fmt.Sprintf("IdentityAgent=%s", agent.SocketFile())}) | |||
There was a problem hiding this comment.
Do you think there's value in continuing to set the SSH_AUTH_SOCK environment variable? At first glance, this would appear to complete negate the need to do so.
There was a problem hiding this comment.
Yes I had the same though but then I remembered that -o ProxyCommand=... exists and something might rely on it. I did not find any disadvantages to continue to set SSH_AUTH_SOCK so I kept it just in case.
I'm fine either way to be honest.
There was a problem hiding this comment.
Let's go with the minimalist DRY approach, and separately I'll look at adding some magic to avoid prepending the additional argument when it's not required:
Suggested change
| sshClient.PrependArgs([]string{"-o", fmt.Sprintf("IdentityAgent=%s", agent.SocketFile())}) | |
| sshClient.PrependArgs([]string{"-o", "IdentityAgent=SSH_AUTH_SOCK"}) |
LeSuisse
force-pushed
the
issue-mode-explicit-identity-agent-path
branch
from
13d6008
to
33e4b22
Compare
This make sure the appropriate path is used even if the IdentityAgent is set in a config. Without this change a user with the following config will not be able to connect because the SSH_AUTH_SOCK env variable will be overriden: ``` Host * IdentityAgent none IdentityFile ~/.ssh/id_ecdsa_sk ```
LeSuisse
force-pushed
the
issue-mode-explicit-identity-agent-path
branch
from
33e4b22
to
e98397c
Compare
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.
This make sure the appropriate path is used even if the IdentityAgent is set in a config.
Without this change a user with the following config will not be able to connect because the SSH_AUTH_SOCK env variable will be overriden: