diff options
author | Jenkins <jenkins@review.openstack.org> | 2015-04-21 03:57:10 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2015-04-21 03:57:10 +0000 |
commit | c8f2500550d865d8e46751bcd3b759b25c473f50 (patch) | |
tree | b355a44342e423267e0105b8b667dc287ecde3ad | |
parent | 2f70e3d544a51ff1ac8f515f3776bba38feb82fc (diff) | |
parent | 452bf87121eb5fcdf84d557aee4b452ce5121860 (diff) | |
download | keystonemiddleware-1.6.0.tar.gz |
Merge "Remove retry parameter"1.6.0
-rw-r--r-- | keystonemiddleware/auth_token/__init__.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/keystonemiddleware/auth_token/__init__.py b/keystonemiddleware/auth_token/__init__.py index aca9f85..0a8b660 100644 --- a/keystonemiddleware/auth_token/__init__.py +++ b/keystonemiddleware/auth_token/__init__.py @@ -723,12 +723,11 @@ class AuthProtocol(object): start_response('401 Unauthorized', resp.headers) return resp.body - def _validate_token(self, token, env, retry=True): + def _validate_token(self, token, env): """Authenticate user token :param token: token id :param env: wsgi environment - :param retry: Ignored, as it is not longer relevant :returns: uncrypted body of the token if the token is valid :raises exc.InvalidToken: if token is rejected @@ -773,7 +772,7 @@ class AuthProtocol(object): expires = _get_token_expiration(data) _confirm_token_not_expired(expires) else: - data = self._identity_server.verify_token(token, retry) + data = self._identity_server.verify_token(token) # No need to confirm token expiration here since # verify_token fails for expired tokens. expires = _get_token_expiration(data) |