diff options
| author | Adam Young <ayoung@redhat.com> | 2013-03-27 12:10:08 -0400 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-04-12 17:51:33 +0000 |
| commit | a62d3afae43ebe191fe86f8d1ebed3e8bfaeba17 (patch) | |
| tree | 0e2cd4b5b16d5dbb871de98cf6ff5a3f06c30d35 /keystone/token | |
| parent | a75e1128f442c0436a3ef669a24c639f74df0f97 (diff) | |
| download | keystone-a62d3afae43ebe191fe86f8d1ebed3e8bfaeba17.tar.gz keystone-a62d3afae43ebe191fe86f8d1ebed3e8bfaeba17.tar.xz keystone-a62d3afae43ebe191fe86f8d1ebed3e8bfaeba17.zip | |
Fix token ids for memcached
Bug 1119641
Change-Id: Ia22764acc69a272b37364193d10c553a48679b9a
Diffstat (limited to 'keystone/token')
| -rw-r--r-- | keystone/token/backends/memcache.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/keystone/token/backends/memcache.py b/keystone/token/backends/memcache.py index 8ab1f86d..a62f3421 100644 --- a/keystone/token/backends/memcache.py +++ b/keystone/token/backends/memcache.py @@ -54,12 +54,12 @@ class Token(token.Driver): def get_token(self, token_id): if token_id is None: raise exception.TokenNotFound(token_id='') - ptk = self._prefix_token_id(token_id) - token = self.client.get(ptk) - if token is None: + ptk = self._prefix_token_id(token.unique_id(token_id)) + token_ref = self.client.get(ptk) + if token_ref is None: raise exception.TokenNotFound(token_id=token_id) - return token + return token_ref def create_token(self, token_id, data): data_copy = copy.deepcopy(data) @@ -107,7 +107,7 @@ class Token(token.Driver): user_record = self.client.get(user_key) or "" token_list = jsonutils.loads('[%s]' % user_record) for token_id in token_list: - ptk = self._prefix_token_id(token_id) + ptk = self._prefix_token_id(token.unique_id(token_id)) token_ref = self.client.get(ptk) if token_ref: if tenant_id is not None: |