[Backport release-25.05] fix(service/gpg-agent): ensure SSH_AUTH_SOCK is set on Darwin #8041
+2
−1
Conversation
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
…mmunity#7117) This commit addresses nix-community#5997 At the root, the gpg-agent SSH integration is not working on Darwin because shells are started with `SSH_AUTH_SOCK` already set to something like `/private/tmp/com.apple.launchd.ozLmoURHDC/Listeners`, which prevents the hook from setting the variable to the gpg-agent's socket. This commit fixes the issue using a different mechanism to detect if the current shell has already had the `SSH_AUTH_SOCK` variable set to the gpg-agent's socket, namely by checking for `gnupg_SSH_AUTH_SOCK_by` as documented in https://www.gnupg.org/documentation/manuals/gnupg/Agent-Examples.html#Agent-Examples. This is essentially a simplified version of nix-community#5901 that does not attempt to migrate gpg-agent over to launchd. Signed-off-by: squat <lserven@gmail.com>
…munity#7355) nix-community#7117 (comment) noted that nix-community#7117 broke compatibility with forwarding ssh-agents using `ssh -A`/`ForwardAgent`. In order to continue supporting the fix for the issue raised in nix-community#5997 and address the compatibility problem mentioned by @euank, this commit introduces the solution described in nix-community#7117 (comment). The code now checks the following: 1. is this shell part of an SSH connection and is `SSH_AUTH_SOCK` set? if so, assume the socket variable was set by sshd to point at a forwarded socket; bail out to skip setting `SSH_AUTH_SOCK". 1. is the current process a child of `gpg-agent --daemon`? if so, then bail out to skip setting `SSH_AUTH_SOCK`. 1. if we got this far, then set `SSH_AUTH_SOCK`. I've tested this fix locally and can confirm that both nix-community#5997 as well as the regression are fixed. Signed-off-by: squat <lserven@gmail.com>
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.
Description
Backport of #7117 and #7355.
Checklist
Change is backwards compatible.
Code formatted with
nix fmtornix-shell -p treefmt nixfmt deadnix keep-sorted --run treefmt.Code tested through
nix run .#tests -- test-allornix-shell --pure tests -A run.all.Test cases updated/added. See example.
Commit messages are formatted like
See CONTRIBUTING for more information and recent commit messages for examples.
If this PR adds a new module
If this PR adds an exciting new feature or contains a breaking change.