Merging up to main

cody-constine-ttd · cody-constine-ttd · commit 2cc26279b3f2 · 2024-11-20T16:23:09.000-07:00
diff --git a/.github/workflows/build-and-test.yaml b/.github/workflows/build-and-test.yaml
@@ -3,7 +3,7 @@ on: [pull_request, push, workflow_dispatch]
 
 jobs:
   build:
-    uses: IABTechLab/uid2-shared-actions/.github/workflows/shared-build-and-test.yaml@v2
+    uses: IABTechLab/uid2-shared-actions/.github/workflows/shared-build-and-test.yaml@v3
     with:
       java_version: "21"
     secrets: inherit
diff --git a/.github/workflows/check-stable-dependency.yaml b/.github/workflows/check-stable-dependency.yaml
@@ -3,5 +3,5 @@ on: [pull_request, workflow_dispatch]
 
 jobs:
   check_dependency:
-    uses: IABTechLab/uid2-shared-actions/.github/workflows/shared-check-stable-dependency.yaml@v2
+    uses: IABTechLab/uid2-shared-actions/.github/workflows/shared-check-stable-dependency.yaml@v3
     secrets: inherit
diff --git a/.github/workflows/validate-image.yaml b/.github/workflows/validate-image.yaml
@@ -19,7 +19,7 @@ on:
 
 jobs:
   build-publish-docker-default:
-    uses: IABTechLab/uid2-shared-actions/.github/workflows/shared-validate-image.yaml@v2
+    uses: IABTechLab/uid2-shared-actions/.github/workflows/shared-validate-image.yaml@v3
     with: 
       failure_severity: ${{ inputs.failure_severity || 'CRITICAL,HIGH' }}
       fail_on_error: ${{ inputs.fail_on_error || true }}
diff --git a/.trivyignore b/.trivyignore
@@ -2,4 +2,9 @@
 # See https://aquasecurity.github.io/trivy/v0.35/docs/vulnerability/examples/filter/ 
 # for more details
 # e.g. 
-# CVE-2022-3996
+
+# https://thetradedesk.atlassian.net/browse/UID2-4460
+CVE-2024-47535
+
+# https://thetradedesk.atlassian.net/browse/UID2-4461
+CVE-2024-7254
diff --git a/conf/default-config.json b/conf/default-config.json
@@ -17,6 +17,6 @@
     "att_token_enc_key": null,
     "att_token_enc_salt": null,
     "enforceJwt": false,
-    "s3_keys_metadata_path": null,
+    "cloud_encryption_keys_metadata_path": null,
     "encryption_support_version": "5"
 }
diff --git a/conf/integ-config.json b/conf/integ-config.json
@@ -18,6 +18,6 @@
     "keyset_keys_metadata_path": "uid2/keyset_keys/metadata.json",
     "salts_metadata_path": "uid2/salts/metadata.json",
     "enforceJwt": false,
-    "s3_keys_metadata_path": "uid2/s3encryption_keys/metadata.json",
+    "cloud_encryption_keys_metadata_path": "uid2/cloud_encryption_keys/metadata.json",
     "encryption_support_version": "5"
 }
diff --git a/conf/local-config.json b/conf/local-config.json
@@ -19,6 +19,6 @@
     "att_token_enc_salt": "<salt-for-attestation-token>",
     "provide_private_site_data": true,
     "enforceJwt": false,
-    "s3_keys_metadata_path": "/com.uid2.core/test/s3encryption_keys/metadata.json",
+    "cloud_encryption_keys_metadata_path": "/com.uid2.core/test/cloud_encryption_keys/metadata.json",
     "encryption_support_version": "5"
 }
diff --git a/conf/local-e2e-config.json b/conf/local-e2e-config.json
@@ -34,5 +34,6 @@
     "core_public_url": "http://localhost:8088",
     "optout_url": "http://localhost:8081",
     "s3_keys_metadata_path": "s3encryption_keys/metadata.json",
+    "cloud_keys_metadata_path": "cloud_encryption_keys/metadata.json",
     "encryption_support_version": "5"
 }
