feat(agent/agentssh): use tcp for X11 forwarding #14560
Merged
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
9d3f404 to
8fdf92f
Compare
8fdf92f to
f6f2964
Compare
johnstcn
reviewed
Sep 4, 2024
johnstcn
approved these changes
Sep 4, 2024
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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 changes X11 forwarding from socket-based to TCP based. This matches OpenSSH behavior where the client forwards from
/tmp/.X11-unix/X*and the server listens onlocalhost:6000(+).Since we can now have multiple SSH connections that each handle their individual X11 forwarding, we can end up adding more non-duplicate entries into
~/.Xauthorityas well. Ideally we would clean our entries up when the connection closes, but that's more of a nice-to-have and not part of this PR.Note that X11 forwarding is still only supported by OpenSSH clients (
coder config-ssh), this PR did not add X11 forwarding support tocoder ssh.Fixes #14198