[PATCH v3 4/4] http: handle proxy authentication failure (error 407)
- From
- Nelson Benitez Leon <nelsonjesus.benitez@seap.minhap.es>
- Date
- Mar 5, 2012, 15:21 UTC
- Message-ID
- <4F54D9F8.2010401@seap.minhap.es>
Handle http 407 error code by asking for credentials and retrying request in case credentials were not present, or marking credentials as rejected if they were already provided.
Signed-off-by: Nelson Benitez Leon <nbenitezl@gmail.com> --- http.c | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/http.c b/http.c index b0b4362..5fffa47 100644 --- a/http.c +++ b/http.c @@ -812,6 +812,22 @@ static int http_request(const char *url, void *result, int target, int options) init_curl_http_auth(slot->curl); ret = HTTP_REAUTH; } + } else if (results.http_code == 407) { /* Proxy authentication failure */ + if (proxy_auth.username && proxy_auth.password) { + credential_reject(&proxy_auth); + ret = HTTP_NOAUTH; + } else { + struct strbuf pbuf = STRBUF_INIT; + credential_from_url(&proxy_auth, curl_http_proxy); + 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(slot->curl, CURLOPT_PROXY, curl_http_proxy); + ret = HTTP_REAUTH; + } } else { if (!curl_errorstr[0]) strlcpy(curl_errorstr,
-- 1.7.7.6