diff options
| author | Soren Hansen <soren.hansen@rackspace.com> | 2010-07-25 16:17:55 +0200 |
|---|---|---|
| committer | Soren Hansen <soren.hansen@rackspace.com> | 2010-07-25 16:17:55 +0200 |
| commit | dd17c810029d142abaa8f0c97e30a8ae1dc13b5c (patch) | |
| tree | ba06d54900b7d4d039b6aa8f0d4e48d6180c1906 | |
| parent | c611ee25e1c30965d6521386c2966584f0cb6d6f (diff) | |
| download | nova-dd17c810029d142abaa8f0c97e30a8ae1dc13b5c.tar.gz nova-dd17c810029d142abaa8f0c97e30a8ae1dc13b5c.tar.xz nova-dd17c810029d142abaa8f0c97e30a8ae1dc13b5c.zip | |
Return a 404 when attempting to access a bucket that does not exist.
| -rw-r--r-- | nova/objectstore/handler.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/nova/objectstore/handler.py b/nova/objectstore/handler.py index 558b04881..1a54f8a98 100644 --- a/nova/objectstore/handler.py +++ b/nova/objectstore/handler.py @@ -47,7 +47,7 @@ import urllib from twisted.application import internet, service from twisted.web.resource import Resource -from twisted.web import server, static +from twisted.web import server, static, error from nova import exception @@ -150,7 +150,10 @@ class BucketResource(Resource): def render_GET(self, request): logging.debug("List keys for bucket %s" % (self.name)) - bucket_object = bucket.Bucket(self.name) + try: + bucket_object = bucket.Bucket(self.name) + except exception.NotFound, e: + return error.NoResource(message="No such bucket").render(request) if not bucket_object.is_authorized(request.context): raise exception.NotAuthorized |