romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-08-25 22:13:33 +03:00
Code Issues Projects Releases Packages Wiki Activity

parse_proxy: use the IPv6 zone id if given

Browse source 
If the proxy string is given as an IPv6 numerical address with a zone
id, make sure to use that for the connect to the proxy.

Reported-by: Edmond Yu

Fixes #3482
Closes #3918
This commit is contained in:
Daniel Stenberg 2019-05-21 15:02:41 +02:00
parent 885ce31401
commit 12e564ca20
No known key found for this signature in database
GPG key ID: 5CC908FDB71E12C2
1 changed files with 36 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

61
lib/url.c
View file

@ -1883,6 +1883,40 @@ CURLcode Curl_uc_to_curlcode(CURLUcode uc)
} }
} }
/*
* If the URL was set with an IPv6 numerical address with a zone id part, set
* the scope_id based on that!
*/
static void zonefrom_url(CURLU *uh, struct connectdata *conn)
{
char *zoneid;
CURLUcode uc;
uc = curl_url_get(uh, CURLUPART_ZONEID, &zoneid, 0);
if(!uc && zoneid) {
char *endp;
unsigned long scope = strtoul(zoneid, &endp, 10);
if(!*endp && (scope < UINT_MAX))
/* A plain number, use it direcly as a scope id. */
conn->scope_id = (unsigned int)scope;
#ifdef HAVE_IF_NAMETOINDEX
else {
/* Zone identifier is not numeric */
unsigned int scopeidx = 0;
scopeidx = if_nametoindex(zoneid);
if(!scopeidx)
infof(conn->data, "Invalid zoneid: %s; %s\n", zoneid,
strerror(errno));
else
conn->scope_id = scopeidx;
}
#endif /* HAVE_IF_NAMETOINDEX */
free(zoneid);
}
}
/* /*
* Parse URL and fill in the relevant members of the connection struct. * Parse URL and fill in the relevant members of the connection struct.
*/ */
@ -2004,38 +2038,14 @@ static CURLcode parseurlandfillconn(struct Curl_easy *data,
if(hostname[0] == '[') { if(hostname[0] == '[') {
/* This looks like an IPv6 address literal. See if there is an address /* This looks like an IPv6 address literal. See if there is an address
scope. */ scope. */
char *zoneid;
size_t hlen; size_t hlen;
uc = curl_url_get(uh, CURLUPART_ZONEID, &zoneid, 0);
conn->bits.ipv6_ip = TRUE; conn->bits.ipv6_ip = TRUE;
/* cut off the brackets! */ /* cut off the brackets! */
hostname++; hostname++;
hlen = strlen(hostname); hlen = strlen(hostname);
hostname[hlen - 1] = 0; hostname[hlen - 1] = 0;
if(!uc && zoneid) {
char *endp;
unsigned long scope;
scope = strtoul(zoneid, &endp, 10);
if(!*endp && (scope < UINT_MAX)) {
/* A plain number, use it direcly as a scope id. */
conn->scope_id = (unsigned int)scope;
}
#ifdef HAVE_IF_NAMETOINDEX
else {
/* Zone identifier is not numeric */
unsigned int scopeidx = 0;
scopeidx = if_nametoindex(zoneid);
if(!scopeidx)
infof(data, "Invalid zoneid id: %s; %s\n", zoneid,
strerror(errno));
else
conn->scope_id = scopeidx;
} zonefrom_url(uh, conn);
#endif /* HAVE_IF_NAMETOINDEX */
free(zoneid);
}
} }
/* make sure the connect struct gets its own copy of the host name */ /* make sure the connect struct gets its own copy of the host name */
@ -2422,6 +2432,7 @@ static CURLcode parse_proxy(struct Curl_easy *data,
size_t len = strlen(host); size_t len = strlen(host);
host[len-1] = 0; /* clear the trailing bracket */ host[len-1] = 0; /* clear the trailing bracket */
host++; host++;
zonefrom_url(uhp, conn);
} }
proxyinfo->host.name = host; proxyinfo->host.name = host;