catalin/moto
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix S3 filtering by unicode prefix. Closes #838

Browse source
This commit is contained in:
Steve Pulec 2017-03-15 22:53:27 -04:00
commit 3899eee648
1 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
moto/s3/responses.py
View file

@ -233,6 +233,8 @@ class ResponseObject(_TemplateEnvironmentMixin):
bucket = self.backend.get_bucket(bucket_name) bucket = self.backend.get_bucket(bucket_name)
prefix = querystring.get('prefix', [None])[0] prefix = querystring.get('prefix', [None])[0]
if prefix:
prefix = prefix.decode("utf-8")
delimiter = querystring.get('delimiter', [None])[0] delimiter = querystring.get('delimiter', [None])[0]
result_keys, result_folders = self.backend.prefix_query( result_keys, result_folders = self.backend.prefix_query(
bucket, prefix, delimiter) bucket, prefix, delimiter)
@ -250,6 +252,8 @@ class ResponseObject(_TemplateEnvironmentMixin):
bucket = self.backend.get_bucket(bucket_name) bucket = self.backend.get_bucket(bucket_name)
prefix = querystring.get('prefix', [None])[0] prefix = querystring.get('prefix', [None])[0]
if prefix:
prefix = prefix.decode("utf-8")
delimiter = querystring.get('delimiter', [None])[0] delimiter = querystring.get('delimiter', [None])[0]
result_keys, result_folders = self.backend.prefix_query( result_keys, result_folders = self.backend.prefix_query(
bucket, prefix, delimiter) bucket, prefix, delimiter)
@ -278,7 +282,7 @@ class ResponseObject(_TemplateEnvironmentMixin):
return template.render( return template.render(
bucket=bucket, bucket=bucket,
prefix=prefix or '', prefix=prefix or b'',
delimiter=delimiter, delimiter=delimiter,
result_keys=result_keys, result_keys=result_keys,
result_folders=result_folders, result_folders=result_folders,