diff options
| author | Mark Washenberger <mark.washenberger@rackspace.com> | 2011-03-15 19:22:51 -0400 |
|---|---|---|
| committer | Mark Washenberger <mark.washenberger@rackspace.com> | 2011-03-15 19:22:51 -0400 |
| commit | f9d4b3b65ff5e96284aa2fc8d84a70cea7f8225a (patch) | |
| tree | 73e40dc93a12c1e7e5bfcfd0adb1b02ce20a350c /nova/api | |
| parent | e237b4a5653384688b16f7fd2c0708eaec4b9ec7 (diff) | |
| parent | d36b4d5f3797521b1c2d13a0d30fe98a0671768e (diff) | |
| download | nova-f9d4b3b65ff5e96284aa2fc8d84a70cea7f8225a.tar.gz nova-f9d4b3b65ff5e96284aa2fc8d84a70cea7f8225a.tar.xz nova-f9d4b3b65ff5e96284aa2fc8d84a70cea7f8225a.zip | |
merge lp:nova
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/openstack/auth.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/nova/api/openstack/auth.py b/nova/api/openstack/auth.py index 4c6b58eff..f3a9bdeca 100644 --- a/nova/api/openstack/auth.py +++ b/nova/api/openstack/auth.py @@ -135,7 +135,11 @@ class AuthMiddleware(wsgi.Middleware): req - wsgi.Request object """ ctxt = context.get_admin_context() - user = self.auth.get_user_from_access_key(key) + + try: + user = self.auth.get_user_from_access_key(key) + except exception.NotFound: + user = None if user and user.name == username: token_hash = hashlib.sha1('%s%s%f' % (username, key, |