diff options
| author | Rick Harris <rick.harris@rackspace.com> | 2011-03-16 18:56:52 +0000 |
|---|---|---|
| committer | Rick Harris <rick.harris@rackspace.com> | 2011-03-16 18:56:52 +0000 |
| commit | 3f637a9325ffa7b0cc8a2369576b9fc4f2ebf0f5 (patch) | |
| tree | 24bf410e8c0cdfcc840863a90f433777f9c137a6 /nova/api | |
| parent | 5ca10673e77763706e7b26e30f0212930ad1f929 (diff) | |
| parent | dfd0e8a32ae40043a78c12fb871c11bb9bd0f4c3 (diff) | |
Merging trunk
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, |