Throw exception on decrypt if plaintext data key already present.

smswz · smswz · commit b681bd9f0ed9 · 2022-06-28T15:43:36.000-05:00
diff --git a/src/main/java/software/amazon/encryption/s3/materials/AesGcmKeyring.java b/src/main/java/software/amazon/encryption/s3/materials/AesGcmKeyring.java
@@ -81,7 +81,7 @@ public EncryptionMaterials onEncrypt(EncryptionMaterials materials) {
     @Override
     public DecryptionMaterials onDecrypt(final DecryptionMaterials materials, List<EncryptedDataKey> encryptedDataKeys) {
         if (materials.plaintextDataKey() != null) {
-            return materials;
+            throw new S3EncryptionClientException("Decryption materials already contains a plaintext data key.");
         }
 
         for (EncryptedDataKey encryptedDataKey : encryptedDataKeys) {
diff --git a/src/main/java/software/amazon/encryption/s3/materials/KmsContextKeyring.java b/src/main/java/software/amazon/encryption/s3/materials/KmsContextKeyring.java
@@ -86,7 +86,7 @@ public EncryptionMaterials onEncrypt(EncryptionMaterials materials) {
     @Override
     public DecryptionMaterials onDecrypt(final DecryptionMaterials materials, List<EncryptedDataKey> encryptedDataKeys) {
         if (materials.plaintextDataKey() != null) {
-            return materials;
+            throw new S3EncryptionClientException("Decryption materials already contains a plaintext data key.");
         }
 
         for (EncryptedDataKey encryptedDataKey : encryptedDataKeys) {
diff --git a/src/main/java/software/amazon/encryption/s3/materials/RsaOaepKeyring.java b/src/main/java/software/amazon/encryption/s3/materials/RsaOaepKeyring.java
@@ -86,7 +86,7 @@ public EncryptionMaterials onEncrypt(EncryptionMaterials materials) {
     @Override
     public DecryptionMaterials onDecrypt(final DecryptionMaterials materials, List<EncryptedDataKey> encryptedDataKeys) {
         if (materials.plaintextDataKey() != null) {
-            return materials;
+            throw new S3EncryptionClientException("Decryption materials already contains a plaintext data key.");
         }
 
         for (EncryptedDataKey encryptedDataKey : encryptedDataKeys) {

Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ public EncryptionMaterials onEncrypt(EncryptionMaterials materials) {`
`81`	`81`	`@Override`
`82`	`82`	`public DecryptionMaterials onDecrypt(final DecryptionMaterials materials, List<EncryptedDataKey> encryptedDataKeys) {`
`83`	`83`	`if (materials.plaintextDataKey() != null) {`
`84`		`- return materials;`
	`84`	`+ throw new S3EncryptionClientException("Decryption materials already contains a plaintext data key.");`
`85`	`85`	`}`
`86`	`86`
`87`	`87`	`for (EncryptedDataKey encryptedDataKey : encryptedDataKeys) {`
Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ public EncryptionMaterials onEncrypt(EncryptionMaterials materials) {`
`86`	`86`	`@Override`
`87`	`87`	`public DecryptionMaterials onDecrypt(final DecryptionMaterials materials, List<EncryptedDataKey> encryptedDataKeys) {`
`88`	`88`	`if (materials.plaintextDataKey() != null) {`
`89`		`- return materials;`
	`89`	`+ throw new S3EncryptionClientException("Decryption materials already contains a plaintext data key.");`
`90`	`90`	`}`
`91`	`91`
`92`	`92`	`for (EncryptedDataKey encryptedDataKey : encryptedDataKeys) {`