diff options
Diffstat (limited to 'Lib/urllib2.py')
| -rw-r--r-- | Lib/urllib2.py | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/Lib/urllib2.py b/Lib/urllib2.py index 10051ff..aadeb73 100644 --- a/Lib/urllib2.py +++ b/Lib/urllib2.py @@ -843,7 +843,10 @@ class AbstractBasicAuthHandler: password_mgr = HTTPPasswordMgr() self.passwd = password_mgr self.add_password = self.passwd.add_password + self.retried = 0 + def reset_retry_count(self): + self.retried = 0 def http_error_auth_reqed(self, authreq, host, req, headers): # host may be an authority (without userinfo) or a URL with an @@ -851,6 +854,13 @@ class AbstractBasicAuthHandler: # XXX could be multiple headers authreq = headers.get(authreq, None) + if self.retried > 5: + # retry sending the username:password 5 times before failing. + raise HTTPError(req.get_full_url(), 401, "basic auth failed", + headers, None) + else: + self.retried += 1 + if authreq: mo = AbstractBasicAuthHandler.rx.search(authreq) if mo: @@ -859,14 +869,17 @@ class AbstractBasicAuthHandler: warnings.warn("Basic Auth Realm was unquoted", UserWarning, 2) if scheme.lower() == 'basic': - return self.retry_http_basic_auth(host, req, realm) + response = self.retry_http_basic_auth(host, req, realm) + if response and response.code != 401: + self.retried = 0 + return response def retry_http_basic_auth(self, host, req, realm): user, pw = self.passwd.find_user_password(realm, host) if pw is not None: raw = "%s:%s" % (user, pw) auth = 'Basic %s' % base64.b64encode(raw).strip() - if req.get_header(self.auth_header, None) == auth: + if req.headers.get(self.auth_header, None) == auth: return None req.add_unredirected_header(self.auth_header, auth) return self.parent.open(req, timeout=req.timeout) @@ -882,6 +895,7 @@ class HTTPBasicAuthHandler(AbstractBasicAuthHandler, BaseHandler): url = req.get_full_url() response = self.http_error_auth_reqed('www-authenticate', url, req, headers) + self.reset_retry_count() return response @@ -897,6 +911,7 @@ class ProxyBasicAuthHandler(AbstractBasicAuthHandler, BaseHandler): authority = req.get_host() response = self.http_error_auth_reqed('proxy-authenticate', authority, req, headers) + self.reset_retry_count() return response |