threads / patch / 41568

patchhttp: honor no_http env variable to bypass proxy

Subject: [PATCH] http: honor no_http env variable to bypass proxy

## tl;dr

5 messages between Feb 29, 2016 and Mar 10, 2016. Diffs are folded; open one to read it.

replies: 4people: 3as markdown or json

Jiang Xin· Feb 29, 2016, 15:16 UTC · lore

From: Jiang Xin <xin.jiang@huawei.com>

Curl and its families honor several proxy related environment variables:

* http_proxy and https_proxy define proxy for http/https connections.
* no_proxy (a comma separated hosts) defines hosts bypass the proxy.

This command will bypass the bad-proxy and connect to the host directly:

    no_proxy=* https_proxy=http://bad-proxy/ \
    curl -sk https://google.com/

Before commit 372370f (http: use credential API to handle proxy auth...), Environment variable "no_proxy" will take effect if the config variable "http.proxy" is not set. So the following comamnd won't fail if not behind a firewall.

    no_proxy=* https_proxy=http://bad-proxy/ \
    git ls-remote https://github.com/git/git

But commit 372370f not only read git config variable "http.proxy", but also read "http_proxy" and "https_proxy" environment variables, and set the curl option using:

    curl_easy_setopt(result, CURLOPT_PROXY, proxy_auth.host);

This caused "no_proxy" environment variable not working any more.

Set extra curl option "CURLOPT_NOPROXY" will fix this issue.

Signed-off-by: Jiang Xin <xin.jiang@huawei.com>
---
 http.c | 6 ++++++
 1 file changed, 6 insertions(+)

Show changes to http.c +6 −0

diff --git a/http.c b/http.c
index 1d5e3bb..69da445 100644
--- a/http.c
+++ b/http.c
@@ -70,6 +70,7 @@ static long curl_low_speed_limit = -1;
 static long curl_low_speed_time = -1;
 static int curl_ftp_no_epsv;
 static const char *curl_http_proxy;
+static const char *curl_no_proxy;
 static const char *http_proxy_authmethod;
 static struct {
 	const char *name;
@@ -624,6 +625,11 @@ static CURL *get_curl_handle(void)
 		}
 
 		curl_easy_setopt(result, CURLOPT_PROXY, proxy_auth.host);
+#if LIBCURL_VERSION_NUM >= 0x071304
+		var_override(&curl_no_proxy, getenv("NO_PROXY"));
+		var_override(&curl_no_proxy, getenv("no_proxy"));
+		curl_easy_setopt(result, CURLOPT_NOPROXY, curl_no_proxy);
+#endif
 	}
 	init_curl_proxy_auth(result);

-- 
2.8.0.rc0.1.g9eb3984.dirty

Junio C Hamano· Feb 29, 2016, 19:29 UTC · re: Jiang Xin · lore

Re: [PATCH] http: honor no_http env variable to bypass proxy

Jiang Xin <worldhello.net@gmail.com> writes:

Show 34 quoted lines

> From: Jiang Xin <xin.jiang@huawei.com>
>
> Curl and its families honor several proxy related environment variables:
>
> * http_proxy and https_proxy define proxy for http/https connections.
> * no_proxy (a comma separated hosts) defines hosts bypass the proxy.
>
> This command will bypass the bad-proxy and connect to the host directly:
>
>     no_proxy=* https_proxy=http://bad-proxy/ \
>     curl -sk https://google.com/
>
> Before commit 372370f (http: use credential API to handle proxy auth...),
> Environment variable "no_proxy" will take effect if the config variable
> "http.proxy" is not set.  So the following comamnd won't fail if not
> behind a firewall.
>
>     no_proxy=* https_proxy=http://bad-proxy/ \
>     git ls-remote https://github.com/git/git
>
> But commit 372370f not only read git config variable "http.proxy", but
> also read "http_proxy" and "https_proxy" environment variables, and set
> the curl option using:
>
>     curl_easy_setopt(result, CURLOPT_PROXY, proxy_auth.host);
>
> This caused "no_proxy" environment variable not working any more.
>
> Set extra curl option "CURLOPT_NOPROXY" will fix this issue.
>
> Signed-off-by: Jiang Xin <xin.jiang@huawei.com>
> ---
>  http.c | 6 ++++++
>  1 file changed, 6 insertions(+)

Sounds sensible; I am guessing that this is 2.8.0-rc0 regression that we need to fast-track?

Knut, does this look good?

Thanks.

Show 23 quoted lines

> diff --git a/http.c b/http.c
> index 1d5e3bb..69da445 100644
> --- a/http.c
> +++ b/http.c
> @@ -70,6 +70,7 @@ static long curl_low_speed_limit = -1;
>  static long curl_low_speed_time = -1;
>  static int curl_ftp_no_epsv;
>  static const char *curl_http_proxy;
> +static const char *curl_no_proxy;
>  static const char *http_proxy_authmethod;
>  static struct {
>  	const char *name;
> @@ -624,6 +625,11 @@ static CURL *get_curl_handle(void)
>  		}
>  
>  		curl_easy_setopt(result, CURLOPT_PROXY, proxy_auth.host);
> +#if LIBCURL_VERSION_NUM >= 0x071304
> +		var_override(&curl_no_proxy, getenv("NO_PROXY"));
> +		var_override(&curl_no_proxy, getenv("no_proxy"));
> +		curl_easy_setopt(result, CURLOPT_NOPROXY, curl_no_proxy);
> +#endif
>  	}
>  	init_curl_proxy_auth(result);

