xrdp_sec.c: add token login for autologon clients

galeksandrp · galeksandrp · commit 4b008dff7a14 · 2022-10-13T13:23:33.000Z
Make `token login` available for clients with `RDP_LOGON_AUTO` flag,
such as `mstsc.exe` `6.2.22000.282` (`Win11` `22621.608`).
diff --git a/libxrdp/xrdp_sec.c b/libxrdp/xrdp_sec.c
@@ -1007,7 +1007,7 @@ xrdp_sec_process_logon_info(struct xrdp_sec *self, struct stream *s)
             return 1;
         }
     }
-    else if (self->rdp_layer->client_info.enable_token_login
+    if (self->rdp_layer->client_info.enable_token_login
              && len_user > 0
              && len_password == 0
              && (sep = g_strchr(self->rdp_layer->client_info.username, '\x1f')) != NULL)
@@ -1018,7 +1018,7 @@ xrdp_sec_process_logon_info(struct xrdp_sec *self, struct stream *s)
         self->rdp_layer->client_info.username[sep - self->rdp_layer->client_info.username] = '\0';
         self->rdp_layer->client_info.rdp_autologin = 1;
     }
-    else
+    else if (!(flags & RDP_LOGON_AUTO))
     {
         if (!s_check_rem_and_log(s, len_password + 2, "Parsing [MS-RDPBCGR] TS_INFO_PACKET Password"))
         {

Original file line number	Diff line number	Diff line change
`@@ -1007,7 +1007,7 @@ xrdp_sec_process_logon_info(struct xrdp_sec self, struct stream s)`
`1007`	`1007`	`return 1;`
`1008`	`1008`	`}`
`1009`	`1009`	`}`
`1010`		`- else if (self->rdp_layer->client_info.enable_token_login`
	`1010`	`+ if (self->rdp_layer->client_info.enable_token_login`
`1011`	`1011`	`&& len_user > 0`
`1012`	`1012`	`&& len_password == 0`
`1013`	`1013`	`&& (sep = g_strchr(self->rdp_layer->client_info.username, '\x1f')) != NULL)`
`@@ -1018,7 +1018,7 @@ xrdp_sec_process_logon_info(struct xrdp_sec self, struct stream s)`
`1018`	`1018`	`self->rdp_layer->client_info.username[sep - self->rdp_layer->client_info.username] = '\0';`
`1019`	`1019`	`self->rdp_layer->client_info.rdp_autologin = 1;`
`1020`	`1020`	`}`
`1021`		`- else`
	`1021`	`+ else if (!(flags & RDP_LOGON_AUTO))`
`1022`	`1022`	`{`
`1023`	`1023`	`if (!s_check_rem_and_log(s, len_password + 2, "Parsing [MS-RDPBCGR] TS_INFO_PACKET Password"))`
`1024`	`1024`	`{`