33dc64fd0e
Daniel Stenberg
2026-07-16
Subject
urlapi: allow URLs to not have userauth (hostname)
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
lib/urlapi.c+19 -11
| @@ -965,22 +965,30 @@ static CURLUcode parse_scheme(const char *url, CURLU *u, char *schemebuf, | |
| const char *schemep = NULL; | |
| if(schemelen) { | |
| - | int i = 0; |
| + | int num_slashes = 0; |
| const char *p = &url[schemelen + 1]; | |
| - | while((*p == '/') && (i < 4)) { |
| - | p++; |
| - | i++; |
| - | } |
| - | |
| - | schemep = schemebuf; |
| - | if(!Curl_get_scheme(schemep) && |
| - | !(flags & CURLU_NON_SUPPORT_SCHEME)) |
| + | if(!Curl_get_scheme(schemebuf) && !(flags & CURLU_NON_SUPPORT_SCHEME)) |
| return CURLUE_UNSUPPORTED_SCHEME; | |
| - | if((i < 1) || (i > 3)) |
| - | /* less than one or more than three slashes */ |
| + | if(!ISSLASH(*p)) |
| + | /* less than one */ |
| return CURLUE_BAD_SLASHES; | |
| + | if((flags & CURLU_NO_AUTHORITY)) { |
| + | while(ISSLASH(*p) && (num_slashes < 2)) { |
| + | p++; |
| + | num_slashes++; |
| + | } |
| + | } |
| + | else { |
| + | while(ISSLASH(*p) && (num_slashes < 4)) { |
| + | p++; |
| + | num_slashes++; |
| + | } |
| + | if(num_slashes > 3) |
| + | return CURLUE_BAD_SLASHES; |
| + | } |
| + | schemep = schemebuf; |
| *hostpp = p; /* hostname starts here */ | |
| } | |
| else { | |
tests/libtest/lib1560.c+10 -0
| @@ -153,6 +153,16 @@ struct clearurlcase { | |
| }; | |
| static const struct testcase get_parts_list[] = { | |
| + | /* non-supported URL without hostname */ |
| + | {"weird:///path", |
| + | "weird | [11] | [12] | [13] | | [15] | /path | [16] | [17]", |
| + | CURLU_NON_SUPPORT_SCHEME|CURLU_NO_AUTHORITY, 0, CURLUE_OK}, |
| + | /* non-supported URL without hostname, using path with multiple leading |
| + | slashes */ |
| + | {"weird:////path", |
| + | "weird | [11] | [12] | [13] | | [15] | //path | [16] | [17]", |
| + | CURLU_NON_SUPPORT_SCHEME|CURLU_NO_AUTHORITY, 0, CURLUE_OK}, |
| + | |
| /* RFC 4291 IPv4-Mapped IPv6 Addresses */ | |
| {"https://[0:0:0:0:0:FFFF:129.144.52.38]:1234", | |
| "https | [11] | [12] | [13] | [::ffff:129.144.52.38] | 1234 " | |