Fix ssh forwarding to use current SSH_AUTH_SOCK value#1420
Merged
JaewonHur merged 10 commits intoapple:mainfrom Apr 17, 2026
Merged
Fix ssh forwarding to use current SSH_AUTH_SOCK value#1420JaewonHur merged 10 commits intoapple:mainfrom
JaewonHur merged 10 commits intoapple:mainfrom
Conversation
Contributor
Author
|
@chaveMac Hi! Sorry to make a duplicate PR, but I opened a new one as it's been a while the original one's been updated. |
7 tasks
|
|
||
| /// Bootstrap the init process of the container. | ||
| public func bootstrap(id: String, stdio: [FileHandle?]) async throws { | ||
| public func bootstrap(id: String, stdio: [FileHandle?], env: [String: String]) async throws { |
Contributor
There was a problem hiding this comment.
Could we just have env be an optional here? Since env will probably be empty most of the time anyways, I feel like this being an optional makes the most sense. What do you think?
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
|
|
||
| /// Bootstrap the init process of the container. | ||
| public func bootstrap(id: String, stdio: [FileHandle?]) async throws { | ||
| public func bootstrap(id: String, stdio: [FileHandle?], env: [String: String] = [:]) async throws { |
Contributor
There was a problem hiding this comment.
I thought we were making the env variable here an optional?
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
katiewasnothere
approved these changes
Apr 17, 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
3 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.
This PR fixes #357, passing
SSH_AUTH_SOCKenv variable from current terminal to theSandboxServiceso that the container can mount the correct ssh auth socket. For that, it introducesenvparameters tobootstrapRPC of bothContainersServiceandSandboxService. This parameter is used only for passingSSH_AUTH_SOCKnow, but can be extended to pass more runtime env variables.This PR is a follow up PR of #1214.
Type of Change
Motivation and Context
Container run
--sshwas inheritingSSH_AUTH_SOCKenv variable from launchd, not from current terminal.Testing