aljaz/CTFd
1
0
Fork 0
mirror of https://github.com/aljazceru/CTFd.git synced 2025-12-17 22:14:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix S3 file downloads to not contain the folder name (#1056)

Browse Source 
* Fixes a bug in S3 downloads where a downloaded file would have its parent folder name in the filename
This commit is contained in:
Kevin Chung
2019-07-11 17:04:32 -04:00
committed by GitHub
parent 9b07f4ecf9
commit f033f16490
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CTFd/utils/uploads/uploaders.py
View File

@@ -110,11 +110,13 @@ class S3Uploader(BaseUploader):
return dst return dst
def download(self, filename): def download(self, filename):
key = filename
filename = filename.split('/').pop()
url = self.s3.generate_presigned_url( url = self.s3.generate_presigned_url(
"get_object", "get_object",
Params={ Params={
"Bucket": self.bucket, "Bucket": self.bucket,
"Key": filename, "Key": key,
"ResponseContentDisposition": "attachment; filename={}".format( "ResponseContentDisposition": "attachment; filename={}".format(
filename filename
), ),