openstack/swift
Code Issues Proposed changes

Only test with &-delimited query strings

Browse Source 
Change-Id: I4510a126d8e5501d2ff977c8b1d9027b446feb96
Partial-Bug: 1920080
This commit is contained in:
Tim Burke 2021-03-18 16:23:23 -07:00
parent c6a6403665
commit ec37893b82
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
test/unit/common/test_request_helpers.py
View File

@ -47,28 +47,28 @@ class TestRequestHelpers(unittest.TestCase):
actual = rh.validate_params(req, ('limit', 'marker', 'end_marker')) actual = rh.validate_params(req, ('limit', 'marker', 'end_marker'))
self.assertEqual({}, actual) self.assertEqual({}, actual)
req = Request.blank('', query_string='limit=1;junk=here;marker=foo') req = Request.blank('', query_string='limit=1&junk=here&marker=foo')
actual = rh.validate_params(req, ()) actual = rh.validate_params(req, ())
self.assertEqual({}, actual) self.assertEqual({}, actual)
req = Request.blank('', query_string='limit=1;junk=here;marker=foo') req = Request.blank('', query_string='limit=1&junk=here&marker=foo')
actual = rh.validate_params(req, ('limit', 'marker', 'end_marker')) actual = rh.validate_params(req, ('limit', 'marker', 'end_marker'))
expected = {'limit': '1', 'marker': 'foo'} expected = {'limit': '1', 'marker': 'foo'}
self.assertEqual(expected, actual) self.assertEqual(expected, actual)
req = Request.blank('', query_string='limit=1;junk=here;marker=') req = Request.blank('', query_string='limit=1&junk=here&marker=')
actual = rh.validate_params(req, ('limit', 'marker', 'end_marker')) actual = rh.validate_params(req, ('limit', 'marker', 'end_marker'))
expected = {'limit': '1', 'marker': ''} expected = {'limit': '1', 'marker': ''}
self.assertEqual(expected, actual) self.assertEqual(expected, actual)
# ignore bad junk # ignore bad junk
req = Request.blank('', query_string='limit=1;junk=%ff;marker=foo') req = Request.blank('', query_string='limit=1&junk=%ff&marker=foo')
actual = rh.validate_params(req, ('limit', 'marker', 'end_marker')) actual = rh.validate_params(req, ('limit', 'marker', 'end_marker'))
expected = {'limit': '1', 'marker': 'foo'} expected = {'limit': '1', 'marker': 'foo'}
self.assertEqual(expected, actual) self.assertEqual(expected, actual)
# error on bad wanted parameter # error on bad wanted parameter
req = Request.blank('', query_string='limit=1;junk=here;marker=%ff') req = Request.blank('', query_string='limit=1&junk=here&marker=%ff')
with self.assertRaises(HTTPException) as raised: with self.assertRaises(HTTPException) as raised:
rh.validate_params(req, ('limit', 'marker', 'end_marker')) rh.validate_params(req, ('limit', 'marker', 'end_marker'))
self.assertEqual(raised.exception.status_int, 400) self.assertEqual(raised.exception.status_int, 400)
@ -78,24 +78,24 @@ class TestRequestHelpers(unittest.TestCase):
actual = rh.validate_container_params(req) actual = rh.validate_container_params(req)
self.assertEqual({'limit': 10000}, actual) self.assertEqual({'limit': 10000}, actual)
req = Request.blank('', query_string='limit=1;junk=here;marker=foo') req = Request.blank('', query_string='limit=1&junk=here&marker=foo')
actual = rh.validate_container_params(req) actual = rh.validate_container_params(req)
expected = {'limit': 1, 'marker': 'foo'} expected = {'limit': 1, 'marker': 'foo'}
self.assertEqual(expected, actual) self.assertEqual(expected, actual)
req = Request.blank('', query_string='limit=1;junk=here;marker=') req = Request.blank('', query_string='limit=1&junk=here&marker=')
actual = rh.validate_container_params(req) actual = rh.validate_container_params(req)
expected = {'limit': 1, 'marker': ''} expected = {'limit': 1, 'marker': ''}
self.assertEqual(expected, actual) self.assertEqual(expected, actual)
# ignore bad junk # ignore bad junk
req = Request.blank('', query_string='limit=1;junk=%ff;marker=foo') req = Request.blank('', query_string='limit=1&junk=%ff&marker=foo')
actual = rh.validate_container_params(req) actual = rh.validate_container_params(req)
expected = {'limit': 1, 'marker': 'foo'} expected = {'limit': 1, 'marker': 'foo'}
self.assertEqual(expected, actual) self.assertEqual(expected, actual)
# error on bad wanted parameter # error on bad wanted parameter
req = Request.blank('', query_string='limit=1;junk=here;marker=%ff') req = Request.blank('', query_string='limit=1&junk=here&marker=%ff')
with self.assertRaises(HTTPException) as raised: with self.assertRaises(HTTPException) as raised:
rh.validate_container_params(req) rh.validate_container_params(req)
self.assertEqual(raised.exception.status_int, 400) self.assertEqual(raised.exception.status_int, 400)

2
test/unit/proxy/controllers/test_container.py
View File

@ -1668,7 +1668,7 @@ class TestContainerController(TestRingBase):
def _build_request(self, headers, params, infocache=None): def _build_request(self, headers, params, infocache=None):
# helper to make a GET request with caches set in environ # helper to make a GET request with caches set in environ
query_string = '?' + ';'.join('%s=%s' % (k, v) query_string = '?' + '&'.join('%s=%s' % (k, v)
for k, v in params.items()) for k, v in params.items())
container_path = '/v1/a/c' + query_string container_path = '/v1/a/c' + query_string
request = Request.blank(container_path, headers=headers) request = Request.blank(container_path, headers=headers)