mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

proxy: Allow NLA when using proxy smartcard authentication

Browse Source 
Previously smartcard authentication was only supported with TLS
connections so the proxy forced that security mode.

Since we now have a working NLA smartcard auth implementation we can
remove that code and leave the correct configuration to the proxy user.
This commit is contained in:
Martin Fleisz 2022-11-09 13:43:34 +00:00 committed by akallabeth
parent ebc8cd1d4a
commit 1da0d63c78
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
server/proxy/pf_client.c
View File

@ -667,19 +667,15 @@ static void pf_client_set_security_settings(pClientContext* pc)
freerdp_settings_set_bool(settings, FreeRDP_TlsSecurity, config->ClientTlsSecurity); freerdp_settings_set_bool(settings, FreeRDP_TlsSecurity, config->ClientTlsSecurity);
freerdp_settings_set_bool(settings, FreeRDP_NlaSecurity, config->ClientNlaSecurity); freerdp_settings_set_bool(settings, FreeRDP_NlaSecurity, config->ClientNlaSecurity);
/* Smartcard authentication currently does not work with NLA */
if (pf_client_use_proxy_smartcard_auth(settings)) if (pf_client_use_proxy_smartcard_auth(settings))
{ {
freerdp_settings_set_bool(settings, FreeRDP_NlaSecurity, FALSE); /* Smartcard authentication requires smartcard redirection to be enabled */
freerdp_settings_set_bool(settings, FreeRDP_TlsSecurity, TRUE);
freerdp_settings_set_bool(settings, FreeRDP_RedirectSmartCards, TRUE); freerdp_settings_set_bool(settings, FreeRDP_RedirectSmartCards, TRUE);
/* Reset username/domain, we will get that info later from the sc cert */
freerdp_settings_set_string(settings, FreeRDP_Username, NULL);
freerdp_settings_set_string(settings, FreeRDP_Domain, NULL);
} }
if (!config->ClientNlaSecurity)
return;
if (!settings->Username || !settings->Password)
return;
} }
static BOOL pf_client_connect_without_nla(pClientContext* pc) static BOOL pf_client_connect_without_nla(pClientContext* pc)