Junio C Hamano· Mar 7, 2016, 20:33 UTC · re: Junio C Hamano · lore

Re: [PATCH] http: honor no_http env variable to bypass proxy

Junio C Hamano <gitster@pobox.com> writes:

Second call for help. I hate having to revert 30f302f7 (Merge branch 'kf/http-proxy-auth-methods', 2016-02-03) this late in the cycle.

Show 67 quoted lines

> Jiang Xin <worldhello.net@gmail.com> writes:
>
>> From: Jiang Xin <xin.jiang@huawei.com>
>>
>> Curl and its families honor several proxy related environment variables:
>>
>> * http_proxy and https_proxy define proxy for http/https connections.
>> * no_proxy (a comma separated hosts) defines hosts bypass the proxy.
>>
>> This command will bypass the bad-proxy and connect to the host directly:
>>
>>     no_proxy=* https_proxy=http://bad-proxy/ \
>>     curl -sk https://google.com/
>>
>> Before commit 372370f (http: use credential API to handle proxy auth...),
>> Environment variable "no_proxy" will take effect if the config variable
>> "http.proxy" is not set.  So the following comamnd won't fail if not
>> behind a firewall.
>>
>>     no_proxy=* https_proxy=http://bad-proxy/ \
>>     git ls-remote https://github.com/git/git
>>
>> But commit 372370f not only read git config variable "http.proxy", but
>> also read "http_proxy" and "https_proxy" environment variables, and set
>> the curl option using:
>>
>>     curl_easy_setopt(result, CURLOPT_PROXY, proxy_auth.host);
>>
>> This caused "no_proxy" environment variable not working any more.
>>
>> Set extra curl option "CURLOPT_NOPROXY" will fix this issue.
>>
>> Signed-off-by: Jiang Xin <xin.jiang@huawei.com>
>> ---
>>  http.c | 6 ++++++
>>  1 file changed, 6 insertions(+)
>
> Sounds sensible; I am guessing that this is 2.8.0-rc0 regression
> that we need to fast-track?
>
> Knut, does this look good?
>
> Thanks.
>
>> diff --git a/http.c b/http.c
>> index 1d5e3bb..69da445 100644
>> --- a/http.c
>> +++ b/http.c
>> @@ -70,6 +70,7 @@ static long curl_low_speed_limit = -1;
>>  static long curl_low_speed_time = -1;
>>  static int curl_ftp_no_epsv;
>>  static const char *curl_http_proxy;
>> +static const char *curl_no_proxy;
>>  static const char *http_proxy_authmethod;
>>  static struct {
>>  	const char *name;
>> @@ -624,6 +625,11 @@ static CURL *get_curl_handle(void)
>>  		}
>>  
>>  		curl_easy_setopt(result, CURLOPT_PROXY, proxy_auth.host);
>> +#if LIBCURL_VERSION_NUM >= 0x071304
>> +		var_override(&curl_no_proxy, getenv("NO_PROXY"));
>> +		var_override(&curl_no_proxy, getenv("no_proxy"));
>> +		curl_easy_setopt(result, CURLOPT_NOPROXY, curl_no_proxy);
>> +#endif
>>  	}
>>  	init_curl_proxy_auth(result);

Elia Pinto· Mar 10, 2016, 08:50 UTC · re: Junio C Hamano · lore

Re: [PATCH] http: honor no_http env variable to bypass proxy

2016-03-07 21:33 GMT+01:00 Junio C Hamano <gitster@pobox.com>:

Show 5 quoted lines

> Junio C Hamano <gitster@pobox.com> writes:
>
> Second call for help.  I hate having to revert 30f302f7 (Merge
> branch 'kf/http-proxy-auth-methods', 2016-02-03) this late in the
> cycle.

Ok. I made the original merge commit for master. So, if it is sufficient, for me the patch is correct.

I am sorry for the delay in the response.

Best

Show 72 quoted lines

