Merge pull request #3799 from aws/muhamoth/issue-3797

Fix missing OriginalRequest in RequestContext when generating presigned URLs.

Author: muhammad-othman

generator/.DevConfigs/e24c3bf6-da22-4935-8303-cdba82a45405.json

@@ -0,0 +1,11 @@
+{
+  "services": [
+    {
+      "serviceName": "S3",
+      "type": "patch",
+      "changeLogMessages": [
+        "Fix regression where presigned URLs could not be created when using a custom `ServiceURL`."
+      ]
+    }
+  ]
+}

sdk/src/Services/S3/Custom/AmazonS3Client.Extensions.cs

@@ -113,8 +113,15 @@ internal string GetPreSignedURLInternal(GetPreSignedUrlRequest request)
             var immutableCredentials = credentials.GetCredentials();
             var irequest = Marshall(this.Config, request, immutableCredentials.AccessKey, immutableCredentials.Token, signatureVersionToUse);
 
-            var context = new Amazon.Runtime.Internal.ExecutionContext(new Amazon.Runtime.Internal.RequestContext(true, new NullSigner()) { Request = irequest, ClientConfig = this.Config }, null);
-            
+            var context = new Amazon.Runtime.Internal.ExecutionContext(
+                new RequestContext(true, new NullSigner())
+                {
+                    Request = irequest,
+                    ClientConfig = this.Config,
+                    OriginalRequest = request,
+                },
+                null
+            );
             new AmazonS3EndpointResolver().ProcessRequestHandlers(context);
             var expressConfig = this.Config as AmazonS3Config;
             if (context.RequestContext.Request.IsDirectoryBucket() && !expressConfig.DisableS3ExpressSessionAuth)
@@ -176,8 +183,15 @@ internal async Task<string> GetPreSignedURLInternalAsync(GetPreSignedUrlRequest
             var immutableCredentials = await credentials.GetCredentialsAsync().ConfigureAwait(false);
             var irequest = Marshall(this.Config, request, immutableCredentials.AccessKey, immutableCredentials.Token, signatureVersionToUse);
 
-
-            var context = new Amazon.Runtime.Internal.ExecutionContext(new Amazon.Runtime.Internal.RequestContext(true, new NullSigner()) { Request = irequest, ClientConfig = this.Config }, null);
+            var context = new Amazon.Runtime.Internal.ExecutionContext(
+                new RequestContext(true, new NullSigner())
+                {
+                    Request = irequest,
+                    ClientConfig = this.Config,
+                    OriginalRequest = request,
+                },
+                null
+            );
             new AmazonS3EndpointResolver().ProcessRequestHandlers(context);
             var expressConfig = this.Config as AmazonS3Config;
             if (context.RequestContext.Request.IsDirectoryBucket() && !expressConfig.DisableS3ExpressSessionAuth)

sdk/test/Services/S3/IntegrationTests/GeneratePreSignedUrlTests.cs

@@ -176,6 +176,34 @@ public void EUNorth1PutWithMetadata()
             });
         }
 
+        [TestMethod]
+        [TestCategory("S3")]
+        public void TestGetPreSignedURL_WithCustomServiceURL()
+        {
+            var serviceUrl = "https://s3-external-1.amazonaws.com";
+            var config = new AmazonS3Config
+            {
+                ServiceURL = serviceUrl,
+                ForcePathStyle = true,
+                AuthenticationRegion = "us-west-2"
+            };
+
+            var credentials = new BasicAWSCredentials("accessKey", "secretKey");
+
+            var s3Client = new AmazonS3Client(credentials, config);
+
+            var request = new GetPreSignedUrlRequest
+            {
+                BucketName = "my-bucket",
+                Key = "my-object-key",
+                Expires = DateTime.UtcNow.AddMinutes(5)
+            };
+
+            var url = s3Client.GetPreSignedURL(request);
+
+            Assert.IsTrue(url.StartsWith(serviceUrl));
+        }
+
         private void TestPreSignedUrlPut(PresignedUrlTestParameters testParams)
         {
             var client = new AmazonS3Client(testParams.Region);