Skip to content

Fix inconsistency of checksunValidationEnabled between default S3Configuration and no S3Configuration #2231

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
merged 2 commits into from
Jan 9, 2021
Merged

Fix inconsistency of checksunValidationEnabled between default S3Configuration and no S3Configuration #2231

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3416f89
Add a warning to note that checksumValidationEnabled is true by default.
Quanzzzz Jan 8, 2021
36a4159
Merge branch 'master' into presigner-debug
Quanzzzz Jan 9, 2021
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
12 changes: 10 additions & 2 deletions ...c/main/java/software/amazon/awssdk/services/s3/internal/presigner/DefaultS3Presigner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,17 +90,20 @@
import software.amazon.awssdk.services.s3.transform.PutObjectRequestMarshaller;
import software.amazon.awssdk.services.s3.transform.UploadPartRequestMarshaller;
import software.amazon.awssdk.utils.IoUtils;
import software.amazon.awssdk.utils.Logger;
import software.amazon.awssdk.utils.Validate;

/**
* The default implementation of the {@link S3Presigner} interface.
*/
@SdkInternalApi
public final class DefaultS3Presigner extends DefaultSdkPresigner implements S3Presigner {
private static final Logger log = Logger.loggerFor(DefaultS3Presigner.class);

private static final AwsS3V4Signer DEFAULT_SIGNER = AwsS3V4Signer.create();
private static final S3Configuration DEFAULT_S3_CONFIGURATION = S3Configuration.builder()
.checksumValidationEnabled(false)
.build();
.checksumValidationEnabled(false)
.build();
private static final String SERVICE_NAME = "s3";
private static final String SIGNING_NAME = "s3";

Expand All @@ -117,6 +120,11 @@ private DefaultS3Presigner(Builder b) {
super(b);

this.serviceConfiguration = b.serviceConfiguration != null ? b.serviceConfiguration : DEFAULT_S3_CONFIGURATION;
if (serviceConfiguration.checksumValidationEnabled()) {
log.debug(() -> "The provided S3Configuration has ChecksumValidationEnabled set to true. Please note that "
+ "the pre-signed request can't be executed using a web browser if checksum validation is enabled.");
}


this.clientInterceptors = initializeInterceptors();

Expand Down