self-hosted/teleport
self-hosted/teleport
1
0
Fork 0
mirror of https://github.com/gravitational/teleport synced 2024-10-21 01:34:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add hostlogin to proxy config for windows desktop (#12775)

Browse source 
* add hostlogin to proxy config for windows

* Set ProxyClient's HostLogin to the Windows username

Also convert a few TLS handshakes to a context-aware version
for better timeout/cancelation behavior.

Co-authored-by: Zac Bergquist <zac.bergquist@goteleport.com>
Co-authored-by: Zac Bergquist <zmb3@users.noreply.github.com>
This commit is contained in:
Carson Anderson 2022-05-20 03:34:11 -06:00 committed by GitHub
parent 5ec15cbbb9
commit 7564a5c4f3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/auth/middleware.go
View file

@ -598,7 +598,7 @@ func (a *Middleware) WrapContextWithUser(ctx context.Context, conn *tls.Conn) (c
// Perform the handshake if it hasn't been already. Before the handshake we
// won't have client certs available.
if !conn.ConnectionState().HandshakeComplete {
if err := conn.Handshake(); err != nil {
if err := conn.HandshakeContext(ctx); err != nil {
return nil, trace.ConvertSystemError(err)
}
}

2
lib/utils/tlsdial.go
View file

@ -47,7 +47,7 @@ func TLSDial(ctx context.Context, dial DialWithContextFunc, network, addr string
conn := tls.Client(plainConn, tlsConfig)
errC := make(chan error, 1)
go func() {
err := conn.Handshake()
err := conn.HandshakeContext(ctx)
errC <- err
}()

12
lib/web/desktop.go
View file

@ -138,7 +138,7 @@ func (h *Handler) createDesktopConnection(
WriteBufferSize: 1024,
}
pc, err := proxyClient(r.Context(), ctx, h.ProxyHostPort())
pc, err := proxyClient(r.Context(), ctx, h.ProxyHostPort(), username)
if err != nil {
return trace.Wrap(err)
}
@ -164,7 +164,7 @@ func (h *Handler) createDesktopConnection(
}
serviceConnTLS := tls.Client(serviceConn, tlsConfig)
if err := serviceConnTLS.Handshake(); err != nil {
if err := serviceConnTLS.HandshakeContext(r.Context()); err != nil {
return trace.NewAggregate(err, sendTDPError(ws, err))
}
log.Debug("Connected to windows_desktop_service")
@ -185,11 +185,17 @@ func (h *Handler) createDesktopConnection(
return nil
}
func proxyClient(ctx context.Context, sessCtx *SessionContext, addr string) (*client.ProxyClient, error) {
func proxyClient(ctx context.Context, sessCtx *SessionContext, addr, windowsUser string) (*client.ProxyClient, error) {
cfg, err := makeTeleportClientConfig(ctx, sessCtx)
if err != nil {
return nil, trace.Wrap(err)
}
// Set HostLogin to avoid the default behavior of looking up the
// Unix user Teleport is running as (which doesn't work in containerized
// environments where we're running as an arbitrary UID)
cfg.HostLogin = windowsUser
if err := cfg.ParseProxyHost(addr); err != nil {
return nil, trace.Wrap(err)
}