git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Nelson Benitez Leon <nelsonjesus.benitez@seap.minhap.es>
Cc: git@vger.kernel.org, peff@peff.net, sam@vilain.net
Subject: Re: [PATCH v2 3/3] http: when proxy url has username but no password, ask for password
Date: Thu, 01 Mar 2012 11:16:18 -0800	[thread overview]
Message-ID: <7vty28m8sd.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <4F4FBE6C.5050507@seap.minhap.es> (Nelson Benitez Leon's message of "Thu, 01 Mar 2012 19:22:36 +0100")

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.

>
> 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.

      parent reply	other threads:[~2012-03-01 19:16 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-03-01 18:22 [PATCH v2 3/3] http: when proxy url has username but no password, ask for password Nelson Benitez Leon
2012-03-01 17:49 ` Sam Vilain
2012-03-01 21:58   ` Jeff King
2012-03-02 13:33     ` Nelson Benitez Leon
2012-03-02 12:45       ` Jeff King
2012-03-02 14:05         ` Nelson Benitez Leon
2012-03-02 13:52           ` Jeff King
2012-03-01 19:16 ` Junio C Hamano [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=7vty28m8sd.fsf@alter.siamese.dyndns.org \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=nelsonjesus.benitez@seap.minhap.es \
    --cc=peff@peff.net \
    --cc=sam@vilain.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).