Skip to content

Add x-amz-server-side-encryption header for AES256 SSE without customer key #772

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add x-amz-server-side-encryption header for AES256 SSE without customer key #772

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
17 changes: 15 additions & 2 deletions kafka-connect-s3/src/main/java/io/confluent/connect/s3/storage/S3OutputStream.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import com.amazonaws.services.s3.model.CannedAccessControlList;
import com.amazonaws.services.s3.model.CompleteMultipartUploadRequest;
import com.amazonaws.services.s3.model.InitiateMultipartUploadRequest;
import com.amazonaws.services.s3.model.ObjectMetadata;
import com.amazonaws.services.s3.model.PartETag;
import com.amazonaws.services.s3.model.SSEAlgorithm;
import com.amazonaws.services.s3.model.SSEAwsKeyManagementParams;
Expand Down Expand Up @@ -205,14 +206,26 @@ private void internalClose() throws IOException {
super.close();
}

private ObjectMetadata newObjectMetadata() {
ObjectMetadata meta = new ObjectMetadata();
if (StringUtils.isNotBlank(ssea)) {
meta.setSSEAlgorithm(ssea);
}
return meta;
}

private MultipartUpload newMultipartUpload() throws IOException {
InitiateMultipartUploadRequest initRequest = new InitiateMultipartUploadRequest(
bucket,
key
).withCannedACL(cannedAcl);

if (SSEAlgorithm.KMS.toString().equalsIgnoreCase(ssea)
&& StringUtils.isNotBlank(sseKmsKeyId)) {
if (SSEAlgorithm.AES256.toString().equalsIgnoreCase(ssea)
&& sseCustomerKey == null) {
log.debug("Using SSE (AES256) without customer key");
initRequest.setObjectMetadata(newObjectMetadata());
} else if (SSEAlgorithm.KMS.toString().equalsIgnoreCase(ssea)
&& StringUtils.isNotBlank(sseKmsKeyId)) {
log.debug("Using KMS Key ID: {}", sseKmsKeyId);
initRequest.setSSEAwsKeyManagementParams(new SSEAwsKeyManagementParams(sseKmsKeyId));
} else if (sseCustomerKey != null) {
Expand Down