diff --git a/conf/local-e2e-docker-config.json b/conf/local-e2e-docker-config.json
@@ -32,6 +32,6 @@
   "aws_kms_jwt_signing_public_keys": "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmvwB41qI5Fe41PDbXqcX5uOvSvfKh8l9QV0O3M+NsB4lKqQEP0t1hfoiXTpOgKz1ArYxHsQ2LeXifX4uwEbYJFlpVM+tyQkTWQjBOw6fsLYK2Xk4X2ylNXUUf7x3SDiOVxyvTh3OZW9kqrDBN9JxSoraNLyfw0hhW0SHpfs699SehgbQ7QWep/gVlKRLIz0XAXaZNw24s79ORcQlrCE6YD0PgQmpI/dK5xMML82n6y3qcTlywlGaU7OGIMdD+CTXA3BcOkgXeqZTXNaX1u6jCTa1lvAczun6avp5VZ4TFiuPo+y4rJ3GU+14cyT5NckEcaTKSvd86UdwK5Id9tl3bQIDAQAB",
   "core_public_url": "http://core:8088",
   "optout_url": "http://optout:8081",
-  "s3_keys_metadata_path": "s3encryption_keys/metadata.json",
+  "cloud_encryption_keys_metadata_path": "cloud_encryption_keys/metadata.json",
   "encryption_support_version": "5"
 }
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.uid2</groupId>
     <artifactId>uid2-core</artifactId>
-    <version>2.20.8</version>
+    <version>2.21.0</version>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -24,9 +24,9 @@
         <vertx.verticle>com.uid2.core.vertx.CoreVerticle</vertx.verticle>
         <launcher.class>io.vertx.core.Launcher</launcher.class>
 
-    <uid2-shared.version>7.21.8-alpha-159-SNAPSHOT</uid2-shared.version>
-    <image.version>${project.version}</image.version>
-  </properties>
+        <uid2-shared.version>8.0.0</uid2-shared.version>
+        <image.version>${project.version}</image.version>
+    </properties>
 
     <repositories>
         <repository>
@@ -97,11 +97,6 @@
             <artifactId>vertx-web-client</artifactId>
             <version>${vertx.version}</version>
         </dependency>
-        <dependency>
-            <groupId>com.google.auth</groupId>
-            <artifactId>google-auth-library-oauth2-http</artifactId>
-            <version>1.23.0</version>
-        </dependency>
         <dependency>
             <groupId>io.vertx</groupId>
             <artifactId>vertx-micrometer-metrics</artifactId>
diff --git a/src/test/java/com/uid2/core/vertx/TestCoreVerticle.java b/src/test/java/com/uid2/core/vertx/TestCoreVerticle.java
@@ -638,7 +638,7 @@ void wrongMethodForEndpoint(Vertx vertx, VertxTestContext testContext) {
     }
 
     @Test
