Skip to content

Do not re-use sanitized request when forming signed request #4543

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
haydenbaker merged 1 commit into from
Oct 4, 2023
Merged

Do not re-use sanitized request when forming signed request #4543

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .../software/amazon/awssdk/http/auth/aws/crt/internal/signer/DefaultAwsCrtV4aHttpSigner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Copy link
Contributor

@gosar gosar Oct 4, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can we do

        SdkHttpRequest.Builder requestBuilder = request.request().toBuilder();

        payloadSigner.beforeSigning(requestBuilder, request.payload().orElse(null), signingConfig.getSignedBodyValue());

        // The requestBuilder changes should be done now.
       SdkHttpRequest requestToSign = requestBuilder.build();

        SdkHttpRequest sanitizedRequest = sanitizeRequest(requestToSign);

        HttpRequest crtRequest = toRequest(sanitizedRequest, request.payload().orElse(null));

        V4aContext v4aContext = sign(requestToSign, crtRequest, signingConfig);

Copy link
Contributor

@gosar gosar Oct 4, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And I know we have the MultiRegionAccessPointEndpointResolutionTest test, but is worth adding a unit test to this module.


ContentStreamProvider payload = payloadSigner.sign(request.payload().orElse(null), v4aContext);

Expand Down
5 changes: 0 additions & 5 deletions ...on/awssdk/services/s3/internal/resource/MultiRegionAccessPointEndpointResolutionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,6 @@
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
Copy link
Contributor

@gosar gosar Oct 4, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you didn't call it out, but I assume you tested this with useSraAuth=true

// sanitizes the URI path, we need to double check that this behavior it's safe and that it won't break anything else.
// With useSraAuth=test, need to add the forward slash to the endpoint below to make related tests pass.
// private final static URI MULTI_REGION_ENDPOINT =
// URI.create("https://mfzwi23gnjvgw.mrap.accesspoint.s3-global.amazonaws.com/");
private final static URI MULTI_REGION_ENDPOINT =
URI.create("https://mfzwi23gnjvgw.mrap.accesspoint.s3-global.amazonaws.com");
private MockHttpClient mockHttpClient;
Expand Down