HADOOP-18850 Enable dual-layer server-side encryption with AWS KMS keys #6140
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Bucket with DSSE encryption enabled.
|
|
💔 -1 overall
This message was automatically generated. |
steveloughran
requested changes
Oct 2, 2023
| @@ -94,6 +96,13 @@ public static void assertEncrypted(S3AFileSystem fs, | |||
| kmsKeyArn, | |||
| md.ssekmsKeyId()); | |||
| break; | |||
| case DSSE_KMS: | |||
| assertEquals("Wrong algorithm in " + details, | |||
There was a problem hiding this comment.
prefer assertJ for all new test cases. save time by doing it first time round
| */ | ||
| private void skipIfBucketNotKmsEncrypted() throws IOException { | ||
| S3AFileSystem fs = getFileSystem(); | ||
| Path path = path(getMethodName() + "find-encryption-algo"); |
There was a problem hiding this comment.
just use methodPath()
| String kmsKey = S3AUtils.getS3EncryptionKey(getTestBucketName(c), c); | ||
| // skip the test if DSSE-KMS or KMS key not set. | ||
| if (StringUtils.isBlank(kmsKey)) { | ||
| skip(S3_ENCRYPTION_KEY + " is not set for " + |
There was a problem hiding this comment.
maybe S3ATestUtils.skipIfEncryptionNotSet(); else assume(string, bool)
| @@ -354,6 +358,10 @@ private void putEncryptionParameters(PutObjectRequest.Builder putObjectRequestBu | |||
| // Set the KMS key if present, else S3 uses AWS managed key. | |||
| EncryptionSecretOperations.getSSEAwsKMSKey(encryptionSecrets) | |||
| .ifPresent(kmsKey -> putObjectRequestBuilder.ssekmsKeyId(kmsKey)); | |||
| } else if (S3AEncryptionMethods.DSSE_KMS == algorithm) { | |||
There was a problem hiding this comment.
how about we move to a switch() here and add a default for unknown stuff
|
🎊 +1 overall
This message was automatically generated. |
Re-tested with latest revision |
|
🎊 +1 overall
This message was automatically generated. |
|
🎊 +1 overall
This message was automatically generated. |
steveloughran
requested changes
Oct 25, 2023
| try { | ||
| skipIfEncryptionNotSet(c, DSSE_KMS); | ||
| } catch (IOException e) { | ||
| throw new RuntimeException(e); |
There was a problem hiding this comment.
if this was production i'd ask for an UncheckedIOException(); not so worried here
|
|
||
| 4. As a result, S3 will only decode the data if the user has been granted access to the key. | ||
|
|
||
|
|
There was a problem hiding this comment.
can you add a "further reading" link to the aws docs on this; its a complicated topic
|
🎊 +1 overall
This message was automatically generated. |
|
🎊 +1 overall
This message was automatically generated. |
Re-tested with latest revision |
ahmarsuhail
pushed a commit
to ahmarsuhail/hadoop
that referenced
this pull request
Nov 29, 2023
…KMS keys (apache#6140) Contributed by Viraj Jasani
jiajunmao
pushed a commit
to jiajunmao/hadoop-MLEC
that referenced
this pull request
Feb 6, 2024
…KMS keys (apache#6140) Contributed by Viraj Jasani
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Jira: HADOOP-18850