Skip to content

[v12] Fix desktop access connecting to direct dial nodes #30276

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AntonAM merged 1 commit into from
Aug 10, 2023
Merged

[v12] Fix desktop access connecting to direct dial nodes #30276

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 26 additions & 1 deletion lib/service/desktop.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ limitations under the License.
package service

import (
"context"
"crypto/tls"
"net"
"net/http"
Expand All @@ -33,6 +34,7 @@ import (
"github.com/gravitational/teleport/lib/authz"
"github.com/gravitational/teleport/lib/defaults"
"github.com/gravitational/teleport/lib/limiter"
"github.com/gravitational/teleport/lib/multiplexer"
"github.com/gravitational/teleport/lib/reversetunnel"
"github.com/gravitational/teleport/lib/services"
"github.com/gravitational/teleport/lib/srv/desktop"
Expand Down Expand Up @@ -246,7 +248,30 @@ func (process *TeleportProcess) initWindowsDesktopServiceRegistered(log *logrus.
log.Infof("Starting Windows desktop service on %v.", listener.Addr())
}
process.BroadcastEvent(Event{Name: WindowsDesktopReady, Payload: nil})
err := srv.Serve(listener)

muxCAGetter := func(ctx context.Context, id types.CertAuthID, loadKeys bool) (types.CertAuthority, error) {
return accessPoint.GetCertAuthority(ctx, id, loadKeys)
}

mux, err := multiplexer.New(multiplexer.Config{
Context: process.ExitContext(),
Listener: listener,
EnableExternalProxyProtocol: cfg.Proxy.EnableProxyProtocol,
ID: teleport.Component(teleport.ComponentWindowsDesktop),
CertAuthorityGetter: muxCAGetter,
LocalClusterName: clusterName,
})
if err != nil {
return trace.Wrap(err)
}

go func() {
if err := mux.Serve(); err != nil && !utils.IsOKNetworkError(err) {
mux.Entry.WithError(err).Error("mux encountered err serving")
}
}()

err = srv.Serve(mux.TLS())
if err != nil {
if err == http.ErrServerClosed {
return nil
Expand Down