[PATCH v3 3/4] http: handle proxy proactive authentication
- From
- Nelson Benitez Leon <nelsonjesus.benitez@seap.minhap.es>
- Date
- Mar 5, 2012, 15:19 UTC
- Message-ID
- <4F54D98C.2070909@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.
Signed-off-by: Nelson Benitez Leon <nbenitezl@gmail.com> --- http.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/http.c b/http.c index 8932da5..b0b4362 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,6 +304,17 @@ static CURL *get_curl_handle(void) } } if (curl_http_proxy) { + 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 */ + struct strbuf pbuf = STRBUF_INIT; + credential_fill(&proxy_auth); + strbuf_addf(&pbuf, "%s://%s:%s@%s",proxy_auth.protocol, + proxy_auth.username, proxy_auth.password, + proxy_auth.host); + free ((void *)curl_http_proxy); + curl_http_proxy = strbuf_detach(&pbuf, NULL); + } curl_easy_setopt(result, CURLOPT_PROXY, curl_http_proxy); curl_easy_setopt(result, CURLOPT_PROXYAUTH, CURLAUTH_ANY); }
-- 1.7.7.6