[V3] Update HTTP handler to handle scenario where content stream position is not zero (#3944)

Author: dscpinheiro

generator/.DevConfigs/083f2f8d-4b63-4b95-a272-1be2843814e2.json

@@ -0,0 +1,9 @@
+{
+  "core": {
+    "updateMinimum": true,
+    "type": "patch",
+    "changeLogMessages": [
+      "Update HTTP handler to handle scenario where content stream position is not zero (https://github.com/aws/aws-sdk-net/issues/3941)"
+    ]
+  }
+}

sdk/src/Core/Amazon.Runtime/Pipeline/HttpHandler/HttpHandler.cs

@@ -445,7 +445,17 @@ private void WriteContentToRequestBody(TRequestContent requestContent,
                 }
                 else
                 {
-                    originalStream = wrappedRequest.ContentStream;
+                    // If the current position for the ContentStream is not at the beginning, we need to handle it
+                    // before wrapping it during GetInputStream.
+                    if (wrappedRequest.ContentStream.CanSeek && wrappedRequest.ContentStream.Position != 0)
+                    {
+                        var size = wrappedRequest.ContentStream.Length - wrappedRequest.ContentStream.Position;
+                        originalStream = new PartialReadOnlyWrapperStream(wrappedRequest.ContentStream, size);
+                    }
+                    else
+                    {
+                        originalStream = wrappedRequest.ContentStream;
+                    }
                 }
 
                 var callback = ((Amazon.Runtime.Internal.IAmazonWebServiceRequest)wrappedRequest.OriginalRequest).StreamUploadProgressCallback;
@@ -492,7 +502,17 @@ private async System.Threading.Tasks.Task WriteContentToRequestBodyAsync(TReques
                 }
                 else
                 {
-                    originalStream = wrappedRequest.ContentStream;
+                    // If the current position for the ContentStream is not at the beginning, we need to handle it
+                    // before wrapping it during GetInputStream.
+                    if (wrappedRequest.ContentStream.CanSeek && wrappedRequest.ContentStream.Position != 0)
+                    {
+                        var size = wrappedRequest.ContentStream.Length - wrappedRequest.ContentStream.Position;
+                        originalStream = new PartialReadOnlyWrapperStream(wrappedRequest.ContentStream, size);
+                    }
+                    else
+                    {
+                        originalStream = wrappedRequest.ContentStream;
+                    }
                 }
 
                 var callback = ((Amazon.Runtime.Internal.IAmazonWebServiceRequest)wrappedRequest.OriginalRequest).StreamUploadProgressCallback;

sdk/test/NetStandard/IntegrationTests/IntegrationTests/S3/PutObjectTests.cs

@@ -186,6 +186,66 @@ public async Task PutObjectWithoutContentEncoding(bool useChunkEncoding)
             Assert.Null(headers.ContentEncoding);
         }
 
+        /// <summary>
+        /// Reported in https://github.com/aws/aws-sdk-net/issues/3941
+        /// </summary>
+        [Fact]
+        public async Task HandlesFileStreamWithoutAutoReset()
+        {
+            var tempFile = Path.GetTempFileName();
+            try
+            {
+                using (var writeFs = new FileStream(tempFile, FileMode.Create, FileAccess.Write))
+                {
+                    var data = new byte[]
+                    {
+                        0x01, 0x00, 0x0D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                        0x00, 0x00, 0x00, 0x00, 0x01, 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+                    };
+
+                    await writeFs.WriteAsync(data, 0, data.Length);
+                }
+
+                using var fileStream = File.Open(tempFile, FileMode.Open, FileAccess.Read, FileShare.Read);
+                using var reader = new BinaryReader(fileStream);
+
+                fileStream.Position = 10;
+                var compression = reader.ReadInt16();
+                
+                fileStream.Seek(8, SeekOrigin.Current);
+                var bIsLast = reader.ReadBoolean();
+                
+                fileStream.Seek(4, SeekOrigin.Current);
+
+                var putRequest = new PutObjectRequest
+                {
+                    BucketName = bucketName,
+                    Key = "upload-test/0D-0",
+                    ContentType = "application/octet-stream",
+                    InputStream = fileStream,
+                    AutoResetStreamPosition = false,
+                };
+                putRequest.Metadata.Add("compression", compression.ToString());
+                putRequest.Metadata.Add("islast", bIsLast ? "T" : "F");
+
+                var putResponse = await Client.PutObjectAsync(putRequest);
+                Assert.Equal(HttpStatusCode.OK, putResponse.HttpStatusCode);
+
+                var getResponse = await Client.GetObjectMetadataAsync(bucketName, putRequest.Key);
+                Assert.Equal(HttpStatusCode.OK, getResponse.HttpStatusCode);
+                Assert.NotNull(getResponse.Metadata);
+                Assert.True(getResponse.Metadata.Count > 0);
+            }
+            finally
+            {
+                if (File.Exists(tempFile))
+                {
+                    File.Delete(tempFile);
+                }
+            }
+        }
+
         /// <summary>
         /// Reported in https://github.com/aws/aws-sdk-net/issues/3629
         /// </summary>