>
>> Jiang Xin <worldhello.net@gmail.com> writes:
>>
>>> From: Jiang Xin <xin.jiang@huawei.com>
>>>
>>> Curl and its families honor several proxy related environment variables:
>>>
>>> * http_proxy and https_proxy define proxy for http/https connections.
>>> * no_proxy (a comma separated hosts) defines hosts bypass the proxy.
>>>
>>> This command will bypass the bad-proxy and connect to the host directly:
>>>
>>>     no_proxy=* https_proxy=http://bad-proxy/ \
>>>     curl -sk https://google.com/
>>>
>>> Before commit 372370f (http: use credential API to handle proxy auth...),
>>> Environment variable "no_proxy" will take effect if the config variable
>>> "http.proxy" is not set.  So the following comamnd won't fail if not
>>> behind a firewall.
>>>
>>>     no_proxy=* https_proxy=http://bad-proxy/ \
>>>     git ls-remote https://github.com/git/git
>>>
>>> But commit 372370f not only read git config variable "http.proxy", but
>>> also read "http_proxy" and "https_proxy" environment variables, and set
>>> the curl option using:
>>>
>>>     curl_easy_setopt(result, CURLOPT_PROXY, proxy_auth.host);
>>>
>>> This caused "no_proxy" environment variable not working any more.
>>>
>>> Set extra curl option "CURLOPT_NOPROXY" will fix this issue.
>>>
>>> Signed-off-by: Jiang Xin <xin.jiang@huawei.com>
>>> ---
>>>  http.c | 6 ++++++
>>>  1 file changed, 6 insertions(+)
>>
>> Sounds sensible; I am guessing that this is 2.8.0-rc0 regression
>> that we need to fast-track?
>>
>> Knut, does this look good?
>>
>> Thanks.
>>
>>> diff --git a/http.c b/http.c
>>> index 1d5e3bb..69da445 100644
>>> --- a/http.c
>>> +++ b/http.c
>>> @@ -70,6 +70,7 @@ static long curl_low_speed_limit = -1;
>>>  static long curl_low_speed_time = -1;
>>>  static int curl_ftp_no_epsv;
>>>  static const char *curl_http_proxy;
>>> +static const char *curl_no_proxy;
>>>  static const char *http_proxy_authmethod;
>>>  static struct {
>>>      const char *name;
>>> @@ -624,6 +625,11 @@ static CURL *get_curl_handle(void)
>>>              }
>>>
>>>              curl_easy_setopt(result, CURLOPT_PROXY, proxy_auth.host);
>>> +#if LIBCURL_VERSION_NUM >= 0x071304
>>> +            var_override(&curl_no_proxy, getenv("NO_PROXY"));
>>> +            var_override(&curl_no_proxy, getenv("no_proxy"));
>>> +            curl_easy_setopt(result, CURLOPT_NOPROXY, curl_no_proxy);
>>> +#endif
>>>      }
>>>      init_curl_proxy_auth(result);
> --
> To unsubscribe from this list: send the line "unsubscribe git" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

Elia Pinto· Mar 10, 2016, 08:46 UTC · re: Jiang Xin · lore

Re: [PATCH] http: honor no_http env variable to bypass proxy

2016-02-29 16:16 GMT+01:00 Jiang Xin <worldhello.net@gmail.com>:

Show 31 quoted lines

> From: Jiang Xin <xin.jiang@huawei.com>
>
> Curl and its families honor several proxy related environment variables:
>
> * http_proxy and https_proxy define proxy for http/https connections.
> * no_proxy (a comma separated hosts) defines hosts bypass the proxy.
>
> This command will bypass the bad-proxy and connect to the host directly:
>
>     no_proxy=* https_proxy=http://bad-proxy/ \
>     curl -sk https://google.com/
>
> Before commit 372370f (http: use credential API to handle proxy auth...),
> Environment variable "no_proxy" will take effect if the config variable
> "http.proxy" is not set.  So the following comamnd won't fail if not
> behind a firewall.
>
>     no_proxy=* https_proxy=http://bad-proxy/ \
>     git ls-remote https://github.com/git/git
>
> But commit 372370f not only read git config variable "http.proxy", but
> also read "http_proxy" and "https_proxy" environment variables, and set
> the curl option using:
>
>     curl_easy_setopt(result, CURLOPT_PROXY, proxy_auth.host);
>
> This caused "no_proxy" environment variable not working any more.
>
> Set extra curl option "CURLOPT_NOPROXY" will fix this issue.
>
> Signed-off-by: Jiang Xin <xin.jiang@huawei.com>

Signed-off-by: Elia Pinto <gitter.spiros@gmail.com>

Show 35 quoted lines

> ---
>  http.c | 6 ++++++
>  1 file changed, 6 insertions(+)
>
> diff --git a/http.c b/http.c
> index 1d5e3bb..69da445 100644
> --- a/http.c
> +++ b/http.c
> @@ -70,6 +70,7 @@ static long curl_low_speed_limit = -1;
>  static long curl_low_speed_time = -1;
>  static int curl_ftp_no_epsv;
>  static const char *curl_http_proxy;
> +static const char *curl_no_proxy;
>  static const char *http_proxy_authmethod;
>  static struct {
>         const char *name;
> @@ -624,6 +625,11 @@ static CURL *get_curl_handle(void)
>                 }
>
>                 curl_easy_setopt(result, CURLOPT_PROXY, proxy_auth.host);
> +#if LIBCURL_VERSION_NUM >= 0x071304
> +               var_override(&curl_no_proxy, getenv("NO_PROXY"));
> +               var_override(&curl_no_proxy, getenv("no_proxy"));
> +               curl_easy_setopt(result, CURLOPT_NOPROXY, curl_no_proxy);
> +#endif
>         }
>         init_curl_proxy_auth(result);
>
> --
> 2.8.0.rc0.1.g9eb3984.dirty
>
> --
> To unsubscribe from this list: send the line "unsubscribe git" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html