romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-08-24 21:43:32 +03:00
Code Issues Projects Releases Packages Wiki Activity

URL: return error on malformed URLs with junk after port number

Browse source 
... because it causes confusion with users. Example URLs:

"http://[127.0.0.1]:11211:80" which a lot of languages' URL parsers will
parse and claim uses port number 80, while libcurl would use port number
11211.

"http://user@example.com:80@localhost" which by the WHATWG URL spec will
be treated to contain user name 'user@example.com' but according to
RFC3986 is user name 'user' for the host 'example.com' and then port 80
is followed by "@localhost"

Both these formats are now rejected, and verified so in test 1260.

Reported-by: Orange Tsai
This commit is contained in:
Daniel Stenberg 2017-03-06 16:08:21 +01:00
parent 7ad72e0fc2
commit aadb7c7b62
3 changed files with 42 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

13
lib/url.c
View file

@ -5643,7 +5643,7 @@ static CURLcode parse_remote_port(struct Curl_easy *data,
}
#endif
portptr = strrchr(conn->host.name, ':');
portptr = strchr(conn->host.name, ':');
}
if(data->set.use_port && data->state.allow_port) {
@ -5698,15 +5698,16 @@ static CURLcode parse_remote_port(struct Curl_easy *data,
return CURLE_URL_MALFORMAT;
}
else if(rest != &portptr[1]) {
if(rest[0]) {
failf(data, "Port number ended with '%c'", rest[0]);
return CURLE_URL_MALFORMAT;
}
if(rest != &portptr[1]) {
*portptr = '\0'; /* cut off the name there */
conn->remote_port = curlx_ultous(port);
}
else {
if(rest[0]) {
failf(data, "Illegal port number");
return CURLE_URL_MALFORMAT;
}
/* Browser behavior adaptation. If there's a colon with no digits after,
just cut off the name there which makes us ignore the colon and just
use the default port. Firefox and Chrome both do that. */