From 1683a4177f2fd8f35fc8004aa4e8e2930bc5aadd Mon Sep 17 00:00:00 2001 From: Helmut Grohne Date: Tue, 8 May 2007 23:32:39 +0200 Subject: rearrange nonce checking to comply with RFC2617 in wsgitools.digest --- wsgitools/digest.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'wsgitools/digest.py') diff --git a/wsgitools/digest.py b/wsgitools/digest.py index 244eb98..a0eb973 100755 --- a/wsgitools/digest.py +++ b/wsgitools/digest.py @@ -129,16 +129,16 @@ class AuthDigestMiddleware: if not self.is_nonce(credentials): # riases KeyError, ValueError raise AuthenticationRequired - if not self.check_nonce(credentials): # raises KeyError, ValueError - return self.authorization_required(environ, start_response, - stale=True) # stale nonce! - # raises KeyError, ValueError response = self.auth_response(credentials, environ["REQUEST_METHOD"]) if response is None or response != credentials["response"]: raise AuthenticationRequired + if not self.check_nonce(credentials): # raises KeyError, ValueError + return self.authorization_required(environ, start_response, + stale=True) # stale nonce! + except (KeyError, ValueError, AuthenticationRequired): return self.authorization_required(environ, start_response) else: -- cgit v1.2.3