github/FreeRDP
7
0
Fork 0
mirror of https://github.com/FreeRDP/FreeRDP.git synced 2025-06-03 00:00:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added patch from #4697

Browse Source
This commit is contained in:
Armin Novak 2018-08-21 10:53:33 +02:00
parent 3381ca46e6
commit 4bea9934cf
1 changed files with 105 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

104
libfreerdp/core/proxy.c
View File

@ -82,6 +82,12 @@ BOOL proxy_prepare(rdpSettings* settings, const char** lpPeerHostname, UINT16* l
if (!settings->ProxyType) if (!settings->ProxyType)
proxy_read_environment(settings, "HTTPS_PROXY"); proxy_read_environment(settings, "HTTPS_PROXY");
if (settings->ProxyType)
proxy_read_environment(settings, "no_proxy");
if (settings->ProxyType)
proxy_read_environment(settings, "NO_PROXY");
if (settings->ProxyType) if (settings->ProxyType)
{ {
*lpPeerHostname = settings->ProxyHostname; *lpPeerHostname = settings->ProxyHostname;
@ -94,6 +100,91 @@ BOOL proxy_prepare(rdpSettings* settings, const char** lpPeerHostname, UINT16* l
return FALSE; return FALSE;
} }
static BOOL check_no_proxy(rdpSettings* settings, const char* no_proxy)
{
const char* delimiter = ",";
BOOL result = FALSE;
char* current;
char* copy;
size_t host_len;
if (!no_proxy || !settings)
return FALSE;
host_len = strlen(settings->ServerHostname);
copy = _strdup(no_proxy);
if (!copy)
return FALSE;
current = strtok(copy, delimiter);
while (current && !result)
{
const size_t currentlen = strlen(current);
if (currentlen > 0)
{
WLog_DBG(TAG, "%s => %s (%"PRIdz")", settings->ServerHostname, current, currentlen);
/* detect left and right "*" wildcard */
if (current[0] == '*')
{
if (host_len >= currentlen)
{
const size_t offset = host_len + 1 - currentlen;
if (strncmp(current + 1, settings->ServerHostname + offset, currentlen - 1) == 0)
result = TRUE;
}
}
else if (current[currentlen - 1] == '*')
{
if (strncmp(current, settings->ServerHostname, currentlen - 1) == 0)
result = TRUE;
}
else
{
if (strcmp(current, settings->ServerHostname) == 0)
result = TRUE; /* exact match */
else
{
struct sockaddr_in sa4;
struct sockaddr_in6 sa6;
BOOL is_ip = FALSE;
if (inet_pton(AF_INET, settings->ServerHostname, &sa4.sin_addr) == 1)
is_ip = TRUE;
else if (inet_pton(AF_INET6, settings->ServerHostname, &sa6.sin6_addr) == 1)
is_ip = TRUE;
if (is_ip)
{
if (!strncmp(current, settings->ServerHostname, currentlen))
result = TRUE; /* left-aligned match for IPs */
}
else if (current[0] == '.') /* Only compare if the no_proxy variable contains a whole domain. */
{
if (host_len >= currentlen)
{
const size_t offset = host_len - currentlen;
if (!strncmp(current, settings->ServerHostname + offset,
currentlen))
result = TRUE; /* right-aligned match for host names */
}
}
}
}
}
current = strtok(NULL, delimiter);
}
free(copy);
return result;
}
void proxy_read_environment(rdpSettings* settings, char* envname) void proxy_read_environment(rdpSettings* settings, char* envname)
{ {
DWORD envlen; DWORD envlen;
@ -112,7 +203,20 @@ void proxy_read_environment(rdpSettings* settings, char* envname)
} }
if (GetEnvironmentVariableA(envname, env, envlen) == envlen - 1) if (GetEnvironmentVariableA(envname, env, envlen) == envlen - 1)
{
if (_strnicmp("NO_PROXY", envname, 9) == 0)
{
if (check_no_proxy(settings, env))
{
WLog_INFO(TAG, "deactivating proxy: %s [%s=%s]", settings->ServerHostname, envname, env);
settings->ProxyType = PROXY_TYPE_NONE;
}
}
else
{
proxy_parse_uri(settings, env); proxy_parse_uri(settings, env);
}
}
free(env); free(env);
} }