Skip to content

HADOOP-19048. ITestCustomSigner failures #6471

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

Closed
wants to merge 1 commit into from
Closed

HADOOP-19048. ITestCustomSigner failures #6471

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
13 changes: 13 additions & 0 deletions hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/auth/ITestCustomSigner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
import software.amazon.awssdk.core.interceptor.ExecutionAttributes;
import software.amazon.awssdk.core.signer.Signer;
import software.amazon.awssdk.http.SdkHttpFullRequest;
import software.amazon.awssdk.http.SdkHttpMethod;
import org.assertj.core.api.Assertions;
import org.junit.Test;
import org.slf4j.Logger;
Expand All @@ -56,6 +57,7 @@
import static org.apache.hadoop.fs.s3a.Constants.CUSTOM_SIGNERS;
import static org.apache.hadoop.fs.s3a.Constants.ENABLE_MULTI_DELETE;
import static org.apache.hadoop.fs.s3a.Constants.SIGNING_ALGORITHM_S3;
import static software.amazon.awssdk.auth.signer.S3SignerExecutionAttribute.ENABLE_PAYLOAD_SIGNING;
import static org.apache.hadoop.fs.s3a.MultipartTestUtils.createMagicFile;
import static org.apache.hadoop.fs.s3a.S3ATestUtils.disableFilesystemCaching;
import static org.apache.hadoop.fs.s3a.S3ATestUtils.removeBaseAndBucketOverrides;
Expand Down Expand Up @@ -278,6 +280,17 @@ public SdkHttpFullRequest sign(SdkHttpFullRequest request,
return realKMSSigner.sign(request, executionAttributes);
} else {
AwsS3V4Signer realSigner = AwsS3V4Signer.create();
if (request.method() == SdkHttpMethod.POST) {
// we need this to work, the attribute is tagged @SdkProtectedApi, this is only needed
// for S3Express buckets.
executionAttributes.putAttribute(ENABLE_PAYLOAD_SIGNING, Boolean.TRUE);
}
if(LOG.isDebugEnabled()) {
LOG.debug("Request Headers:");
for (String hd : request.headers().keySet()) {
LOG.debug("{}={}", hd, request.headers().get(hd));
}
}
return realSigner.sign(request, executionAttributes);
}
}
Expand Down