mirror of
https://github.com/curl/curl.git
synced 2025-04-12 16:20:35 +08:00
noproxy: patterns need to be comma separated
or they will not parse correctly. Mentioned in DEPRECATED since Janurary 2023 (in 7ad8a7ba9ebdedc). Closes #13789
This commit is contained in:
Daniel Stenberg
parent
4e2c45110c
commit
e78913e6b5
@ -23,25 +23,6 @@ and use TLS 1.3, or else it is not good enough.
|
||||
As of May 2024, the libraries that need to get fixed to remain supported after
|
||||
May 2025 are: BearSSL and Secure Transport.
|
||||
|
||||
## space-separated `NOPROXY` patterns
|
||||
|
||||
When specifying patterns/domain names for curl that should *not* go through a
|
||||
proxy, the curl tool features the `--noproxy` command line option and the
|
||||
library supports the `NO_PROXY` environment variable and the `CURLOPT_NOPROXY`
|
||||
libcurl option.
|
||||
|
||||
They all set the same list of patterns. This list is documented to be a set of
|
||||
**comma-separated** names, but can also be provided separated with just
|
||||
space. The ability to just use spaces for this has never been documented but
|
||||
some users may still have come to rely on this.
|
||||
|
||||
Several other tools and utilities also parse the `NO_PROXY` environment
|
||||
variable but do not consider a space to be a valid separator. Using spaces for
|
||||
separator is probably less portable and might cause more friction than commas
|
||||
do. Users should use commas for this for greater portability.
|
||||
|
||||
curl removes the support for space-separated names in July 2024.
|
||||
|
||||
## past removals
|
||||
|
||||
- Pipelining
|
||||
@ -53,3 +34,4 @@ curl removes the support for space-separated names in July 2024.
|
||||
- gskit
|
||||
- mingw v1
|
||||
- NTLM_WB
|
||||
- space-separated `NOPROXY` patterns
|
||||
|
||||
@ -119,11 +119,10 @@ enum nametype {
|
||||
* Checks if the host is in the noproxy list. returns TRUE if it matches and
|
||||
* therefore the proxy should NOT be used.
|
||||
****************************************************************/
|
||||
bool Curl_check_noproxy(const char *name, const char *no_proxy,
|
||||
bool *spacesep)
|
||||
bool Curl_check_noproxy(const char *name, const char *no_proxy)
|
||||
{
|
||||
char hostip[128];
|
||||
*spacesep = FALSE;
|
||||
|
||||
/*
|
||||
* If we don't have a hostname at all, like for example with a FILE
|
||||
* transfer, we have nothing to interrogate the noproxy list with.
|
||||
@ -248,11 +247,9 @@ bool Curl_check_noproxy(const char *name, const char *no_proxy,
|
||||
/* pass blanks after pattern */
|
||||
while(ISBLANK(*p))
|
||||
p++;
|
||||
/* if not a comma! */
|
||||
if(*p && (*p != ',')) {
|
||||
*spacesep = TRUE;
|
||||
continue;
|
||||
}
|
||||
/* if not a comma, this ends the loop */
|
||||
if(*p != ',')
|
||||
break;
|
||||
/* pass any number of commas */
|
||||
while(*p == ',')
|
||||
p++;
|
||||
|
||||
@ -37,9 +37,7 @@ UNITTEST bool Curl_cidr6_match(const char *ipv6,
|
||||
unsigned int bits);
|
||||
#endif
|
||||
|
||||
bool Curl_check_noproxy(const char *name, const char *no_proxy,
|
||||
bool *spacesep);
|
||||
|
||||
bool Curl_check_noproxy(const char *name, const char *no_proxy);
|
||||
#endif
|
||||
|
||||
#endif /* HEADER_CURL_NOPROXY_H */
|
||||
|
||||
@ -2374,7 +2374,6 @@ static CURLcode create_conn_helper_init_proxy(struct Curl_easy *data,
|
||||
char *socksproxy = NULL;
|
||||
char *no_proxy = NULL;
|
||||
CURLcode result = CURLE_OK;
|
||||
bool spacesep = FALSE;
|
||||
|
||||
/*************************************************************
|
||||
* Extract the user and password from the authentication string
|
||||
@ -2421,8 +2420,7 @@ static CURLcode create_conn_helper_init_proxy(struct Curl_easy *data,
|
||||
}
|
||||
|
||||
if(Curl_check_noproxy(conn->host.name, data->set.str[STRING_NOPROXY] ?
|
||||
data->set.str[STRING_NOPROXY] : no_proxy,
|
||||
&spacesep)) {
|
||||
data->set.str[STRING_NOPROXY] : no_proxy)) {
|
||||
Curl_safefree(proxy);
|
||||
Curl_safefree(socksproxy);
|
||||
}
|
||||
@ -2431,9 +2429,6 @@ static CURLcode create_conn_helper_init_proxy(struct Curl_easy *data,
|
||||
/* if the host is not in the noproxy list, detect proxy. */
|
||||
proxy = detect_proxy(data, conn);
|
||||
#endif /* CURL_DISABLE_HTTP */
|
||||
if(spacesep)
|
||||
infof(data, "space-separated NOPROXY patterns are deprecated");
|
||||
|
||||
Curl_safefree(no_proxy);
|
||||
|
||||
#ifdef USE_UNIX_SOCKETS
|
||||
|
||||
@ -46,7 +46,6 @@ struct noproxy {
|
||||
const char *a;
|
||||
const char *n;
|
||||
bool match;
|
||||
bool space; /* space separated */
|
||||
};
|
||||
|
||||
UNITTEST_START
|
||||
@ -78,52 +77,51 @@ UNITTEST_START
|
||||
{ NULL, NULL, 0, FALSE} /* end marker */
|
||||
};
|
||||
struct noproxy list[]= {
|
||||
{ "www.example.com", "localhost .example.com .example.de", TRUE, TRUE},
|
||||
{ "www.example.com", "localhost,.example.com,.example.de", TRUE, FALSE},
|
||||
{ "www.example.com.", "localhost,.example.com,.example.de", TRUE, FALSE},
|
||||
{ "example.com", "localhost,.example.com,.example.de", TRUE, FALSE},
|
||||
{ "example.com.", "localhost,.example.com,.example.de", TRUE, FALSE},
|
||||
{ "www.example.com", "localhost,.example.com.,.example.de", TRUE, FALSE},
|
||||
{ "www.example.com", "localhost,www.example.com.,.example.de",
|
||||
TRUE, FALSE},
|
||||
{ "example.com", "localhost,example.com,.example.de", TRUE, FALSE},
|
||||
{ "example.com.", "localhost,example.com,.example.de", TRUE, FALSE},
|
||||
{ "nexample.com", "localhost,example.com,.example.de", FALSE, FALSE},
|
||||
{ "www.example.com", "localhost,example.com,.example.de", TRUE, FALSE},
|
||||
{ "127.0.0.1", "127.0.0.1,localhost", TRUE, FALSE},
|
||||
{ "127.0.0.1", "127.0.0.1,localhost,", TRUE, FALSE},
|
||||
{ "127.0.0.1", "127.0.0.1/8,localhost,", TRUE, FALSE},
|
||||
{ "127.0.0.1", "127.0.0.1/28,localhost,", TRUE, FALSE},
|
||||
{ "127.0.0.1", "127.0.0.1/31,localhost,", TRUE, FALSE},
|
||||
{ "127.0.0.1", "localhost,127.0.0.1", TRUE, FALSE},
|
||||
{ "www.example.com", "localhost .example.com .example.de", FALSE},
|
||||
{ "www.example.com", "localhost,.example.com,.example.de", TRUE},
|
||||
{ "www.example.com.", "localhost,.example.com,.example.de", TRUE},
|
||||
{ "example.com", "localhost,.example.com,.example.de", TRUE},
|
||||
{ "example.com.", "localhost,.example.com,.example.de", TRUE},
|
||||
{ "www.example.com", "localhost,.example.com.,.example.de", TRUE},
|
||||
{ "www.example.com", "localhost,www.example.com.,.example.de", TRUE},
|
||||
{ "example.com", "localhost,example.com,.example.de", TRUE},
|
||||
{ "example.com.", "localhost,example.com,.example.de", TRUE},
|
||||
{ "nexample.com", "localhost,example.com,.example.de", FALSE},
|
||||
{ "www.example.com", "localhost,example.com,.example.de", TRUE},
|
||||
{ "127.0.0.1", "127.0.0.1,localhost", TRUE},
|
||||
{ "127.0.0.1", "127.0.0.1,localhost,", TRUE},
|
||||
{ "127.0.0.1", "127.0.0.1/8,localhost,", TRUE},
|
||||
{ "127.0.0.1", "127.0.0.1/28,localhost,", TRUE},
|
||||
{ "127.0.0.1", "127.0.0.1/31,localhost,", TRUE},
|
||||
{ "127.0.0.1", "localhost,127.0.0.1", TRUE},
|
||||
{ "127.0.0.1", "localhost,127.0.0.1.127.0.0.1.127.0.0.1.127.0.0.1."
|
||||
"127.0.0.1.127.0.0.1.127.0.0.1.127.0.0.1.127.0.0.1.127.0.0.1.127."
|
||||
"0.0.1.127.0.0.1.127.0.0." /* 128 bytes "address" */, FALSE, FALSE},
|
||||
"0.0.1.127.0.0.1.127.0.0." /* 128 bytes "address" */, FALSE},
|
||||
{ "127.0.0.1", "localhost,127.0.0.1.127.0.0.1.127.0.0.1.127.0.0.1."
|
||||
"127.0.0.1.127.0.0.1.127.0.0.1.127.0.0.1.127.0.0.1.127.0.0.1.127."
|
||||
"0.0.1.127.0.0.1.127.0.0" /* 127 bytes "address" */, FALSE, FALSE},
|
||||
{ "localhost", "localhost,127.0.0.1", TRUE, FALSE},
|
||||
{ "localhost", "127.0.0.1,localhost", TRUE, FALSE},
|
||||
{ "foobar", "barfoo", FALSE, FALSE},
|
||||
{ "foobar", "foobar", TRUE, FALSE},
|
||||
{ "192.168.0.1", "foobar", FALSE, FALSE},
|
||||
{ "192.168.0.1", "192.168.0.0/16", TRUE, FALSE},
|
||||
{ "192.168.0.1", "192.168.0.0/24", TRUE, FALSE},
|
||||
{ "192.168.0.1", "192.168.0.0/32", FALSE, FALSE},
|
||||
{ "192.168.0.1", "192.168.0.0", FALSE, FALSE},
|
||||
{ "192.168.1.1", "192.168.0.0/24", FALSE, FALSE},
|
||||
{ "192.168.1.1", "foo, bar, 192.168.0.0/24", FALSE, FALSE},
|
||||
{ "192.168.1.1", "foo, bar, 192.168.0.0/16", TRUE, FALSE},
|
||||
{ "[::1]", "foo, bar, 192.168.0.0/16", FALSE, FALSE},
|
||||
{ "[::1]", "foo, bar, ::1/64", TRUE, FALSE},
|
||||
{ "bar", "foo, bar, ::1/64", TRUE, FALSE},
|
||||
{ "BAr", "foo, bar, ::1/64", TRUE, FALSE},
|
||||
{ "BAr", "foo,,,,, bar, ::1/64", TRUE, FALSE},
|
||||
{ "www.example.com", "foo, .example.com", TRUE, FALSE},
|
||||
{ "www.example.com", "www2.example.com, .example.net", FALSE, FALSE},
|
||||
{ "example.com", ".example.com, .example.net", TRUE, FALSE},
|
||||
{ "nonexample.com", ".example.com, .example.net", FALSE, FALSE},
|
||||
{ NULL, NULL, FALSE, FALSE}
|
||||
"0.0.1.127.0.0.1.127.0.0" /* 127 bytes "address" */, FALSE},
|
||||
{ "localhost", "localhost,127.0.0.1", TRUE},
|
||||
{ "localhost", "127.0.0.1,localhost", TRUE},
|
||||
{ "foobar", "barfoo", FALSE},
|
||||
{ "foobar", "foobar", TRUE},
|
||||
{ "192.168.0.1", "foobar", FALSE},
|
||||
{ "192.168.0.1", "192.168.0.0/16", TRUE},
|
||||
{ "192.168.0.1", "192.168.0.0/24", TRUE},
|
||||
{ "192.168.0.1", "192.168.0.0/32", FALSE},
|
||||
{ "192.168.0.1", "192.168.0.0", FALSE},
|
||||
{ "192.168.1.1", "192.168.0.0/24", FALSE},
|
||||
{ "192.168.1.1", "foo, bar, 192.168.0.0/24", FALSE},
|
||||
{ "192.168.1.1", "foo, bar, 192.168.0.0/16", TRUE},
|
||||
{ "[::1]", "foo, bar, 192.168.0.0/16", FALSE},
|
||||
{ "[::1]", "foo, bar, ::1/64", TRUE},
|
||||
{ "bar", "foo, bar, ::1/64", TRUE},
|
||||
{ "BAr", "foo, bar, ::1/64", TRUE},
|
||||
{ "BAr", "foo,,,,, bar, ::1/64", TRUE},
|
||||
{ "www.example.com", "foo, .example.com", TRUE},
|
||||
{ "www.example.com", "www2.example.com, .example.net", FALSE},
|
||||
{ "example.com", ".example.com, .example.net", TRUE},
|
||||
{ "nonexample.com", ".example.com, .example.net", FALSE},
|
||||
{ NULL, NULL, FALSE}
|
||||
};
|
||||
for(i = 0; list4[i].a; i++) {
|
||||
bool match = Curl_cidr4_match(list4[i].a, list4[i].n, list4[i].bits);
|
||||
@ -144,19 +142,13 @@ UNITTEST_START
|
||||
}
|
||||
}
|
||||
for(i = 0; list[i].a; i++) {
|
||||
bool spacesep = FALSE;
|
||||
bool match = Curl_check_noproxy(list[i].a, list[i].n, &spacesep);
|
||||
bool match = Curl_check_noproxy(list[i].a, list[i].n);
|
||||
if(match != list[i].match) {
|
||||
fprintf(stderr, "%s in %s should %smatch\n",
|
||||
list[i].a, list[i].n,
|
||||
list[i].match ? "": "not ");
|
||||
err++;
|
||||
}
|
||||
if(spacesep != list[i].space) {
|
||||
fprintf(stderr, "%s is claimed to be %sspace separated\n",
|
||||
list[i].n, list[i].space?"":"NOT ");
|
||||
err++;
|
||||
}
|
||||
}
|
||||
fail_if(err, "errors");
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user