had to remove the ability to test for logged warnings due to vulnerabilties in the dependency + most of the dependencies latest versions only support java 11 and we are currently only supporting java 8

Author: Anirav Kareddy

pom.xml

@@ -168,18 +168,6 @@
       <scope>test</scope>
     </dependency>
 
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>jcl-over-slf4j</artifactId>
-      <version>2.1.0-alpha1</version>
-    </dependency>
-
-    <dependency>
-      <groupId>ch.qos.logback</groupId>
-      <artifactId>logback-classic</artifactId>
-      <version>1.5.13</version>
-    </dependency>
-
   </dependencies>
 
   <build>

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

@@ -2,9 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0
 package software.amazon.encryption.s3;
 
-import ch.qos.logback.classic.Logger;
-import ch.qos.logback.classic.spi.ILoggingEvent;
-import ch.qos.logback.core.read.ListAppender;
 import com.amazonaws.services.kms.AWSKMS;
 import com.amazonaws.services.kms.AWSKMSClientBuilder;
 import com.amazonaws.services.s3.AmazonS3Encryption;
@@ -23,7 +20,6 @@
 import com.amazonaws.services.s3.model.StaticEncryptionMaterialsProvider;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
-import org.slf4j.LoggerFactory;
 import software.amazon.awssdk.core.ResponseBytes;
 import software.amazon.awssdk.core.sync.RequestBody;
 import software.amazon.awssdk.services.s3.S3Client;
@@ -33,11 +29,6 @@
 import software.amazon.awssdk.services.s3.model.PutObjectRequest;
 import software.amazon.encryption.s3.internal.InstructionFileConfig;
 
-import software.amazon.encryption.s3.materials.AesKeyring;
-import software.amazon.encryption.s3.materials.KmsKeyring;
-import software.amazon.encryption.s3.materials.PartialRsaKeyPair;
-import software.amazon.encryption.s3.materials.RsaKeyring;
-
 import javax.crypto.KeyGenerator;
 import javax.crypto.SecretKey;
 import java.io.ByteArrayInputStream;
@@ -50,9 +41,7 @@
 import java.util.Map;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import static software.amazon.encryption.s3.S3EncryptionClient.withAdditionalConfiguration;
 import static software.amazon.encryption.s3.utils.S3EncryptionClientTestResources.BUCKET;
@@ -978,159 +967,4 @@ public void nullMaterialDescriptionV3() {
 
     }
 
