summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustin Santa Barbara <justin@fathomdb.com>2011-02-18 14:35:12 -0800
committerJustin Santa Barbara <justin@fathomdb.com>2011-02-18 14:35:12 -0800
commitbe898f26984da4ee92da1a027e47775cd816fed5 (patch)
tree540cbf9892074e7ade3946dd00f82edbef57bc41
parent5dfa5ce7d1374509fea51f8d0b132ea865f34dc6 (diff)
downloadnova-be898f26984da4ee92da1a027e47775cd816fed5.tar.gz
nova-be898f26984da4ee92da1a027e47775cd816fed5.tar.xz
nova-be898f26984da4ee92da1a027e47775cd816fed5.zip
Fix typo (?) in authentication logic
-rw-r--r--nova/api/openstack/auth.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/nova/api/openstack/auth.py b/nova/api/openstack/auth.py
index 473071738..0b6ef8fc5 100644
--- a/nova/api/openstack/auth.py
+++ b/nova/api/openstack/auth.py
@@ -121,8 +121,8 @@ class AuthMiddleware(wsgi.Middleware):
req - webob.Request object
"""
ctxt = context.get_admin_context()
- user = self.auth.get_user_from_access_key(key)
- if user and user.name == username:
+ user = self.auth.get_user_from_access_key(username)
+ if user and user.secret == key:
token_hash = hashlib.sha1('%s%s%f' % (username, key,
time.time())).hexdigest()
token_dict = {}