openstack/swift
Code Issues Proposed changes

Fix obscure double url bug in container quota middleware

Browse Source 
With the container quota middleware on, if you made a request similar to the
following one you'd get a 500 response.

curl -i -X PUT -H 'X-Auth-Token: token'
http://127.0.0.1:8080/v1/AUTH_testhttp://something/something_else

(Note the double url.)

This was due to a mismatch in how split_path() was called in the middleware and
in the get_container_info().

This change fixes that mismatch and the bug.

Change-Id: Ie42ab585b942b7201e13b02a0c706532952aac60
This commit is contained in:
Greg Lange 2013-05-02 18:28:14 +00:00
parent 8ecf77efa2
commit 597072cc95
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
swift/common/middleware/container_quotas.py
View File

@ -64,12 +64,12 @@ class ContainerQuotaMiddleware(object):
@wsgify @wsgify
def __call__(self, req): def __call__(self, req):
try: try:
(version, account, container, obj) = req.split_path(2, 4, True) (version, account, container, obj) = req.split_path(3, 4, True)
except ValueError: except ValueError:
return self.app return self.app
# verify new quota headers are properly formatted # verify new quota headers are properly formatted
if container and not obj and req.method in ('PUT', 'POST'): if not obj and req.method in ('PUT', 'POST'):
val = req.headers.get('X-Container-Meta-Quota-Bytes') val = req.headers.get('X-Container-Meta-Quota-Bytes')
if val and not val.isdigit(): if val and not val.isdigit():
return HTTPBadRequest(body='Invalid bytes quota.') return HTTPBadRequest(body='Invalid bytes quota.')

8
test/unit/common/middleware/test_quotas.py
View File

@ -48,6 +48,14 @@ def start_response(*args):
class TestContainerQuotas(unittest.TestCase): class TestContainerQuotas(unittest.TestCase):
def test_split_path_empty_container_path_segment(self):
app = container_quotas.ContainerQuotaMiddleware(FakeApp(), {})
req = Request.blank('/v1/a//something/something_else',
environ={'REQUEST_METHOD': 'PUT',
'swift.cache': {'key':'value'}})
res = req.get_response(app)
self.assertEquals(res.status_int, 200)
def test_not_handled(self): def test_not_handled(self):
app = container_quotas.ContainerQuotaMiddleware(FakeApp(), {}) app = container_quotas.ContainerQuotaMiddleware(FakeApp(), {})
req = Request.blank('/v1/a/c', environ={'REQUEST_METHOD': 'PUT'}) req = Request.blank('/v1/a/c', environ={'REQUEST_METHOD': 'PUT'})