Add hostlogin to proxy config for windows desktop #12775
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
zmb3
reviewed
May 20, 2022
lib/web/desktop.go
Outdated
| @@ -193,6 +193,7 @@ func proxyClient(ctx context.Context, sessCtx *SessionContext, addr string) (*cl | |||
| if err := cfg.ParseProxyHost(addr); err != nil { | |||
| return nil, trace.Wrap(err) | |||
| } | |||
| cfg.HostLogin = sessCtx.user | |||
There was a problem hiding this comment.
Technically HostLogin should be the user on the target host, which we have in the username variable we pull from the query string on line 92.
It doesn't really matter, as this is only used when using the ProxyClient to connect to an SSH node, but we do have more accurate information so we might as well use it.
I would also add a comment here:
// HostLogin must be specified in order to avoid defaulting to
// the local Unix user, which will fail in some environments.
There was a problem hiding this comment.
Edit: I had time and realized it would be several hours before you're awake, so I went ahead and made the change. Let me know what you think!
Also convert a few TLS handshakes to a context-aware version for better timeout/cancelation behavior.
xacrimon
approved these changes
May 20, 2022
smallinsky
approved these changes
May 20, 2022
|
@rcanderson23 See the table below for backport results.
|
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.
Resolves https://github.com/gravitational/cloud/issues/1635 and #12706
When
HostLoginis not set, it attempts to default to the username of the current linux user. This fails when running containers as an arbitrary UID and there is no matching user in/etc/passwd. This value doesn't appear to be used by Windows Desktop Services so it just needs to be set to something to avoid the issue.