correctly using encryption context via overrideConfiguration

Author: Anirav Kareddy

src/test/java/software/amazon/encryption/s3/S3EncryptionClientMatDescTest.java

@@ -23,10 +23,13 @@
 import java.security.NoSuchAlgorithmException;
 import java.security.SecureRandom;
 import java.util.Base64;
+import java.util.HashMap;
+import java.util.Map;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertNull;
+import static software.amazon.encryption.s3.S3EncryptionClient.withAdditionalConfiguration;
 import static software.amazon.encryption.s3.utils.S3EncryptionClientTestResources.BUCKET;
 import static software.amazon.encryption.s3.utils.S3EncryptionClientTestResources.appendTestSuffix;
 import static software.amazon.encryption.s3.utils.S3EncryptionClientTestResources.deleteObject;
@@ -46,32 +49,6 @@ public static void setUp() throws NoSuchAlgorithmException {
     RSA_KEY_PAIR = keyPairGen.generateKeyPair();
   }
 
-  @Test
-  public void testMaterialsDescriptionAesKeyring() {
-    AesKeyring aesKeyring = AesKeyring.builder()
-      .wrappingKey(AES_KEY)
-      .materialsDescription(MaterialsDescription.builder()
-        .put("version", "1.0")
-        .put("admin", "yes")
-        .build())
-      .build();
-    assertNotNull(aesKeyring);
-  }
-
-  @Test
-  public void testMaterialsDescriptionRsaKeyring() {
-    PartialRsaKeyPair keyPair = new PartialRsaKeyPair(RSA_KEY_PAIR.getPrivate(), RSA_KEY_PAIR.getPublic());
-    RsaKeyring rsaKeyring = RsaKeyring.builder()
-      .wrappingKeyPair(keyPair)
-      .materialsDescription(MaterialsDescription.builder()
-        .put("version", "1.0")
-        .put("admin", "yes")
-        .build())
-      .build();
-    assertNotNull(rsaKeyring);
-
-  }
-
   @Test
   public void testAesMaterialsDescriptionInObjectMetadata() {
     AesKeyring aesKeyring = AesKeyring.builder()
@@ -267,13 +244,13 @@ public void testAesKeyringMatDescOverridesPutObjectEncryptionContext() {
 
     final String input = "Testing Materials Description in Instruction File and not Encryption Context!";
     final String objectKey = appendTestSuffix("test-aes-materials-description-in-instruction-file-and-not-encryption-context");
-    final String encryptionContext = "{\"admin\":\"yes\"}";
+    final Map<String, String> encryptionContext = new HashMap<String, String>();
+    encryptionContext.put("admin", "yes");
 
     client.putObject(builder -> builder
       .bucket(BUCKET)
       .key(objectKey)
-      .serverSideEncryption(ServerSideEncryption.AWS_KMS)
-      .ssekmsEncryptionContext(Base64.getEncoder().encodeToString(encryptionContext.getBytes(StandardCharsets.UTF_8)))
+      .overrideConfiguration(withAdditionalConfiguration(encryptionContext))
       .build(), RequestBody.fromString(input)
     );
     ResponseBytes<GetObjectResponse> responseBytes = client.getObjectAsBytes(builder -> builder
@@ -313,13 +290,13 @@ public void testRsaKeyringMatDescOverridesPutObjectEncryptionContext() {
       .build();
     final String input = "Testing Materials Description in Instruction File and not Encryption Context!";
     final String objectKey = appendTestSuffix("test-rsa-materials-description-in-instruction-file-and-not-encryption-context");
-    final String encryptionContext = "{\"admin\":\"yes\"}";
+    final Map<String, String> encryptionContext = new HashMap<String, String>();
+    encryptionContext.put("admin", "yes");
 
     client.putObject(builder -> builder
       .bucket(BUCKET)
       .key(objectKey)
-      .serverSideEncryption(ServerSideEncryption.AWS_KMS)
-      .ssekmsEncryptionContext(Base64.getEncoder().encodeToString(encryptionContext.getBytes(StandardCharsets.UTF_8)))
+      .overrideConfiguration(withAdditionalConfiguration(encryptionContext))
       .build(), RequestBody.fromString(input)
     );
     ResponseBytes<GetObjectResponse> responseBytes = client.getObjectAsBytes(builder -> builder

src/test/java/software/amazon/encryption/s3/materials/MaterialsDescriptionTest.java

@@ -1,15 +1,36 @@
 package software.amazon.encryption.s3.materials;
 
+import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
+
+import javax.crypto.KeyGenerator;
+import javax.crypto.SecretKey;
+import java.security.KeyPair;
+import java.security.KeyPairGenerator;
+import java.security.NoSuchAlgorithmException;
 import java.util.HashMap;
 import java.util.Map;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.fail;
 
 public class MaterialsDescriptionTest {
+  private static SecretKey AES_KEY;
+  private static KeyPair RSA_KEY_PAIR;
+
+  @BeforeAll
+  public static void setUp() throws NoSuchAlgorithmException {
+    KeyGenerator keyGen = KeyGenerator.getInstance("AES");
+    keyGen.init(256);
+    AES_KEY = keyGen.generateKey();
+
+    KeyPairGenerator keyPairGen = KeyPairGenerator.getInstance("RSA");
+    keyPairGen.initialize(2048);
+    RSA_KEY_PAIR = keyPairGen.generateKeyPair();
+  }
 
   @Test
   public void testSimpleMaterialsDescription() {
@@ -46,4 +67,30 @@ public void testMaterialsDescriptionPutAll() {
     assertEquals("2.0", materialsDescription.getMaterialsDescription().get("next-version"));
   }
 
+  @Test
+  public void testMaterialsDescriptionAesKeyring() {
+    AesKeyring aesKeyring = AesKeyring.builder()
+      .wrappingKey(AES_KEY)
+      .materialsDescription(MaterialsDescription.builder()
+        .put("version", "1.0")
+        .put("admin", "yes")
+        .build())
+      .build();
+    assertNotNull(aesKeyring);
+  }
+
+  @Test
+  public void testMaterialsDescriptionRsaKeyring() {
+    PartialRsaKeyPair keyPair = new PartialRsaKeyPair(RSA_KEY_PAIR.getPrivate(), RSA_KEY_PAIR.getPublic());
+    RsaKeyring rsaKeyring = RsaKeyring.builder()
+      .wrappingKeyPair(keyPair)
+      .materialsDescription(MaterialsDescription.builder()
+        .put("version", "1.0")
+        .put("admin", "yes")
+        .build())
+      .build();
+    assertNotNull(rsaKeyring);
+
+  }
+
 }