openstack/python-keystoneclient
Code Issues Proposed changes

Merge "auth_token _cache_get checks token expired"

Browse Source
This commit is contained in:
Jenkins
2014-06-18 16:04:18 +00:00
committed by Gerrit Code Review
parent f88a9c641d 1e265faf15
commit 8247200e37
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
keystoneclient/middleware/auth_token.py
View File

@@ -1518,6 +1518,7 @@ class TokenCache(object):
return data return data
else: else:
self.LOG.debug('Cached Token seems expired') self.LOG.debug('Cached Token seems expired')
raise InvalidUserToken('Token authorization failed')
def _cache_store(self, token_id, data): def _cache_store(self, token_id, data):
"""Store value into memcache. """Store value into memcache.

7
keystoneclient/tests/test_auth_token_middleware.py
View File

@@ -28,6 +28,7 @@ import iso8601
import mock import mock
import testresources import testresources
import testtools import testtools
from testtools import matchers
import webob import webob
from keystoneclient import access from keystoneclient import access
@@ -1904,7 +1905,8 @@ class TokenExpirationTest(BaseAuthTokenMiddlewareTest):
some_time_earlier = timeutils.strtime(at=(self.now - self.delta)) some_time_earlier = timeutils.strtime(at=(self.now - self.delta))
expires = some_time_earlier expires = some_time_earlier
self.middleware._token_cache.store(token, data, expires) self.middleware._token_cache.store(token, data, expires)
self.assertIsNone(self.middleware._token_cache._cache_get(token)) self.assertThat(lambda: self.middleware._token_cache._cache_get(token),
matchers.raises(auth_token.InvalidUserToken))
def test_cached_token_with_timezone_offset_not_expired(self): def test_cached_token_with_timezone_offset_not_expired(self):
token = 'mytoken' token = 'mytoken'
@@ -1926,7 +1928,8 @@ class TokenExpirationTest(BaseAuthTokenMiddlewareTest):
some_time_earlier = self.now - timezone_offset - self.delta some_time_earlier = self.now - timezone_offset - self.delta
expires = timeutils.strtime(some_time_earlier) + '-02:00' expires = timeutils.strtime(some_time_earlier) + '-02:00'
self.middleware._token_cache.store(token, data, expires) self.middleware._token_cache.store(token, data, expires)
self.assertIsNone(self.middleware._token_cache._cache_get(token)) self.assertThat(lambda: self.middleware._token_cache._cache_get(token),
matchers.raises(auth_token.InvalidUserToken))
class CatalogConversionTests(BaseAuthTokenMiddlewareTest): class CatalogConversionTests(BaseAuthTokenMiddlewareTest):