From f033f164908ee41e4a9c310e8d65f99d88d2aa24 Mon Sep 17 00:00:00 2001
From: Kevin Chung <kchung@ctfd.io>
Date: Thu, 11 Jul 2019 17:04:32 -0400
Subject: [PATCH] Fix S3 file downloads to not contain the folder name (#1056)

* Fixes a bug in S3 downloads where a downloaded file would have its parent folder name in the filename
---
 CTFd/utils/uploads/uploaders.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/CTFd/utils/uploads/uploaders.py b/CTFd/utils/uploads/uploaders.py
index 1fa50f5e..d727d44a 100644
--- a/CTFd/utils/uploads/uploaders.py
+++ b/CTFd/utils/uploads/uploaders.py
@@ -110,11 +110,13 @@ class S3Uploader(BaseUploader):
         return dst
 
     def download(self, filename):
+        key = filename
+        filename = filename.split('/').pop()
         url = self.s3.generate_presigned_url(
             "get_object",
             Params={
                 "Bucket": self.bucket,
-                "Key": filename,
+                "Key": key,
                 "ResponseContentDisposition": "attachment; filename={}".format(
                     filename
                 ),