summaryrefslogtreecommitdiffstats
path: root/nova/api
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2011-10-06 18:58:44 +0000
committerGerrit Code Review <review@openstack.org>2011-10-06 18:58:44 +0000
commit22859fccb95502efcb73ecf2bd827c45c0886bd3 (patch)
treeb20440064e1ec6b2b921b3efcf564c64b8e82d2a /nova/api
parent72c45bd2ad930922be86c810b393187e4f5564bc (diff)
parentbeee11edbfdd82cd81bc9c0fd75912c167892c2b (diff)
downloadnova-22859fccb95502efcb73ecf2bd827c45c0886bd3.tar.gz
nova-22859fccb95502efcb73ecf2bd827c45c0886bd3.tar.xz
nova-22859fccb95502efcb73ecf2bd827c45c0886bd3.zip
Merge "Stop returning correct password on api calls"
Diffstat (limited to 'nova/api')
-rw-r--r--nova/api/ec2/__init__.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/nova/api/ec2/__init__.py b/nova/api/ec2/__init__.py
index 8dcb44bba..4b4c0f536 100644
--- a/nova/api/ec2/__init__.py
+++ b/nova/api/ec2/__init__.py
@@ -188,7 +188,8 @@ class Authenticate(wsgi.Middleware):
req.host,
req.path)
# Be explicit for what exceptions are 403, the rest bubble as 500
- except (exception.NotFound, exception.NotAuthorized) as ex:
+ except (exception.NotFound, exception.NotAuthorized,
+ exception.InvalidSignature) as ex:
LOG.audit(_("Authentication Failure: %s"), unicode(ex))
raise webob.exc.HTTPForbidden()