Yasuke/moto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MaxKeys limits the sum of folders and keys

Browse Source
This commit is contained in:
Gapex 2019-09-12 17:54:02 +08:00
parent b8a79611d6
commit eea67543d1
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
moto/s3/responses.py
View File

@ -458,10 +458,11 @@ class ResponseObject(_TemplateEnvironmentMixin, ActionAuthenticatorMixin):
else: else:
result_folders = self._get_results_from_token(result_folders, limit) result_folders = self._get_results_from_token(result_folders, limit)
if not delimiter: tagged_keys = [(key, True) for key in result_keys]
result_keys, is_truncated, next_continuation_token = self._truncate_result(result_keys, max_keys) tagged_folders = [(folder, False) for folder in result_folders]
else: all_keys = tagged_keys + tagged_folders
result_folders, is_truncated, next_continuation_token = self._truncate_result(result_folders, max_keys) all_keys.sort()
result_keys, result_folders, is_truncated, next_continuation_token = self._truncate_result(all_keys, max_keys)
key_count = len(result_keys) + len(result_folders) key_count = len(result_keys) + len(result_folders)
@ -487,16 +488,19 @@ class ResponseObject(_TemplateEnvironmentMixin, ActionAuthenticatorMixin):
continuation_index += 1 continuation_index += 1
return result_keys[continuation_index:] return result_keys[continuation_index:]
def _truncate_result(self, result_keys, max_keys): def _truncate_result(self, all_keys, max_keys):
if len(result_keys) > max_keys: if len(all_keys) > max_keys:
is_truncated = 'true' is_truncated = 'true'
result_keys = result_keys[:max_keys] all_keys = all_keys[:max_keys]
item = result_keys[-1] item = all_keys[-1][0]
next_continuation_token = (item.name if isinstance(item, FakeKey) else item) next_continuation_token = (item.name if isinstance(item, FakeKey) else item)
else: else:
is_truncated = 'false' is_truncated = 'false'
next_continuation_token = None next_continuation_token = None
return result_keys, is_truncated, next_continuation_token result_keys, result_folders = [], []
for (key, is_key) in all_keys:
(result_keys if is_key else result_folders).append(key)
return result_keys, result_folders, is_truncated, next_continuation_token
def _bucket_response_put(self, request, body, region_name, bucket_name, querystring): def _bucket_response_put(self, request, body, region_name, bucket_name, querystring):
if not request.headers.get('Content-Length'): if not request.headers.get('Content-Length'):