Arsnael commented on code in PR #2488:
URL: https://github.com/apache/james-project/pull/2488#discussion_r1833697703
##########
server/blob/blob-s3/src/main/java/org/apache/james/blob/objectstorage/aws/sse/S3SSECConfiguration.java:
##########
@@ -23,20 +23,23 @@
import com.google.common.base.Preconditions;
-public record S3SSECustomerConfiguration(boolean enabled,
- String algorithm,
- String masterPassword,
- String salt) {
+public interface S3SSECConfiguration {
- public static final List<String> SUPPORTED_ALGORITHMS = List.of("AES256");
+ List<String> SUPPORTED_ALGORITHMS = List.of("AES256");
- public S3SSECustomerConfiguration(boolean enabled, String algorithm,
String masterPassword, String salt) {
- this.enabled = enabled;
- if (enabled) {
-
Preconditions.checkArgument(SUPPORTED_ALGORITHMS.contains(algorithm),
"Unsupported algorithm: %s. The supported algorithms are: %s", algorithm,
SUPPORTED_ALGORITHMS);
+ String algorithm();
+
+ record Basic(String algorithm,
+ String masterPassword,
+ String salt) implements S3SSECConfiguration {
+ public Basic {
+
Preconditions.checkArgument(SUPPORTED_ALGORITHMS.contains(algorithm),
"Unsupported algorithm: " + algorithm + ". The supported algorithms are: " +
SUPPORTED_ALGORITHMS);
+ }
+ }
+
+ record KeyDerivationEnabled(String algorithm) implements
S3SSECConfiguration {
Review Comment:
Out of scope for this task?
##########
server/blob/blob-s3/src/test/java/org/apache/james/blob/objectstorage/aws/sse/SingleCustomerKeyFactoryTest.java:
##########
@@ -0,0 +1,64 @@
+/****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one *
+ * or more contributor license agreements. See the NOTICE file *
+ * distributed with this work for additional information *
+ * regarding copyright ownership. The ASF licenses this file *
+ * to you under the Apache License, Version 2.0 (the *
+ * "License"); you may not use this file except in compliance *
+ * with the License. You may obtain a copy of the License at *
+ * *
+ * http://www.apache.org/licenses/LICENSE-2.0 *
+ * *
+ * Unless required by applicable law or agreed to in writing, *
+ * software distributed under the License is distributed on an *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY *
+ * KIND, either express or implied. See the License for the *
+ * specific language governing permissions and limitations *
+ * under the License. *
+ ****************************************************************/
+
+package org.apache.james.blob.objectstorage.aws.sse;
+
+import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
+
+import java.security.spec.InvalidKeySpecException;
+
+import org.apache.james.blob.api.BucketName;
+import org.apache.james.blob.api.TestBlobId;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import reactor.core.publisher.Mono;
+
+public class SingleCustomerKeyFactoryTest {
+ private static S3SSECustomerKeyFactory.SingleCustomerKeyFactory testee;
+
+ @BeforeAll
+ static void setup() throws InvalidKeySpecException {
+ testee = new S3SSECustomerKeyFactory.SingleCustomerKeyFactory(new
S3SSECustomerConfiguration(true, "AES256", "masterPassword", "salt"));
+
+ }
+
+ @Test
+ void generateShouldReturnSSECustomerKey() {
+ // When
+ S3SSECustomerKeyFactory.SSECustomerKey sseCustomerKey =
Mono.from(testee.generate(BucketName.of("bucket1"), new
TestBlobId("blobId"))).block();
+
+ // Then
+
assertThat(sseCustomerKey.customerKey()).isEqualTo("tsY5n0n10fcpjm7aGArqbw231ptLGAF5ubxMxI2+QYw=");
+ assertThat(sseCustomerKey.md5()).isEqualTo("G6IB1YLHiY/9uCh3TJhxzQ==");
+ assertThat(sseCustomerKey.algorithm()).isEqualTo("AES256");
+ }
+
+ @Test
+ void generateShouldReturnSameSSECustomerKey() {
+ // When
+ S3SSECustomerKeyFactory.SSECustomerKey sseCustomerKey1 =
Mono.from(testee.generate(BucketName.of("bucket1"), new
TestBlobId("blobId"))).block();
+ S3SSECustomerKeyFactory.SSECustomerKey sseCustomerKey2 =
Mono.from(testee.generate(BucketName.of("bucket1"), new
TestBlobId("blobId"))).block();
Review Comment:
Is this intended to have same bucket name and blobid here or bad copy/paste?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscr...@james.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscr...@james.apache.org
For additional commands, e-mail: notifications-h...@james.apache.org
