Skip to content
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

RDP: put the username in the load balancing cookie #49975

Merged
merged 1 commit into from
Dec 13, 2024
Merged

RDP: put the username in the load balancing cookie #49975

Show file tree
Hide file tree
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
7 changes: 7 additions & 0 deletions lib/srv/desktop/rdp/rdpclient/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,6 +291,12 @@ func (c *Client) startRustRDP(ctx context.Context) error {
return trace.Wrap(err)
}

// [username] need only be valid for the duration of
// C.client_run. It is copied on the Rust side and
// thus can be freed here.
username := C.CString(c.username)
defer C.free(unsafe.Pointer(username))

// [addr] need only be valid for the duration of
// C.client_run. It is copied on the Rust side and
// thus can be freed here.
Expand Down Expand Up @@ -328,6 +334,7 @@ func (c *Client) startRustRDP(ctx context.Context) error {
C.CGOConnectParams{
ad: C.bool(c.cfg.AD),
nla: C.bool(c.cfg.NLA),
go_username: username,
go_addr: addr,
go_computer_name: computerName,
go_kdc_addr: kdcAddr,
Expand Down
7 changes: 6 additions & 1 deletion lib/srv/desktop/rdp/rdpclient/src/client.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ use ironrdp_pdu::input::fast_path::{
};
use ironrdp_pdu::input::mouse::PointerFlags;
use ironrdp_pdu::input::{InputEventError, MousePdu};
use ironrdp_pdu::nego::NegoRequestData;
use ironrdp_pdu::rdp::capability_sets::MajorPlatformType;
use ironrdp_pdu::rdp::client_info::PerformanceFlags;
use ironrdp_pdu::rdp::RdpError;
Expand Down Expand Up @@ -1442,8 +1443,11 @@ fn create_config(params: &ConnectParams, pin: String) -> Config {
platform: MajorPlatformType::UNSPECIFIED,
no_server_pointer: false,
autologon: true,
request_data: None,
pointer_software_rendering: false,
// Send the username in the request cookie, which is sent in the initial connection request.
// The RDP server ignores this value, but load balancers sitting in front of the server
// can use it to implement persistence.
request_data: Some(NegoRequestData::cookie(params.username.clone())),
performance_flags: PerformanceFlags::default()
| PerformanceFlags::DISABLE_CURSOR_SHADOW // this is required for pointer to work correctly in Windows 2019
| if !params.show_desktop_wallpaper {
Expand All @@ -1457,6 +1461,7 @@ fn create_config(params: &ConnectParams, pin: String) -> Config {

#[derive(Debug)]
pub struct ConnectParams {
pub username: String,
pub addr: String,
pub kdc_addr: Option<String>,
pub computer_name: Option<String>,
Expand Down
3 changes: 3 additions & 0 deletions lib/srv/desktop/rdp/rdpclient/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ pub unsafe extern "C" fn free_string(ptr: *mut c_char) {
pub unsafe extern "C" fn client_run(cgo_handle: CgoHandle, params: CGOConnectParams) -> CGOResult {
trace!("client_run");
// Convert from C to Rust types.
let username = from_c_string(params.go_username);
let addr = from_c_string(params.go_addr);
let cert_der = from_go_array(params.cert_der, params.cert_der_len);
let key_der = from_go_array(params.key_der, params.key_der_len);
Expand All @@ -111,6 +112,7 @@ pub unsafe extern "C" fn client_run(cgo_handle: CgoHandle, params: CGOConnectPar
ConnectParams {
ad: params.ad,
nla: params.nla,
username,
addr,
computer_name,
cert_der,
Expand Down Expand Up @@ -480,6 +482,7 @@ pub unsafe extern "C" fn client_write_screen_resize(
pub struct CGOConnectParams {
ad: bool,
nla: bool,
go_username: *const c_char,
go_addr: *const c_char,
go_domain: *const c_char,
go_kdc_addr: *const c_char,
Expand Down
Loading