openstack/keystonemiddleware
Code Issues Proposed changes

Merge "Remove retry parameter"

Browse Source
This commit is contained in:
Jenkins 2015-04-21 03:57:10 +00:00 committed by Gerrit Code Review
commit c8f2500550
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
keystonemiddleware/auth_token/__init__.py
View File

@ -723,12 +723,11 @@ class AuthProtocol(object):
start_response('401 Unauthorized', resp.headers) start_response('401 Unauthorized', resp.headers)
return resp.body return resp.body
def _validate_token(self, token, env, retry=True): def _validate_token(self, token, env):
"""Authenticate user token """Authenticate user token
:param token: token id :param token: token id
:param env: wsgi environment :param env: wsgi environment
:param retry: Ignored, as it is not longer relevant
:returns: uncrypted body of the token if the token is valid :returns: uncrypted body of the token if the token is valid
:raises exc.InvalidToken: if token is rejected :raises exc.InvalidToken: if token is rejected
@ -773,7 +772,7 @@ class AuthProtocol(object):
expires = _get_token_expiration(data) expires = _get_token_expiration(data)
_confirm_token_not_expired(expires) _confirm_token_not_expired(expires)
else: else:
data = self._identity_server.verify_token(token, retry) data = self._identity_server.verify_token(token)
# No need to confirm token expiration here since # No need to confirm token expiration here since
# verify_token fails for expired tokens. # verify_token fails for expired tokens.
expires = _get_token_expiration(data) expires = _get_token_expiration(data)