lucaspalomodevelop/indico-plugins
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/indico-plugins.git synced 2026-03-12 23:27:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Storage/S3: Fix handling non-ascii file names

Browse Source
This commit is contained in:
Adrian Moennich 2020-07-29 12:42:04 +02:00
parent 16877b8f5b
commit 8d64194619
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
storage_s3/indico_storage_s3/storage.py
View File

@ -28,7 +28,7 @@ from indico.core.storage import Storage, StorageError
from indico.core.storage.backend import ReadOnlyStorageMixin, StorageReadOnlyError
from indico.util.fs import get_file_checksum
from indico.util.string import return_ascii
from indico.web.flask.util import send_file
from indico.web.flask.util import make_content_disposition_args, send_file
s3_session_cache = threading.local()
@ -134,7 +134,7 @@ class S3StorageBase(Storage):
bucket, id_ = self._parse_file_id(file_id)
content_disp = 'inline' if inline else 'attachment'
h = Headers()
h.add('Content-Disposition', content_disp, filename=filename)
h.add('Content-Disposition', content_disp, **make_content_disposition_args(filename))
url = self.client.generate_presigned_url('get_object',
Params={'Bucket': bucket,
'Key': id_,

6
storage_s3/setup.py
View File

@ -12,7 +12,7 @@ from setuptools import find_packages, setup
setup(
name='indico-plugin-storage-s3',
version='2.0.5',
version='2.3-dev',
description='S3 storage backend for Indico',
url='https://github.com/indico/indico-plugins',
license='MIT',
@ -22,8 +22,8 @@ setup(
zip_safe=False,
platforms='any',
install_requires=[
'indico>=2.1',
'boto3>=1.9.35,<2.0',
'indico>=2.3.dev0',
'boto3>=1.14.30,<2.0',
],
classifiers=[
'Environment :: Plugins',