openstack/python-keystoneclient
Code Issues Proposed changes

Python: Pass bytes to derive_keys()

Browse Source 
This call was missed in d71b5b3.

Change-Id: I0705dbefa5893e0ff5b786202f58fb254939ae76
This commit is contained in:
Cyril Roelandt
2014-02-11 14:58:47 +01:00
parent 84bafd6041
commit 7e9f2c96db
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
keystoneclient/middleware/auth_token.py
View File

@@ -998,10 +998,16 @@ class AuthProtocol(object):
key = CACHE_KEY_TEMPLATE % token_id key = CACHE_KEY_TEMPLATE % token_id
serialized = self._cache.get(key) serialized = self._cache.get(key)
else: else:
secret_key = self._memcache_secret_key
if isinstance(secret_key, six.string_types):
secret_key = secret_key.encode('utf-8')
security_strategy = self._memcache_security_strategy
if isinstance(security_strategy, six.string_types):
security_strategy = security_strategy.encode('utf-8')
keys = memcache_crypt.derive_keys( keys = memcache_crypt.derive_keys(
token_id, token_id,
self._memcache_secret_key, secret_key,
self._memcache_security_strategy) security_strategy)
cache_key = CACHE_KEY_TEMPLATE % ( cache_key = CACHE_KEY_TEMPLATE % (
memcache_crypt.get_cache_key(keys)) memcache_crypt.get_cache_key(keys))
raw_cached = self._cache.get(cache_key) raw_cached = self._cache.get(cache_key)