-    void wrongMethodForEndpointS3(Vertx vertx, VertxTestContext testContext) {
+    void wrongMethodForEndpointCloudEncryption(Vertx vertx, VertxTestContext testContext) {
         post(vertx, "/cloud_encryption_keys/retrieve", makeAttestationRequestJson(null, null), ar -> {
             try {
                 HttpResponse response = ar.result();
@@ -675,10 +675,10 @@ void cloudEncryptionKeyRetrieveSuccess(Vertx vertx, VertxTestContext testContext
                     JsonObject json = response.bodyAsJsonObject();
                     JsonArray cloudEncryptionKeysArray = json.getJsonArray("cloudEncryptionKeys");
 
-                    assertNotNull( cloudEncryptionKeysArray);
-                    assertEquals(1,  cloudEncryptionKeysArray.size());
+                    assertNotNull(cloudEncryptionKeysArray);
+                    assertEquals(1, cloudEncryptionKeysArray.size());
 
-                    JsonObject cloudEncryptionKeyJson =  cloudEncryptionKeysArray.getJsonObject(0);
+                    JsonObject cloudEncryptionKeyJson = cloudEncryptionKeysArray.getJsonObject(0);
                     assertEquals(1, cloudEncryptionKeyJson.getInteger("id"));
                     assertEquals(88, cloudEncryptionKeyJson.getInteger("siteId"));
                     assertEquals(1687635529, cloudEncryptionKeyJson.getLong("activates"));
@@ -698,7 +698,7 @@ void cloudEncryptionKeyRetrieveSuccess(Vertx vertx, VertxTestContext testContext
 
     @Tag("dontForceJwt")
     @Test
-    void cloudEncryptionencryptionKeyRetrieveSuccessWithThreeKeys(Vertx vertx, VertxTestContext testContext) {
+    void cloudEncryptionKeyRetrieveSuccessWithThreeKeys(Vertx vertx, VertxTestContext testContext) {
         fakeAuth(attestationProtocolPublic, Role.OPERATOR);
         addAttestationProvider(attestationProtocolPublic);
         onHandleAttestationRequest(() -> {
diff --git a/version.json b/version.json
@@ -1 +1 @@
-{ "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json", "version": "2.20", "publicReleaseRefSpec": [ "^refs/heads/master$", "^refs/heads/v\\d+(?:\\.\\d+)?$" ], "cloudBuild": { "setVersionVariables": true, "buildNumber": { "enabled": true, "includeCommitId": { "when": "always" } } } }
+{ "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json", "version": "2.21", "publicReleaseRefSpec": [ "^refs/heads/master$", "^refs/heads/v\\d+(?:\\.\\d+)?$" ], "cloudBuild": { "setVersionVariables": true, "buildNumber": { "enabled": true, "includeCommitId": { "when": "always" } } } }

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,6 @@`
`17`	`17`	`"att_token_enc_key": null,`
`18`	`18`	`"att_token_enc_salt": null,`
`19`	`19`	`"enforceJwt": false,`
`20`		`- "s3_keys_metadata_path": null,`
	`20`	`+ "cloud_encryption_keys_metadata_path": null,`
`21`	`21`	`"encryption_support_version": "5"`
`22`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,6 @@`
`18`	`18`	`"keyset_keys_metadata_path": "uid2/keyset_keys/metadata.json",`
`19`	`19`	`"salts_metadata_path": "uid2/salts/metadata.json",`
`20`	`20`	`"enforceJwt": false,`
`21`		`- "s3_keys_metadata_path": "uid2/s3encryption_keys/metadata.json",`
	`21`	`+ "cloud_encryption_keys_metadata_path": "uid2/cloud_encryption_keys/metadata.json",`
`22`	`22`	`"encryption_support_version": "5"`
`23`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,6 @@`
`19`	`19`	`"att_token_enc_salt": "<salt-for-attestation-token>",`
`20`	`20`	`"provide_private_site_data": true,`
`21`	`21`	`"enforceJwt": false,`
`22`		`- "s3_keys_metadata_path": "/com.uid2.core/test/s3encryption_keys/metadata.json",`
	`22`	`+ "cloud_encryption_keys_metadata_path": "/com.uid2.core/test/cloud_encryption_keys/metadata.json",`
`23`	`23`	`"encryption_support_version": "5"`
`24`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,5 +34,6 @@`
`34`	`34`	`"core_public_url": "http://localhost:8088",`
`35`	`35`	`"optout_url": "http://localhost:8081",`
`36`	`36`	`"s3_keys_metadata_path": "s3encryption_keys/metadata.json",`
	`37`	`+ "cloud_keys_metadata_path": "cloud_encryption_keys/metadata.json",`
`37`	`38`	`"encryption_support_version": "5"`
`38`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,6 @@`
`32`	`32`	`"aws_kms_jwt_signing_public_keys": "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmvwB41qI5Fe41PDbXqcX5uOvSvfKh8l9QV0O3M+NsB4lKqQEP0t1hfoiXTpOgKz1ArYxHsQ2LeXifX4uwEbYJFlpVM+tyQkTWQjBOw6fsLYK2Xk4X2ylNXUUf7x3SDiOVxyvTh3OZW9kqrDBN9JxSoraNLyfw0hhW0SHpfs699SehgbQ7QWep/gVlKRLIz0XAXaZNw24s79ORcQlrCE6YD0PgQmpI/dK5xMML82n6y3qcTlywlGaU7OGIMdD+CTXA3BcOkgXeqZTXNaX1u6jCTa1lvAczun6avp5VZ4TFiuPo+y4rJ3GU+14cyT5NckEcaTKSvd86UdwK5Id9tl3bQIDAQAB",`
`33`	`33`	`"core_public_url": "http://core:8088",`
`34`	`34`	`"optout_url": "http://optout:8081",`
`35`		`- "s3_keys_metadata_path": "s3encryption_keys/metadata.json",`
	`35`	`+ "cloud_encryption_keys_metadata_path": "cloud_encryption_keys/metadata.json",`
`36`	`36`	`"encryption_support_version": "5"`
`37`	`37`	`}`