openstack/deb-swift
Code Issues Proposed changes

Ignore negative suffix-byte-range requests.

Browse Source 
If the client asked for "Range: bytes=--123", Swift would respond with
a 206 and a Content-Length of -123. Now that Range header is ignored
just like all kinds of other invalid Range headers.

Change-Id: I30d4522d223076ce342d20c52f57ff0eb2aea1f4
Closes-Bug: 1571106
This commit is contained in:
Samuel Merritt
2016-04-15 17:22:44 -07:00
parent badc0d1477
commit ca304cd08e
2 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
swift/common/swob.py
View File

@@ -486,7 +486,9 @@ class Range(object):
# when end contains non numeric value, this also causes # when end contains non numeric value, this also causes
# ValueError # ValueError
end = int(end) end = int(end)
if start is not None and end < start: if end < 0:
raise ValueError('Invalid Range header: %s' % headerval)
elif start is not None and end < start:
raise ValueError('Invalid Range header: %s' % headerval) raise ValueError('Invalid Range header: %s' % headerval)
else: else:
end = None end = None

26
test/unit/common/test_swob.py
View File

@@ -231,12 +231,13 @@ class TestRange(unittest.TestCase):
def test_range_invalid_syntax(self): def test_range_invalid_syntax(self):
def _check_invalid_range(range_value): def _assert_invalid_range(range_value):
try: try:
swift.common.swob.Range(range_value) swift.common.swob.Range(range_value)
return False self.fail("Expected %r to be invalid, but wasn't" %
(range_value,))
except ValueError: except ValueError:
return True pass
""" """
All the following cases should result ValueError exception All the following cases should result ValueError exception
@@ -248,15 +249,16 @@ class TestRange(unittest.TestCase):
6. any combination of the above 6. any combination of the above
""" """
self.assertTrue(_check_invalid_range('nonbytes=foobar,10-2')) _assert_invalid_range('nonbytes=foobar,10-2')
self.assertTrue(_check_invalid_range('bytes=5-3')) _assert_invalid_range('bytes=5-3')
self.assertTrue(_check_invalid_range('bytes=-')) _assert_invalid_range('bytes=-')
self.assertTrue(_check_invalid_range('bytes=45')) _assert_invalid_range('bytes=45')
self.assertTrue(_check_invalid_range('bytes=foo-bar,3-5')) _assert_invalid_range('bytes=foo-bar,3-5')
self.assertTrue(_check_invalid_range('bytes=4-10,45')) _assert_invalid_range('bytes=4-10,45')
self.assertTrue(_check_invalid_range('bytes=foobar,3-5')) _assert_invalid_range('bytes=foobar,3-5')
self.assertTrue(_check_invalid_range('bytes=nonumber-5')) _assert_invalid_range('bytes=nonumber-5')
self.assertTrue(_check_invalid_range('bytes=nonumber')) _assert_invalid_range('bytes=nonumber')
_assert_invalid_range('bytes=--1')
class TestMatch(unittest.TestCase): class TestMatch(unittest.TestCase):