diff options
| author | Jenkins <jenkins@review.openstack.org> | 2011-10-06 18:58:44 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2011-10-06 18:58:44 +0000 |
| commit | 22859fccb95502efcb73ecf2bd827c45c0886bd3 (patch) | |
| tree | b20440064e1ec6b2b921b3efcf564c64b8e82d2a | |
| parent | 72c45bd2ad930922be86c810b393187e4f5564bc (diff) | |
| parent | beee11edbfdd82cd81bc9c0fd75912c167892c2b (diff) | |
| download | nova-22859fccb95502efcb73ecf2bd827c45c0886bd3.tar.gz nova-22859fccb95502efcb73ecf2bd827c45c0886bd3.tar.xz nova-22859fccb95502efcb73ecf2bd827c45c0886bd3.zip | |
Merge "Stop returning correct password on api calls"
| -rw-r--r-- | Authors | 1 | ||||
| -rw-r--r-- | nova/api/ec2/__init__.py | 3 | ||||
| -rw-r--r-- | nova/auth/manager.py | 10 |
3 files changed, 5 insertions, 9 deletions
@@ -1,6 +1,7 @@ Aaron Lee <aaron.lee@rackspace.com> Adam Gandelman <adamg@canonical.com> Adam Johnson <adjohn@gmail.com> +Ahmad Hassan <ahmad.hassan@hp.com> Alex Meade <alex.meade@rackspace.com> Alexander Sakhnov <asakhnov@mirantis.com> Andrey Brindeyev <abrindeyev@griddynamics.com> 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() diff --git a/nova/auth/manager.py b/nova/auth/manager.py index 44e6e11ac..e0504464e 100644 --- a/nova/auth/manager.py +++ b/nova/auth/manager.py @@ -149,11 +149,7 @@ class User(AuthBase): return AuthManager().is_project_manager(self, project) def __repr__(self): - return "User('%s', '%s', '%s', '%s', %s)" % (self.id, - self.name, - self.access, - self.secret, - self.admin) + return "User('%s', '%s')" % (self.id, self.name) class Project(AuthBase): @@ -200,9 +196,7 @@ class Project(AuthBase): return AuthManager().get_credentials(user, self) def __repr__(self): - return "Project('%s', '%s', '%s', '%s', %s)" % \ - (self.id, self.name, self.project_manager_id, self.description, - self.member_ids) + return "Project('%s', '%s')" % (self.id, self.name) class AuthManager(object): |