Handle older S3 packages for operations that require MD5 or checksums (…

…#3642) * fix: Handle older S3 packages for operations that support either MD5 or flexible checksums * fix: Update HttpWebRequestMessage to handle MD5Stream (which does not support seeking)
aws · Feb 7, 2025 · 9cd49b6 · 9cd49b6
1 parent 970f624
commit 9cd49b6
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 2 deletions.
diff --git a/generator/.DevConfigs/43745a80-c082-4df4-a73e-413191e5b816.json b/generator/.DevConfigs/43745a80-c082-4df4-a73e-413191e5b816.json
@@ -0,0 +1,9 @@
+{
+    "core": {
+        "updateMinimum": true,
+        "type": "Patch",
+        "changeLogMessages": [
+            "Update data integrity component to handle older versions of the `AWSSDK.S3` package when operations require a `Content-MD5` header"
+        ]
+    }
+}
diff --git a/sdk/src/Core/Amazon.Runtime/Internal/Util/ChecksumUtils.cs b/sdk/src/Core/Amazon.Runtime/Internal/Util/ChecksumUtils.cs
@@ -347,7 +347,13 @@ public static void SetChecksumData(IRequest request, string checksumAlgorithm, b
             // S3 does not support).
 
             // TODO: Similar to "SetRequestChecksum", this method should be removed in V4.
-            if (!string.IsNullOrEmpty(checksumAlgorithm))
+            if (fallbackToMD5)
+            {
+                // Reported in https://github.com/aws/aws-sdk-net/issues/3641
+                // Some operations will fail if the Content-MD5 header is not set, so we need to set it to maintain backwards compatibility.
+                SetChecksumData(request);
+            }
+            else if (!string.IsNullOrEmpty(checksumAlgorithm))
             {
                 SetChecksumData(request, checksumAlgorithm, fallbackToMD5, isRequestChecksumRequired: true);
             }

diff --git a/sdk/src/Core/Amazon.Runtime/Pipeline/HttpHandler/_netstandard/HttpRequestMessageFactory.cs b/sdk/src/Core/Amazon.Runtime/Pipeline/HttpHandler/_netstandard/HttpRequestMessageFactory.cs
@@ -625,7 +625,20 @@ public void WriteToRequestBody(HttpContent requestContent, Stream contentStream,
             if ((isChunkedUploadWrapperStreamWithLength || isTrailingHeadersWrapperStreamWithLength || isCompressionWrapperStreamWithLength)
                 || (chunkedUploadWrapperStream == null && trailingHeadersWrapperStream == null && compressionWrapperStream == null))
             {
-                _request.Content.Headers.ContentLength = contentStream.Length - contentStream.Position;
+                long position;
+                try
+                {
+                    position = contentStream.Position;
+                }
+                catch (NotSupportedException)
+                {
+                    // If this method is invoked from an older service package, the content stream may not support getting the
+                    // current position (for example, "MD5Stream" doesn't).
+                    // In this case, we'll assume the position is 0 to maintain the previous behavior.
+                    position = 0;
+                }
+
+                _request.Content.Headers.ContentLength = contentStream.Length - position;
             }
 
             WriteContentHeaders(contentHeaders);