Fix trusted x11 forwarding with client xauth data #48937
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
|
This pull request is automatically being deployed by Amplify Hosting (learn more). |
rosstimothy
requested review from
rosstimothy
and removed request for
kimlisa
rosstimothy
approved these changes
Nov 19, 2024
|
@eriktate Friendly ping to review, would be a nice bug fix to get in soon |
eriktate
approved these changes
Dec 4, 2024
Joerger
added a commit
that referenced
this pull request
Dec 10, 2024
* Fix trusted x11 forwarding with client xauth data; use slog. * Fix slog lint.
Joerger
added a commit
that referenced
this pull request
Dec 10, 2024
* Fix trusted x11 forwarding with client xauth data; use slog. * Fix slog lint.
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.
Previously,
tsh ssh -Yassumed that there was no required xauth data set for the current client $DISPLAY. This is usually the case for local XServers, which will default to connecting with local authentication mechanisms. However, in each x11 forwarding server jump, we set some fake xauth data for client-server authentication. This fake xauth data must be propogated to the next server jump, or else the client will fail to connect to the XServer proxy, leading to this error:X11 connection rejected because of wrong authentication..This PR updates
tshto use existing xauth data when found, instead of always defaulting to creating new fake xauth data. Note that this now properly matches the openSSH implementation.Fixes #48920
Changelog: Fix
tsh ssh -Ywhen jumping between multiple servers.