fix: upload directory content type

philasmar · philasmar · commit e4371de42469 · 2025-11-07T11:27:11.000-05:00
diff --git a/generator/.DevConfigs/e11928c9-15fb-4b9e-91d3-91775150d380.json b/generator/.DevConfigs/e11928c9-15fb-4b9e-91d3-91775150d380.json
@@ -0,0 +1,11 @@
+{
+  "services": [
+    {
+      "serviceName": "S3",
+      "type": "patch",
+      "changeLogMessages": [
+        "Fix an issue with Transfer Utility's UploadDirectory where the content type of 1 file was persisting for all the files in the directory."
+      ]
+    }
+  ]
+}
diff --git a/sdk/src/Services/S3/Custom/Transfer/Internal/SimpleUploadCommand.cs b/sdk/src/Services/S3/Custom/Transfer/Internal/SimpleUploadCommand.cs
@@ -30,6 +30,7 @@
 using Amazon.S3.Model;
 using Amazon.S3.Util;
 using Amazon.Runtime;
+using Amazon.Util;
 
 namespace Amazon.S3.Transfer.Internal
 {
@@ -54,7 +55,6 @@ internal PutObjectRequest ConstructRequest()
         {
             PutObjectRequest putRequest = new PutObjectRequest()
             {
-                Headers = this._fileTransporterRequest.Headers,
                 BucketName = this._fileTransporterRequest.BucketName,
                 Key = this._fileTransporterRequest.Key,
                 CannedACL = this._fileTransporterRequest.CannedACL,
@@ -85,6 +85,25 @@ internal PutObjectRequest ConstructRequest()
                 ServerSideEncryptionKeyManagementServiceEncryptionContext = this._fileTransporterRequest.SSEKMSEncryptionContext,
                 WebsiteRedirectLocation = this._fileTransporterRequest.WebsiteRedirectLocation,
             };
+            
+            // We are iterating over the Headers to avoid setting the Header from the Transfer utility upload request 
+            // to the PutObjectRequest since that will cause issues down the line.
+            // The AmazonS3PreMarshallHandler modifies the content type on the headers collection 
+            // which would impact other requests in a directory upload if the Headers were referenced.
+            if (this._fileTransporterRequest.Headers != null && this._fileTransporterRequest.Headers.Count > 0)
+            {
+                foreach (var headerKey in this._fileTransporterRequest.Headers.Keys)
+                {
+                    if (string.Equals(headerKey, HeaderKeys.ContentTypeHeader) && this._fileTransporterRequest.IsSetContentType())
+                    {
+                        continue;
+                    }
+                    else
+                    {
+                        putRequest.Headers[headerKey] = this._fileTransporterRequest.Headers[headerKey];
+                    }
+                }
+            }
 
             // Avoid setting ContentType to null, as that may clear
             // out an existing value in Headers collection
diff --git a/sdk/test/Services/S3/IntegrationTests/TransferUtilityTests.cs b/sdk/test/Services/S3/IntegrationTests/TransferUtilityTests.cs
@@ -1118,6 +1118,93 @@ public async System.Threading.Tasks.Task UploadAsyncCancellationTest()
         }
 #endif
 
+        [TestMethod]
+        [TestCategory("S3")]
+        public void UploadDirectoryWithMixedFileTypesContentTypeTest()
+        {
+            var directory = CreateMixedFileTypeTestDirectory();
+            var keyPrefix = directory.Name;
+
+            // Upload directory without setting explicit ContentType
+            var transferUtility = new TransferUtility(Client);
+            var request = new TransferUtilityUploadDirectoryRequest
+            {
+                BucketName = bucketName,
+                Directory = directory.FullName,
+                KeyPrefix = keyPrefix,
+                SearchPattern = "*",
+                SearchOption = SearchOption.AllDirectories
+                // Note: No ContentType set - should auto-detect per file
+            };
+
+            transferUtility.UploadDirectory(request);
+
+            // Validate each file got correct content type based on extension
+            ValidateDirectoryContentTypes(Client, bucketName, keyPrefix, directory);
+        }
+
+        public static DirectoryInfo CreateMixedFileTypeTestDirectory()
+        {
+            var directoryPath = GenerateDirectoryPath("MixedFileTypeTest");
+
+            var testFiles = new Dictionary<string, string>
+            {
+                { "test.html", "<html><body>Test HTML</body></html>" },
+                { "test.css", "body { color: red; }" },
+                { "test.js", "console.log('test');" },
+                { "test.json", "{ \"test\": \"value\" }" },
+                { "test.txt", "Plain text content" },
+                { "test.xml", "<?xml version=\"1.0\"?><root>test</root>" },
+                { "test.pdf", "PDF content placeholder" },
+                { "test.svg", "<svg><rect width=\"100\" height=\"100\"/></svg>" }
+            };
+
+            foreach (var file in testFiles)
+            {
+                var filePath = Path.Combine(directoryPath, file.Key);
+                Directory.CreateDirectory(Path.GetDirectoryName(filePath));
+                File.WriteAllText(filePath, file.Value);
+            }
+
+            return new DirectoryInfo(directoryPath);
+        }
+
+        private static void ValidateDirectoryContentTypes(IAmazonS3 s3client, string bucketName, string keyPrefix, DirectoryInfo directory)
+        {
+            var expectedContentTypes = new Dictionary<string, string>
+            {
+                { ".html", "text/html" },
+                { ".css", "text/css" },
+                { ".js", "application/x-javascript" },
+                { ".json", "application/json" },
+                { ".txt", "text/plain" },
+                { ".xml", "text/xml" },
+                { ".pdf", "application/pdf" },
+                { ".svg", "image/svg+xml" }
+            };
+
+            var files = directory.GetFiles("*", SearchOption.AllDirectories);
+            foreach (var file in files)
+            {
+                var filePath = file.FullName;
+                var relativePath = filePath.Substring(directory.FullName.Length + 1);
+                var key = (!string.IsNullOrEmpty(keyPrefix) ? keyPrefix + "/" : string.Empty) + relativePath.Replace("\\", "/");
+
+                var metadata = s3client.GetObjectMetadata(new GetObjectMetadataRequest
+                {
+                    BucketName = bucketName,
+                    Key = key
+                });
+
+                var extension = Path.GetExtension(file.Name).ToLowerInvariant();
+                var expectedContentType = expectedContentTypes[extension];
+
+                Assert.AreEqual(expectedContentType, metadata.Headers.ContentType,
+                    $"File {file.Name} should have content type {expectedContentType} but got {metadata.Headers.ContentType}");
+            }
+        }
+
+
         public static void ConfigureProgressValidator(DirectoryProgressValidator<DownloadDirectoryProgressArgs> progressValidator)
         {
             progressValidator.Validate = (progress, lastProgress) =>
