Skip to content

[v14] Default desktop port to 3389 if not specified #35343

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
zmb3 merged 1 commit into from
Dec 5, 2023
Merged

[v14] Default desktop port to 3389 if not specified #35343

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
10 changes: 7 additions & 3 deletions lib/srv/desktop/windows_server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -763,8 +763,7 @@ func (s *WindowsService) handleConnection(proxyConn *tls.Conn) {
return
}
if len(desktops) == 0 {
log.Error("no windows desktops with HostID %s and Name %s", s.cfg.Heartbeat.HostUUID,
desktopName)
log.Errorf("desktop %v/%v not found", s.cfg.Heartbeat.HostUUID, desktopName)
sendTDPError(fmt.Sprintf("Could not find desktop %v.", desktopName))
return
}
Expand Down Expand Up @@ -798,6 +797,11 @@ func (s *WindowsService) connectRDP(ctx context.Context, log logrus.FieldLogger,
return trace.Wrap(err)
}

addr, err := utils.ParseHostPortAddr(desktop.GetAddr(), defaults.RDPListenPort)
if err != nil {
return trace.Wrap(err)
}

sessionID := session.NewID()

// in order for the session to be recorded, the cluster's session recording mode must
Expand Down Expand Up @@ -875,7 +879,7 @@ func (s *WindowsService) connectRDP(ctx context.Context, log logrus.FieldLogger,
return s.generateUserCert(ctx, username, ttl, desktop, createUsers, groups)
},
CertTTL: windows.CertTTL,
Addr: desktop.GetAddr(),
Addr: addr.String(),
Conn: tdpConn,
AuthorizeFn: authorize,
AllowClipboard: authCtx.Checker.DesktopClipboard(),
Expand Down