Do not re-use sanitized request when forming signed request

Author: haydenbaker

core/http-auth-aws/src/main/java/software/amazon/awssdk/http/auth/aws/crt/internal/signer/DefaultAwsCrtV4aHttpSigner.java

@@ -228,7 +228,7 @@ private static SignedRequest doSign(SignRequest<? extends AwsCredentialsIdentity
 
         HttpRequest crtRequest = toRequest(sanitizedRequest, request.payload().orElse(null));
 
-        V4aContext v4aContext = sign(sanitizedRequest, crtRequest, signingConfig);
+        V4aContext v4aContext = sign(requestBuilder.build(), crtRequest, signingConfig);
 
         ContentStreamProvider payload = payloadSigner.sign(request.payload().orElse(null), v4aContext);
 

services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/resource/MultiRegionAccessPointEndpointResolutionTest.java

@@ -21,7 +21,6 @@
 
 import java.net.URI;
 import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
 import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
@@ -41,10 +40,8 @@
 public class MultiRegionAccessPointEndpointResolutionTest {
 
     private final static String MULTI_REGION_ARN = "arn:aws:s3::123456789012:accesspoint:mfzwi23gnjvgw.mrap";
-    // TODO(sra-identity-and-auth): The forward slash of the URL below was added to account for the signer behavior that
-    // sanitizes the URI path, we need to double check that this behavior it's safe and that it won't break anything else.
     private final static URI MULTI_REGION_ENDPOINT =
-        URI.create("https://mfzwi23gnjvgw.mrap.accesspoint.s3-global.amazonaws.com/");
+        URI.create("https://mfzwi23gnjvgw.mrap.accesspoint.s3-global.amazonaws.com");
     private MockHttpClient mockHttpClient;
 
     @BeforeEach
@@ -53,7 +50,6 @@ public void setup() {
     }
 
     @Test
-    @Disabled // Related to the TODO above on MULTI_REGION_ENDPOINT
     public void multiRegionArn_correctlyRewritesEndpoint() throws Exception {
         mockHttpClient.stubNextResponse(mockListObjectsResponse());
         S3Client s3Client = clientBuilder().serviceConfiguration(S3Configuration.builder().build()).build();
@@ -62,7 +58,6 @@ public void multiRegionArn_correctlyRewritesEndpoint() throws Exception {
     }
 
     @Test
-    @Disabled // Related to the TODO above on MULTI_REGION_ENDPOINT
     public void multiRegionArn_useArnRegionEnabled_correctlyRewritesEndpoint() throws Exception {
         mockHttpClient.stubNextResponse(mockListObjectsResponse());
         S3Client s3Client = clientBuilder().serviceConfiguration(S3Configuration.builder()
@@ -139,7 +134,6 @@ public void multiRegionArn_pathStyle_throwsIllegalArgumentException() throws Exc
     }
 
     @Test
-    @Disabled // Related to the TODO above on MULTI_REGION_ENDPOINT
     public void multiRegionArn_differentRegion_useArnRegionTrue() throws Exception {
         mockHttpClient.stubNextResponse(mockListObjectsResponse());
         S3Client s3Client = clientBuilder().build();