openstack
/
nova
Code Issues Proposed changes

Fix bug 607501. Raise 403, not exception if Authorization header not passed. Also added missing call to request.finish() & Python exception-handling style tweak

This commit is contained in:
Justin Santa Barbara 2010-07-21 18:12:27 +00:00 committed by Tarmac
parent d44943d84d 8625275e14
commit 47d859a572
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
nova/objectstore/handler.py
View File

@ -103,13 +103,16 @@ def get_argument(request, key, default_value):
def get_context(request):
try:
# Authorization Header format: 'AWS <access>:<secret>'
access, sep, secret = request.getHeader('Authorization').split(' ')[1].rpartition(':')
authorization_header = request.getHeader('Authorization')
if not authorization_header:
raise exception.NotAuthorized
access, sep, secret = authorization_header.split(' ')[1].rpartition(':')
um = users.UserManager.instance()
print 'um %s' % um
(user, project) = um.authenticate(access, secret, {}, request.method, request.host, request.uri, False)
# FIXME: check signature here!
return api.APIRequestContext(None, user, project)
except exception.Error, ex:
except exception.Error as ex:
logging.debug("Authentication Failure: %s" % ex)
raise exception.NotAuthorized
@ -165,7 +168,7 @@ class BucketResource(Resource):
logging.debug("Creating bucket %s" % (self.name))
try:
print 'user is %s' % request.context
except Exception, e:
except Exception as e:
logging.exception(e)
logging.debug("calling bucket.Bucket.create(%r, %r)" % (self.name, request.context))
bucket.Bucket.create(self.name, request.context)
@ -239,9 +242,10 @@ class ImageResource(Resource):
""" returns a json listing of all images
that a user has permissions to see """
images = [i for i in image.Image.all() if i.is_authorized(self.context)]
images = [i for i in image.Image.all() if i.is_authorized(request.context)]
request.write(json.dumps([i.metadata for i in images]))
request.finish()
return server.NOT_DONE_YET
def render_PUT(self, request):