Re: [PATCH v2 3/3] http: when proxy url has username but no password, ask for password

From: Junio C Hamano <gitster@pobox.com>
Date: Mar 1, 2012, 19:16 UTC
Message-ID: <7vty28m8sd.fsf@alter.siamese.dyndns.org>
In-Reply-To: <4F4FBE6C.5050507@seap.minhap.es>

Nelson Benitez Leon <nelsonjesus.benitez@seap.minhap.es> writes:

> Support proxy urls with username but without a password, in which
> case we interactively ask for the password (using credential api).
> This makes possible to not have the password written down in
> http_proxy env var or in http.proxy config option.

How do other people's applications that use http_proxy environment variable handle this situation?

With this patch and the previous 2/3, we are allowing people to set "http_proxy=http://me@over.there/", but an environment variable is global to the user's environment, so if other applications do not grok the "name only" proxy URL the same way as this patch does, adding this code only to Git does not make users' lives any better.

Of course the above does not apply to http.proxy configuration, which is specific to Git.

Show 25 quoted lines

>
> Signed-off-by: Nelson Benitez Leon <nbenitezl@gmail.com>
> ---
>  http.c |   16 +++++++++++++++-
>  1 files changed, 15 insertions(+), 1 deletions(-)
>
> diff --git a/http.c b/http.c
> index 8932da5..5916194 100644
> --- a/http.c
> +++ b/http.c
> @@ -43,6 +43,7 @@ static int curl_ftp_no_epsv;
>  static const char *curl_http_proxy;
>  static const char *curl_cookie_file;
>  static struct credential http_auth = CREDENTIAL_INIT;
> +static struct credential proxy_auth = CREDENTIAL_INIT;
>  static int http_proactive_auth;
>  static const char *user_agent;
>  
> @@ -303,7 +304,20 @@ static CURL *get_curl_handle(void)
>  		}
>  	}
>  	if (curl_http_proxy) {
> -		curl_easy_setopt(result, CURLOPT_PROXY, curl_http_proxy);
> +		credential_from_url(&proxy_auth, curl_http_proxy);
> +		if (proxy_auth.username != NULL && proxy_auth.password == NULL) {

Just a style, but

		if (proxy_auth.username && !proxy_auth.password) {

is much more preferred.

> +			free ((void *)curl_http_proxy);

I think somebody already pointed out interaction of this with 2/3.