x/swift3
Code Issues Proposed changes

Fixes maxlength validation bugs

Browse Source 
The following S3 tests were failing:
s3tests.functional.test_s3.test_bucket_list_maxkeys_invalid
s3tests.functional.test_s3.test_bucket_list_maxkeys_unreadable
s3tests.functional.test_s3.test_bucket_list_maxkeys_zero

These two simple changes add some validation for the first two
and fixes the return of is_truncated for the maxkeys=0 case.
Tests now pass.
This commit is contained in:
Tom Fifield 2012-10-06 07:09:42 +00:00
parent f216f1b4f2
commit 0b792a1e7a
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
swift3/middleware.py
View File

@ -221,6 +221,11 @@ class BucketController(WSGIContext):
args = dict(urlparse.parse_qsl(env['QUERY_STRING'], 1)) args = dict(urlparse.parse_qsl(env['QUERY_STRING'], 1))
else: else:
args = {} args = {}
if 'max-keys' in args:
if args.get('max-keys').isdigit() is False:
return get_err_response('InvalidArgument')
max_keys = min(int(args.get('max-keys', MAX_BUCKET_LISTING)), max_keys = min(int(args.get('max-keys', MAX_BUCKET_LISTING)),
MAX_BUCKET_LISTING) MAX_BUCKET_LISTING)
env['QUERY_STRING'] = 'format=json&limit=%s' % (max_keys + 1) env['QUERY_STRING'] = 'format=json&limit=%s' % (max_keys + 1)
@ -261,7 +266,7 @@ class BucketController(WSGIContext):
xml_escape(args.get('prefix', '')), xml_escape(args.get('prefix', '')),
xml_escape(args.get('marker', '')), xml_escape(args.get('marker', '')),
xml_escape(args.get('delimiter', '')), xml_escape(args.get('delimiter', '')),
'true' if len(objects) == (max_keys + 1) else 'false', 'true' if max_keys > 0 and len(objects) == (max_keys + 1) else 'false',
max_keys, max_keys,
xml_escape(self.container_name), xml_escape(self.container_name),
"".join(['<Contents><Key>%s</Key><LastModified>%sZ</LastModif'\ "".join(['<Contents><Key>%s</Key><LastModified>%sZ</LastModif'\