[s3] do not override a returned ContentType from get_object_parameters (

#1281)
jschneier · Aug 29, 2023 · e5ac756 · e5ac756
1 parent e7e5bb3
commit e5ac756
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 9 deletions.
diff --git a/storages/backends/s3boto3.py b/storages/backends/s3boto3.py
@@ -481,17 +481,16 @@ def size(self, name):
         return self.bucket.Object(name).content_length
 
     def _get_write_parameters(self, name, content=None):
-        params = {}
+        params = self.get_object_parameters(name)
 
-        _type, encoding = mimetypes.guess_type(name)
-        content_type = getattr(content, 'content_type', None)
-        content_type = content_type or _type or self.default_content_type
+        if 'ContentType' not in params:
+            _type, encoding = mimetypes.guess_type(name)
+            content_type = getattr(content, 'content_type', None)
+            content_type = content_type or _type or self.default_content_type
 
-        params['ContentType'] = content_type
-        if encoding:
-            params['ContentEncoding'] = encoding
-
-        params.update(self.get_object_parameters(name))
+            params['ContentType'] = content_type
+            if encoding:
+                params['ContentEncoding'] = encoding
 
         if 'ACL' not in params and self.default_acl:
             params['ACL'] = self.default_acl

diff --git a/tests/test_s3boto3.py b/tests/test_s3boto3.py
@@ -195,6 +195,25 @@ def test_storage_save_gzipped(self):
             Config=self.storage.transfer_config
         )
 
+    def test_content_type_set_explicitly(self):
+        name = "test_file.gz"
+        content = ContentFile("data")
+
+        def get_object_parameters(name):
+            return {"ContentType": "application/gzip"}
+
+        self.storage.get_object_parameters = get_object_parameters
+        self.storage.save(name, content)
+
+        obj = self.storage.bucket.Object.return_value
+        obj.upload_fileobj.assert_called_with(
+            content,
+            ExtraArgs={
+                "ContentType": "application/gzip",
+            },
+            Config=self.storage.transfer_config
+        )
+
     def test_storage_save_gzipped_non_seekable(self):
         """
         Test saving a gzipped file