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

transport: Also ask for password when connecting using TLS

Browse Source
This commit is contained in:
Martin Fleisz 2021-01-22 13:12:25 +01:00 committed by akallabeth
parent e9b71a0802
commit bcf2de2ffb
1 changed files with 41 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
libfreerdp/core/transport.c
View File

@ -260,6 +260,39 @@ fail:
return FALSE;
}
static BOOL is_empty(const char* str)
{
if (!str)
return TRUE;
if (strlen(str) == 0)
return TRUE;
return FALSE;
}
static BOOL transport_prompt_for_password(rdpTransport* transport)
{
rdpSettings* settings = transport->settings;
freerdp* instance = transport->context->instance;
if (is_empty(settings->Username) ||
(is_empty(settings->Password) && is_empty((const char*)settings->RedirectionPassword)))
{
/* If no callback is specified still continue connection */
if (!instance->Authenticate)
return TRUE;
if (!instance->Authenticate(instance, &settings->Username, &settings->Password,
&settings->Domain))
{
freerdp_set_last_error_log(instance->context,
FREERDP_ERROR_CONNECT_NO_OR_MISSING_CREDENTIALS);
return FALSE;
}
}
return TRUE;
}
BOOL transport_connect_rdp(rdpTransport* transport)
{
if (!transport)
@ -272,6 +305,14 @@ BOOL transport_connect_tls(rdpTransport* transport)
{
if (!transport)
return FALSE;
/* Only prompt for password if we use TLS (NLA also calls this function) */
if (transport->settings->SelectedProtocol == PROTOCOL_SSL)
{
if (!transport_prompt_for_password(transport))
return FALSE;
}
return IFCALLRESULT(FALSE, transport->io.TLSConnect, transport);
}