This is an automated email from the ASF dual-hosted git repository. daim pushed a commit to branch OAK-10093 in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
commit 0f35458d50a540c353a0b4f62fd30c8267047280 Author: Rishabh Kumar <[email protected]> AuthorDate: Mon Jun 19 14:14:59 2023 +0530 OAK-10093 : incorporated review comments --- .../java/org/apache/jackrabbit/oak/blob/cloud/s3/S3Constants.java | 6 +++--- .../org/apache/jackrabbit/oak/blob/cloud/s3/S3RequestDecorator.java | 4 ++-- .../jackrabbit/oak/blob/cloud/s3/TestS3DSWithSSECustomerKey.java | 6 +++--- .../test/java/org/apache/jackrabbit/oak/blob/cloud/s3/TestS3Ds.java | 6 +++--- oak-blob-cloud/src/test/resources/aws.properties | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/s3/S3Constants.java b/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/s3/S3Constants.java index eb6ca3dce8..3852e35b2f 100644 --- a/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/s3/S3Constants.java +++ b/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/s3/S3Constants.java @@ -108,7 +108,7 @@ public final class S3Constants { public static final String S3_ENCRYPTION_SSE_KMS = "SSE_KMS"; /** - * Constant to set SSE_KMS encryption. + * Constant to set SSE_C encryption. */ public static final String S3_ENCRYPTION_SSE_C = "SSE_C"; @@ -118,11 +118,11 @@ public final class S3Constants { public static final String S3_SSE_KMS_KEYID = "kmsKeyId"; /** - * Constant to set base64 encoded keyID for SSE_C encryption. + * Constant to set base64 encoded key for SSE_C encryption. */ // please use 'openssl rand -base64 -out ssec.key 32' command to // generate base64 encoded 32 bytes string customer key for SSE_C - public static final String S3_SSE_C_KEYID = "sseCustomerKeyId"; + public static final String S3_SSE_C_KEY = "sseCustomerKey"; /** * Constant to set S3 signature for SSE_KMS encryption. diff --git a/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/s3/S3RequestDecorator.java b/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/s3/S3RequestDecorator.java index 92f74fbc0c..a99e8b67ef 100644 --- a/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/s3/S3RequestDecorator.java +++ b/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/s3/S3RequestDecorator.java @@ -37,7 +37,7 @@ import static java.util.Objects.requireNonNull; import static org.apache.jackrabbit.oak.blob.cloud.s3.S3Constants.S3_ENCRYPTION; import static org.apache.jackrabbit.oak.blob.cloud.s3.S3Constants.S3_ENCRYPTION_SSE_C; import static org.apache.jackrabbit.oak.blob.cloud.s3.S3Constants.S3_ENCRYPTION_SSE_KMS; -import static org.apache.jackrabbit.oak.blob.cloud.s3.S3Constants.S3_SSE_C_KEYID; +import static org.apache.jackrabbit.oak.blob.cloud.s3.S3Constants.S3_SSE_C_KEY; import static org.apache.jackrabbit.oak.blob.cloud.s3.S3Constants.S3_SSE_KMS_KEYID; /** @@ -65,7 +65,7 @@ public class S3RequestDecorator { break; } case S3_ENCRYPTION_SSE_C: { - final String keyId = props.getProperty(S3_SSE_C_KEYID); + final String keyId = props.getProperty(S3_SSE_C_KEY); if (hasValue(keyId)) { sseCustomerKey = new SSECustomerKey(keyId); } diff --git a/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/s3/TestS3DSWithSSECustomerKey.java b/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/s3/TestS3DSWithSSECustomerKey.java index f49ef0e01b..c8d1b20e64 100644 --- a/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/s3/TestS3DSWithSSECustomerKey.java +++ b/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/s3/TestS3DSWithSSECustomerKey.java @@ -23,7 +23,7 @@ import org.slf4j.Logger; import static com.amazonaws.util.StringUtils.hasValue; import static org.apache.jackrabbit.oak.blob.cloud.s3.S3Constants.S3_ENCRYPTION; import static org.apache.jackrabbit.oak.blob.cloud.s3.S3Constants.S3_ENCRYPTION_SSE_C; -import static org.apache.jackrabbit.oak.blob.cloud.s3.S3Constants.S3_SSE_C_KEYID; +import static org.apache.jackrabbit.oak.blob.cloud.s3.S3Constants.S3_SSE_C_KEY; import static org.slf4j.LoggerFactory.getLogger; /** @@ -42,10 +42,10 @@ public class TestS3DSWithSSECustomerKey extends TestS3Ds { @Before public void setUp() throws Exception { super.setUp(); - String keyId = props.getProperty(S3_SSE_C_KEYID); + String keyId = props.getProperty(S3_SSE_C_KEY); if (hasValue(keyId)) { props.setProperty(S3_ENCRYPTION, S3_ENCRYPTION_SSE_C); - props.setProperty(S3_SSE_C_KEYID, keyId); + props.setProperty(S3_SSE_C_KEY, keyId); } else { LOG.info("SSE Customer Key ID not configured so ignoring test"); throw new AssumptionViolatedException("SSE Customer key Id not configured"); diff --git a/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/s3/TestS3Ds.java b/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/s3/TestS3Ds.java index 49d2309fbd..58a521cf3a 100644 --- a/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/s3/TestS3Ds.java +++ b/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/s3/TestS3Ds.java @@ -71,7 +71,7 @@ import static com.amazonaws.util.Md5Utils.md5AsBase64; import static org.apache.jackrabbit.oak.blob.cloud.s3.S3Constants.S3_ENCRYPTION; import static org.apache.jackrabbit.oak.blob.cloud.s3.S3Constants.S3_ENCRYPTION_SSE_C; import static org.apache.jackrabbit.oak.blob.cloud.s3.S3Constants.S3_ENCRYPTION_SSE_KMS; -import static org.apache.jackrabbit.oak.blob.cloud.s3.S3Constants.S3_SSE_C_KEYID; +import static org.apache.jackrabbit.oak.blob.cloud.s3.S3Constants.S3_SSE_C_KEY; import static org.apache.jackrabbit.oak.blob.cloud.s3.S3Constants.S3_SSE_KMS_KEYID; import static org.apache.jackrabbit.oak.blob.cloud.s3.S3DataStoreUtils.getFixtures; import static org.apache.jackrabbit.oak.blob.cloud.s3.S3DataStoreUtils.getS3Config; @@ -276,7 +276,7 @@ public class TestS3Ds extends AbstractDataStoreTest { } break; case S3_ENCRYPTION_SSE_C: - keyId = props.getProperty(S3_SSE_C_KEYID); + keyId = props.getProperty(S3_SSE_C_KEY); putreq.addHeader(new BasicHeader(SERVER_SIDE_ENCRYPTION_CUSTOMER_ALGORITHM, AES256.getAlgorithm())); putreq.addHeader(new BasicHeader(SERVER_SIDE_ENCRYPTION_CUSTOMER_KEY, keyId)); putreq.addHeader(new BasicHeader(SERVER_SIDE_ENCRYPTION_CUSTOMER_KEY_MD5, md5AsBase64(decode(keyId)))); @@ -298,7 +298,7 @@ public class TestS3Ds extends AbstractDataStoreTest { final String encryptionType = props.getProperty(S3_ENCRYPTION); if (Objects.equals(S3_ENCRYPTION_SSE_C, encryptionType)) { - String keyId = props.getProperty(S3_SSE_C_KEYID); + String keyId = props.getProperty(S3_SSE_C_KEY); getreq.addHeader(new BasicHeader(SERVER_SIDE_ENCRYPTION_CUSTOMER_ALGORITHM, AES256.getAlgorithm())); getreq.addHeader(new BasicHeader(SERVER_SIDE_ENCRYPTION_CUSTOMER_KEY, keyId)); getreq.addHeader(new BasicHeader(SERVER_SIDE_ENCRYPTION_CUSTOMER_KEY_MD5, md5AsBase64(decode(keyId)))); diff --git a/oak-blob-cloud/src/test/resources/aws.properties b/oak-blob-cloud/src/test/resources/aws.properties index e29dfef8e6..fb5623d4bb 100644 --- a/oak-blob-cloud/src/test/resources/aws.properties +++ b/oak-blob-cloud/src/test/resources/aws.properties @@ -38,7 +38,7 @@ kmsKeyId= # base64 encoded 32 bytes customer key to be used for SSE_C # Please use 'openssl rand -base64 -out ssec.key 32' command # to generate customer key -sseCustomerKeyId= +sseCustomerKey= connectionTimeout=120000 socketTimeout=120000 maxConnections=20
