openstack/python-keystoneclient
Code Issues Proposed changes

Merge "Cached tokens aren't expired"

Browse Source
This commit is contained in:
Jenkins
2014-05-27 17:40:42 +00:00
committed by Gerrit Code Review
parent 1ba21e4b8a 01231bbc6e
commit 8d05f81303
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
keystoneclient/middleware/auth_token.py
View File

@@ -1014,7 +1014,7 @@ class AuthProtocol(object):
env_key = self._header_to_env_var(key) env_key = self._header_to_env_var(key)
return env.get(env_key, default) return env.get(env_key, default)
def _cache_get(self, token_id, ignore_expires=False): def _cache_get(self, token_id):
"""Return token information from cache. """Return token information from cache.
If token is invalid raise InvalidUserToken If token is invalid raise InvalidUserToken
@@ -1077,7 +1077,7 @@ class AuthProtocol(object):
expires = timeutils.normalize_time(expires) expires = timeutils.normalize_time(expires)
utcnow = timeutils.utcnow() utcnow = timeutils.utcnow()
if ignore_expires or utcnow < expires: if utcnow < expires:
self.LOG.debug('Returning cached token') self.LOG.debug('Returning cached token')
return data return data
else: else:

3
keystoneclient/tests/test_auth_token_middleware.py
View File

@@ -718,8 +718,7 @@ class CommonAuthTokenMiddlewareTest(object):
def _get_cached_token(self, token): def _get_cached_token(self, token):
token_id = cms.cms_hash_token(token) token_id = cms.cms_hash_token(token)
# NOTE(vish): example tokens are expired so skip the expiration check. return self.middleware._cache_get(token_id)
return self.middleware._cache_get(token_id, ignore_expires=True)
def test_memcache(self): def test_memcache(self):
# NOTE(jamielennox): it appears that httpretty can mess with the # NOTE(jamielennox): it appears that httpretty can mess with the