From 7e9f2c96db9e0d19a3874a039ac98d2012259a3a Mon Sep 17 00:00:00 2001 From: Cyril Roelandt Date: Tue, 11 Feb 2014 14:58:47 +0100 Subject: [PATCH] Python: Pass bytes to derive_keys() This call was missed in d71b5b3. Change-Id: I0705dbefa5893e0ff5b786202f58fb254939ae76 --- keystoneclient/middleware/auth_token.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/keystoneclient/middleware/auth_token.py b/keystoneclient/middleware/auth_token.py index e27fb9db4..a49459ad0 100644 --- a/keystoneclient/middleware/auth_token.py +++ b/keystoneclient/middleware/auth_token.py @@ -998,10 +998,16 @@ class AuthProtocol(object): key = CACHE_KEY_TEMPLATE % token_id serialized = self._cache.get(key) 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( token_id, - self._memcache_secret_key, - self._memcache_security_strategy) + secret_key, + security_strategy) cache_key = CACHE_KEY_TEMPLATE % ( memcache_crypt.get_cache_key(keys)) raw_cached = self._cache.get(cache_key)