[PATCH 2/6] http: handle proxy proactive authentication
- From
- Nelson Benitez Leon <nelsonjesus.benitez@seap.minhap.es>
- Date
- May 3, 2012, 16:39 UTC
- Message-ID
- <4FA2B4DA.60908@seap.minhap.es>
If http_proactive_auth flag is set and there is a username but no password in the proxy url, then interactively ask for the password.
This makes possible to not have the password written down in http_proxy env var or in http.proxy config option.
Also take care that CURLOPT_PROXY don't include username or password, as we now set them in the new set_proxy_auth() function where we use their specific cURL options.
Signed-off-by: Nelson Benitez Leon <nbenitezl@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> --- http.c | 28 +++++++++++++++++++++++++++- 1 files changed, 27 insertions(+), 1 deletions(-)
diff --git a/http.c b/http.c index 64df7b1..02f9fcd 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; @@ -272,6 +273,20 @@ static int has_cert_password(void) return 1; } +static void set_proxy_auth(CURL *result) +{ + if (proxy_auth.username && proxy_auth.password) { +#if LIBCURL_VERSION_NUM >= 0x071301 + curl_easy_setopt(result, CURLOPT_PROXYUSERNAME, proxy_auth.username); + curl_easy_setopt(result, CURLOPT_PROXYPASSWORD, proxy_auth.password); +#else + struct strbuf userpwd = STRBUF_INIT; + strbuf_addf(&userpwd, "%s:%s", proxy_auth.username, proxy_auth.password); + curl_easy_setopt(result, CURLOPT_PROXYUSERPWD, strbuf_detach(&userpwd, NULL)); +#endif + } +} + static CURL *get_curl_handle(const char *url) { CURL *result = curl_easy_init(); @@ -351,8 +366,19 @@ static CURL *get_curl_handle(const char *url) } if (curl_http_proxy) { - curl_easy_setopt(result, CURLOPT_PROXY, curl_http_proxy); + struct strbuf proxyhost = STRBUF_INIT; + + if (!proxy_auth.host) /* check to parse only once */ + credential_from_url(&proxy_auth, curl_http_proxy); + + if (http_proactive_auth && proxy_auth.username && !proxy_auth.password) + /* proxy string has username but no password, ask for password */ + credential_fill(&proxy_auth); + + strbuf_addf(&proxyhost, "%s://%s", proxy_auth.protocol, proxy_auth.host); + curl_easy_setopt(result, CURLOPT_PROXY, strbuf_detach(&proxyhost, NULL)); curl_easy_setopt(result, CURLOPT_PROXYAUTH, CURLAUTH_ANY); + set_proxy_auth(result); } return result;
-- 1.7.7.6