bughz/tinyproxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

upstream: Add error messages in case of inet_aton() failure

Browse Source
This commit is contained in:
kikuchan 2018-04-12 22:56:50 +09:00
parent 531080d871
commit 6d7b0389af
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/upstream.c
View File

@ -46,7 +46,7 @@ proxy_type_name(proxy_type type)
/** /**
* Parse and process a netmask format (IP/mask), otherwise treat as a domain * Parse and process a netmask format (IP/mask), otherwise treat as a domain
*/ */
static void upstream_handle_site_spec(struct upstream *up, const char *domain) static int upstream_handle_site_spec(struct upstream *up, const char *domain)
{ {
char *ptr; char *ptr;
@ -63,14 +63,18 @@ static void upstream_handle_site_spec(struct upstream *up, const char *domain)
if (inet_aton (ptr, &addrstruct) != 0) if (inet_aton (ptr, &addrstruct) != 0)
up->mask = up->mask =
ntohl (addrstruct.s_addr); ntohl (addrstruct.s_addr);
else return 0;
} else { } else {
up->mask = up->mask =
~((1 << (32 - atoi (ptr))) - 1); ~((1 << (32 - atoi (ptr))) - 1);
} }
} else {
return 0;
} }
} else { } else {
up->domain = safestrdup (domain); up->domain = safestrdup (domain);
} }
return 1;
} }
/** /**
* Construct an upstream struct from input data. * Construct an upstream struct from input data.
@ -127,7 +131,11 @@ static struct upstream *upstream_build (const char *host, int port, const char *
goto fail; goto fail;
} }
upstream_handle_site_spec(up, domain); if (!upstream_handle_site_spec(up, domain)) {
log_message (LOG_WARNING,
"Nonsense no-upstream rule: malformed IP address or mask");
goto fail;
}
log_message (LOG_INFO, "Added no-upstream for %s", domain); log_message (LOG_INFO, "Added no-upstream for %s", domain);
} else { } else {
@ -141,7 +149,11 @@ static struct upstream *upstream_build (const char *host, int port, const char *
up->host = safestrdup (host); up->host = safestrdup (host);
up->port = port; up->port = port;
upstream_handle_site_spec(up, domain); if (!upstream_handle_site_spec(up, domain)) {
log_message (LOG_WARNING,
"Nonsense upstream rule: malformed IP address or mask");
goto fail;
}
log_message (LOG_INFO, "Added upstream %s %s:%d for %s", log_message (LOG_INFO, "Added upstream %s %s:%d for %s",
proxy_type_name(type), host, port, domain); proxy_type_name(type), host, port, domain);