Clean s3 file name and remove trailing slash

ministryofjustice · Aug 10, 2023 · ca634d0 · ca634d0
1 parent c122d47
commit ca634d0
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/cla_backend/libs/aws/s3.py b/cla_backend/libs/aws/s3.py
@@ -12,14 +12,18 @@ class StaticS3Storage(S3Boto3Storage):
 
 
 class ReportsS3:
+    @classmethod
+    def clean_name(cls, name):
+        return name.strip("/")
+
     @classmethod
     def get_s3_connection(cls, bucket_name):
         return S3Boto3Storage(bucket=bucket_name)
 
     @classmethod
     def download_file(cls, bucket_name, key):
         try:
-            obj = cls.get_s3_connection(bucket_name).bucket.Object(key)
+            obj = cls.get_s3_connection(bucket_name).bucket.Object(cls.clean_name(key))
             data = NamedTemporaryFile()
             obj.download_fileobj(data)
             data.seek(0)
@@ -29,11 +33,11 @@ def download_file(cls, bucket_name, key):
 
     @classmethod
     def save_file(cls, bucket_name, key, path):
-        cls.get_s3_connection(bucket_name).bucket.Object(key).upload_file(path)
+        cls.get_s3_connection(bucket_name).bucket.Object(cls.clean_name(key)).upload_file(path)
 
     @classmethod
     def delete_file(cls, bucket_name, key):
-        cls.get_s3_connection(bucket_name).delete(key)
+        cls.get_s3_connection(bucket_name).delete(cls.clean_name(key))
 
     @classmethod
     def save_data_to_bucket(cls, bucket_name, key, content):