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

server: proxy: make fallback to tls configurable

Browse Source
This commit is contained in:
Kobi Mizrachi 2019-12-29 10:55:40 +02:00 committed by akallabeth
parent c3f180a08b
commit 77ca7ac2ad
4 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
server/proxy/config.ini
View File

@ -26,7 +26,8 @@ ServerTlsSecurity = TRUE
ServerRdpSecurity = FALSE ServerRdpSecurity = FALSE
ClientTlsSecurity = TRUE ClientTlsSecurity = TRUE
ClientRdpSecurity = FALSE ClientRdpSecurity = FALSE
ClientNlaSecurity = FALSE ClientNlaSecurity = TRUE
ClientAllowFallbackToTls = TRUE
[Channels] [Channels]
GFX = TRUE GFX = TRUE

10
server/proxy/pf_client.c
View File

@ -289,7 +289,7 @@ static BOOL pf_client_should_retry_without_nla(pClientContext* pc)
rdpSettings* settings = pc->context.settings; rdpSettings* settings = pc->context.settings;
proxyConfig* config = pc->pdata->config; proxyConfig* config = pc->pdata->config;
if (!settings->NlaSecurity) if (!config->ClientAllowFallbackToTls || !settings->NlaSecurity)
return FALSE; return FALSE;
return config->ClientTlsSecurity || config->ClientRdpSecurity; return config->ClientTlsSecurity || config->ClientRdpSecurity;
@ -330,14 +330,18 @@ static BOOL pf_client_connect(freerdp* instance)
{ {
pClientContext* pc = (pClientContext*)instance->context; pClientContext* pc = (pClientContext*)instance->context;
BOOL rc = FALSE; BOOL rc = FALSE;
BOOL retry = FALSE;
pf_client_set_security_settings(pc); pf_client_set_security_settings(pc);
if (pf_client_should_retry_without_nla(pc)) if (pf_client_should_retry_without_nla(pc))
pc->allow_next_conn_failure = TRUE; retry = pc->allow_next_conn_failure = TRUE;
if (!freerdp_connect(instance)) if (!freerdp_connect(instance))
{ {
WLog_ERR(TAG, "failed to connect with NLA. disabling NLA and retyring..."); if (!retry)
goto out;
WLog_ERR(TAG, "failed to connect with NLA. retrying to connect without NLA");
if (!pf_client_connect_without_nla(pc)) if (!pf_client_connect_without_nla(pc))
{ {

7
server/proxy/pf_config.c
View File

@ -75,8 +75,8 @@ BOOL pf_config_get_bool(wIniFile* ini, const char* section, const char* key)
str_value = IniFile_GetKeyValueString(ini, section, key); str_value = IniFile_GetKeyValueString(ini, section, key);
if (!str_value) if (!str_value)
{ {
WLog_WARN(TAG, "[%s]: key '%s.%s' not found, value defaults to false.", __FUNCTION__, key, WLog_WARN(TAG, "[%s]: key '%s.%s' not found, value defaults to false.", __FUNCTION__,
section); section, key);
return FALSE; return FALSE;
} }
@ -171,6 +171,8 @@ static BOOL pf_config_load_security(wIniFile* ini, proxyConfig* config)
config->ClientTlsSecurity = pf_config_get_bool(ini, "Security", "ClientTlsSecurity"); config->ClientTlsSecurity = pf_config_get_bool(ini, "Security", "ClientTlsSecurity");
config->ClientNlaSecurity = pf_config_get_bool(ini, "Security", "ClientNlaSecurity"); config->ClientNlaSecurity = pf_config_get_bool(ini, "Security", "ClientNlaSecurity");
config->ClientRdpSecurity = pf_config_get_bool(ini, "Security", "ClientRdpSecurity"); config->ClientRdpSecurity = pf_config_get_bool(ini, "Security", "ClientRdpSecurity");
config->ClientAllowFallbackToTls =
pf_config_get_bool(ini, "Security", "ClientAllowFallbackToTls");
return TRUE; return TRUE;
} }
@ -319,6 +321,7 @@ void pf_server_config_print(proxyConfig* config)
CONFIG_PRINT_BOOL(config, ClientNlaSecurity); CONFIG_PRINT_BOOL(config, ClientNlaSecurity);
CONFIG_PRINT_BOOL(config, ClientTlsSecurity); CONFIG_PRINT_BOOL(config, ClientTlsSecurity);
CONFIG_PRINT_BOOL(config, ClientRdpSecurity); CONFIG_PRINT_BOOL(config, ClientRdpSecurity);
CONFIG_PRINT_BOOL(config, ClientAllowFallbackToTls);
CONFIG_PRINT_SECTION("Channels"); CONFIG_PRINT_SECTION("Channels");
CONFIG_PRINT_BOOL(config, GFX); CONFIG_PRINT_BOOL(config, GFX);

1
server/proxy/pf_config.h
View File

@ -50,6 +50,7 @@ struct proxy_config
BOOL ClientNlaSecurity; BOOL ClientNlaSecurity;
BOOL ClientTlsSecurity; BOOL ClientTlsSecurity;
BOOL ClientRdpSecurity; BOOL ClientRdpSecurity;
BOOL ClientAllowFallbackToTls;
/* channels */ /* channels */
BOOL GFX; BOOL GFX;