Bump cypress from 10.11.0 to 12.5.0 in /cerberus-dashboard

build.gradle

@@ -21,13 +21,13 @@ buildscript {
     versions = [
       lombok: '1.18.24',
       resilience4j: '1.7.1',
-      awsSdkVersion: '1.12.323',
-      kork: '7.149.0',
+      awsSdkVersion: '1.12.367',
+      kork: '7.158.0',
       guava: '31.1-jre',
-      springBoot: '2.7.4',
+      springBoot: '2.7.5',
       jjwt: '0.11.5',
-      okta: '3.1.0',
-      oktaAuthnSdk: '2.0.8',
+      okta: '8.2.2',
+      oktaAuthnSdk: '2.0.9',
       restAssured: '5.2.0',
       groovy: '4.0.6'
     ]
@@ -51,8 +51,8 @@ buildscript {
 
 plugins {
   id "io.spring.dependency-management" version "1.1.0"
-  id "com.github.nbaztec.coveralls-jacoco" version "1.2.14"
-  id "com.github.spotbugs" version "4.7.9"
+  id "com.github.nbaztec.coveralls-jacoco" version "1.2.15"
+  id "com.github.spotbugs" version "5.0.13"
   id "com.diffplug.spotless" version "6.11.0"
 }
 

cerberus-dashboard/build.gradle

@@ -15,7 +15,7 @@
  */
 
 plugins {
-  id "com.github.node-gradle.node" version "2.2.4"
+  id "com.github.node-gradle.node" version "3.5.0"
 }
 
 node {

cerberus-dashboard/package.json

@@ -33,32 +33,32 @@
     "connected-react-router": "^6.9.3",
     "downloadjs": "1.4.7",
     "history": "^4.10.1",
-    "html-react-parser": "^1.4.11",
+    "html-react-parser": "^1.4.14",
     "humps": "2.0.1",
-    "loglevel": "1.8.0",
+    "loglevel": "1.8.1",
     "prop-types": "^15.8.1",
     "react": "^16.14.0",
     "react-copy-to-clipboard": "5.1.0",
     "react-dom": "^16.14.0",
     "react-json-pretty": "^2.2.0",
-    "react-paginate": "7.1.3",
+    "react-paginate": "7.1.5",
     "react-redux": "^6.0.1",
-    "react-router": "^5.2.0",
-    "react-router-dom": "^5.2.0",
+    "react-router": "^5.3.4",
+    "react-router-dom": "^5.3.4",
     "react-select": "4.3.1",
     "react-simple-file-input": "2.1.0",
-    "react-tooltip": "^4.2.21",
+    "react-tooltip": "^4.5.1",
     "redux": "3.7.2",
-    "redux-form": "5.3.6",
+    "redux-form": "5.4.0",
     "redux-logger": "3.0.6",
-    "redux-thunk": "2.3.0",
-    "worker-timers": "7.0.54"
+    "redux-thunk": "2.4.2",
+    "worker-timers": "7.0.60"
   },
   "devDependencies": {
-    "react-scripts": "5.0.1",
-    "sass": "^1.55.0",
+    "react-scripts": "^5.0.1",
+    "sass": "^1.57.1",
     "@cypress/skip-test": "^2.6.1",
-    "cypress": "~10.9.0",
+    "cypress": "~12.5.0",
     "npm-check-updates": "~15.3.4"
   },
   "browserslist": {

cerberus-domain/build.gradle

@@ -20,8 +20,8 @@ repositories {
 
 dependencies {
   api group: 'javax.validation', name: 'validation-api', version: '2.0.1.Final'
-  api group: 'org.hibernate', name: 'hibernate-validator', version: '7.0.4.Final'
-  api group: 'com.fasterxml.jackson.core', name: 'jackson-annotations', version: '2.13.2'
+  api group: 'org.hibernate', name: 'hibernate-validator', version: '7.0.5.Final'
+  api group: 'com.fasterxml.jackson.core', name: 'jackson-annotations', version: '2.11.1'
 
   api group: 'org.apache.commons', name: 'commons-lang3', version: '3.12.0'
   api group: 'org.apache.commons', name: 'commons-text', version: '1.10.0'

cerberus-web/build.gradle

@@ -44,7 +44,7 @@ dependencies {
   // DB: Mybatis, Flyway, C3p0
   implementation 'org.mybatis.spring.boot:mybatis-spring-boot-starter:2.2.2'
   implementation 'org.mybatis:mybatis-spring:2.0.7'
-  implementation 'org.mybatis:mybatis:3.5.10'
+  implementation 'org.mybatis:mybatis:3.5.11'
   implementation 'com.mchange:c3p0:0.9.5.5'
   implementation 'mysql:mysql-connector-java:8.0.31'
   implementation 'org.flywaydb:flyway-core:5.2.4' // Can't upgrade this past this version until Aurora is upgraded to 5.7
@@ -66,7 +66,7 @@ dependencies {
   implementation "com.amazonaws:aws-java-sdk-sts:${versions.awsSdkVersion}"
   implementation "com.amazonaws:aws-java-sdk-s3:${versions.awsSdkVersion}"
   implementation "com.amazonaws:aws-java-sdk-secretsmanager:${versions.awsSdkVersion}"
-  implementation 'com.amazonaws:aws-encryption-sdk-java:1.9.1'
+  implementation 'com.amazonaws:aws-encryption-sdk-java:2.4.0'
 
 
   // JWT

cerberus-web/src/main/java/com/nike/cerberus/config/ApplicationConfiguration.java

@@ -19,6 +19,7 @@
 import static com.nike.cerberus.service.EncryptionService.initializeKeyProvider;
 
 import com.amazonaws.encryptionsdk.AwsCrypto;
+import com.amazonaws.encryptionsdk.CommitmentPolicy;
 import com.amazonaws.encryptionsdk.CryptoMaterialsManager;
 import com.amazonaws.encryptionsdk.DefaultCryptoMaterialsManager;
 import com.amazonaws.encryptionsdk.MasterKeyProvider;
@@ -242,7 +243,9 @@ public CryptoMaterialsManager decryptCryptoMaterialsManager(
 
   @Bean
   public AwsCrypto awsCrypto() {
-    return new AwsCrypto();
+    return AwsCrypto.builder()
+        .withCommitmentPolicy(CommitmentPolicy.ForbidEncryptAllowDecrypt)
+        .build();
   }
 
   /** TODO, we can probably delete this, but the API tests from Highlander check for this. */

cerberus-web/src/main/java/com/nike/cerberus/service/EncryptionService.java

@@ -16,14 +16,19 @@
 
 package com.nike.cerberus.service;
 
-import com.amazonaws.encryptionsdk.*;
+import com.amazonaws.encryptionsdk.AwsCrypto;
+import com.amazonaws.encryptionsdk.CryptoMaterialsManager;
+import com.amazonaws.encryptionsdk.DefaultCryptoMaterialsManager;
+import com.amazonaws.encryptionsdk.MasterKeyProvider;
+import com.amazonaws.encryptionsdk.ParsedCiphertext;
 import com.amazonaws.encryptionsdk.kms.KmsMasterKey;
 import com.amazonaws.encryptionsdk.kms.KmsMasterKeyProvider;
 import com.amazonaws.encryptionsdk.multi.MultipleProviderFactory;
 import com.amazonaws.regions.Region;
 import com.google.common.collect.Lists;
 import com.nike.cerberus.util.CiphertextUtils;
 import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -260,10 +265,9 @@ public static List<String> splitArns(String cmkArns) {
    */
   public static MasterKeyProvider<KmsMasterKey> initializeKeyProvider(
       List<String> cmkArns, Region currentRegion) {
-    List<MasterKeyProvider<KmsMasterKey>> providers =
-        getSortedArnListByCurrentRegion(cmkArns, currentRegion).stream()
-            .map(KmsMasterKeyProvider::new)
-            .collect(Collectors.toList());
+    List<MasterKeyProvider<KmsMasterKey>> providers = new ArrayList();
+    List<String> arnList = getSortedArnListByCurrentRegion(cmkArns, currentRegion);
+    providers.add(KmsMasterKeyProvider.builder().buildStrict(arnList));
     return (MasterKeyProvider<KmsMasterKey>) MultipleProviderFactory.buildMultiProvider(providers);
   }
 

cerberus-web/src/test/java/com/nike/cerberus/config/ApplicationConfigurationTest.java

@@ -0,0 +1,15 @@
+package com.nike.cerberus.config;
+
+import com.amazonaws.encryptionsdk.AwsCrypto;
+import org.junit.Assert;
+import org.junit.Test;
+
+public class ApplicationConfigurationTest {
+  /** Test of awsCrypto to placate a code coverage tool */
+  @Test
+  public void testAwsCryptoBuilder() {
+    ApplicationConfiguration appConfig = new ApplicationConfiguration();
+    AwsCrypto awsCrypto = appConfig.awsCrypto();
+    Assert.assertNotNull(awsCrypto);
+  }
+}