-    @Test
-    public void LegacyWrappingEnabledOnClientButNotOnAesKeyring() {
-        Logger logger = (Logger) LoggerFactory.getLogger(S3EncryptionClient.class);
-        ListAppender<ILoggingEvent> listAppender = new ListAppender<>();
-        listAppender.start();
-        logger.addAppender(listAppender);
-
-        AesKeyring aesKeyring = AesKeyring.builder()
-          .wrappingKey(AES_KEY)
-          .build();
-
-        S3Client wrappedClient = S3Client.create();
-        S3Client v3Client = S3EncryptionClient.builder()
-          .keyring(aesKeyring)
-          .wrappedClient(wrappedClient)
-          .enableLegacyWrappingAlgorithms(true)
-          .enableLegacyUnauthenticatedModes(true)
-          .build();
-
-        assertTrue(listAppender.list.stream().anyMatch(event -> event.getMessage().contains("enableLegacyWrappingAlgorithms is set on the client, but is not set on the keyring provided. In order to enable legacy wrapping algorithms, set enableLegacyWrappingAlgorithms to true in the keyring's builder.")));
-        logger.detachAppender(listAppender);
-    }
-
-    @Test
-    public void LegacyWrappingEnabledOnClientButNotOnRsaKeyring() {
-        Logger logger = (Logger) LoggerFactory.getLogger(S3EncryptionClient.class);
-        ListAppender<ILoggingEvent> listAppender = new ListAppender<>();
-        listAppender.start();
-        logger.addAppender(listAppender);
-
-        PartialRsaKeyPair partialRsaKeyPair = PartialRsaKeyPair.builder()
-          .publicKey(RSA_KEY_PAIR.getPublic())
-          .privateKey(RSA_KEY_PAIR.getPrivate())
-          .build();
-
-        RsaKeyring rsaKeyring = RsaKeyring.builder()
-          .wrappingKeyPair(partialRsaKeyPair)
-          .build();
-
-        S3Client wrappedClient = S3Client.create();
-        S3Client v3Client = S3EncryptionClient.builder()
-          .keyring(rsaKeyring)
-          .wrappedClient(wrappedClient)
-          .enableLegacyWrappingAlgorithms(true)
-          .enableLegacyUnauthenticatedModes(true)
-          .build();
-
-        assertTrue(listAppender.list.stream().anyMatch(event -> event.getMessage().contains("enableLegacyWrappingAlgorithms is set on the client, but is not set on the keyring provided. In order to enable legacy wrapping algorithms, set enableLegacyWrappingAlgorithms to true in the keyring's builder.")));
-        logger.detachAppender(listAppender);
-
-    }
-
-    @Test
-    public void LegacyWrappingEnabledOnClientButNotOnKmsKeyring() {
-        Logger logger = (Logger) LoggerFactory.getLogger(S3EncryptionClient.class);
-        ListAppender<ILoggingEvent> listAppender = new ListAppender<>();
-        listAppender.start();
-        logger.addAppender(listAppender);
-
-        KmsKeyring kmsKeyring = KmsKeyring.builder()
-          .wrappingKeyId(KMS_KEY_ID)
-          .build();
-
-        S3Client wrappedClient = S3Client.create();
-        S3Client v3Client = S3EncryptionClient.builder()
-          .keyring(kmsKeyring)
-          .wrappedClient(wrappedClient)
-          .enableLegacyWrappingAlgorithms(true)
-          .enableLegacyUnauthenticatedModes(true)
-          .build();
-
-        assertTrue(listAppender.list.stream().anyMatch(event -> event.getMessage().contains("enableLegacyWrappingAlgorithms is set on the client, but is not set on the keyring provided. In order to enable legacy wrapping algorithms, set enableLegacyWrappingAlgorithms to true in the keyring's builder.")));
-        logger.detachAppender(listAppender);
-
-        }
-
-    @Test
-    public void LegacyWrappingEnabledOnBothClientAndAesKeyring() {
-        Logger logger = (Logger) LoggerFactory.getLogger(S3EncryptionClient.class);
-        ListAppender<ILoggingEvent> listAppender = new ListAppender<>();
-        listAppender.start();
-        logger.addAppender(listAppender);
-
-        AesKeyring aesKeyring = AesKeyring.builder()
-          .wrappingKey(AES_KEY)
-          .enableLegacyWrappingAlgorithms(true)
-          .build();
-
-        S3Client wrappedClient = S3Client.create();
-        S3Client v3Client = S3EncryptionClient.builder()
-          .keyring(aesKeyring)
-          .wrappedClient(wrappedClient)
-          .enableLegacyWrappingAlgorithms(true)
-          .enableLegacyUnauthenticatedModes(true)
-          .build();
-
-        assertFalse(listAppender.list.stream()
-          .anyMatch(event -> event.getMessage().contains("enableLegacyWrappingAlgorithms is set on the client, but is not set on the keyring provided. In order to enable legacy wrapping algorithms, set enableLegacyWrappingAlgorithms to true in the keyring's builder.")));
-        logger.detachAppender(listAppender);
-    }
-
-    @Test
-    public void LegacyWrappingEnabledOnBothClientAndRsaKeyring() {
-        Logger logger = (Logger) LoggerFactory.getLogger(S3EncryptionClient.class);
-        ListAppender<ILoggingEvent> listAppender = new ListAppender<>();
-        listAppender.start();
-        logger.addAppender(listAppender);
-
-        PartialRsaKeyPair partialRsaKeyPair = PartialRsaKeyPair.builder()
-          .publicKey(RSA_KEY_PAIR.getPublic())
-          .privateKey(RSA_KEY_PAIR.getPrivate())
-          .build();
-
-        RsaKeyring rsaKeyring = RsaKeyring.builder()
-          .wrappingKeyPair(partialRsaKeyPair)
-          .enableLegacyWrappingAlgorithms(true)
-          .build();
-
-        S3Client wrappedClient = S3Client.create();
-        S3Client v3Client = S3EncryptionClient.builder()
-          .keyring(rsaKeyring)
-          .wrappedClient(wrappedClient)
-          .enableLegacyWrappingAlgorithms(true)
-          .enableLegacyUnauthenticatedModes(true)
-          .build();
-
-        assertFalse(listAppender.list.stream()
-          .anyMatch(event -> event.getMessage().contains("enableLegacyWrappingAlgorithms is set on the client, but is not set on the keyring provided. In order to enable legacy wrapping algorithms, set enableLegacyWrappingAlgorithms to true in the keyring's builder.")));
-        logger.detachAppender(listAppender);
-    }
-
-    @Test
-    public void LegacyWrappingEnabledOnBothClientAndKmsKeyring() {
-        Logger logger = (Logger) LoggerFactory.getLogger(S3EncryptionClient.class);
-        ListAppender<ILoggingEvent> listAppender = new ListAppender<>();
-        listAppender.start();
-        logger.addAppender(listAppender);
-
-        KmsKeyring kmsKeyring = KmsKeyring.builder()
-          .wrappingKeyId(KMS_KEY_ID)
-          .enableLegacyWrappingAlgorithms(true)
-          .build();
-
-        S3Client wrappedClient = S3Client.create();
-        S3Client v3Client = S3EncryptionClient.builder()
-          .keyring(kmsKeyring)
-          .wrappedClient(wrappedClient)
-          .enableLegacyWrappingAlgorithms(true)
-          .enableLegacyUnauthenticatedModes(true)
-          .build();
-
-        assertFalse(listAppender.list.stream()
-          .anyMatch(event -> event.getMessage().contains("enableLegacyWrappingAlgorithms is set on the client, but is not set on the keyring provided. In order to enable legacy wrapping algorithms, set enableLegacyWrappingAlgorithms to true in the keyring's builder.")));
-        logger.detachAppender(listAppender);
-    }
 }