From 66c7a7d8a95ed6dc7a751da0799cd0f9c812be3d Mon Sep 17 00:00:00 2001 From: Ian-Nara Date: Thu, 6 Nov 2025 11:08:44 -0700 Subject: [PATCH 1/7] fix 301 redirect on https --- .../uid2/operator/store/CloudSyncOptOutStore.java | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/uid2/operator/store/CloudSyncOptOutStore.java b/src/main/java/com/uid2/operator/store/CloudSyncOptOutStore.java index dd5a7fe9f..68b7d69e4 100644 --- a/src/main/java/com/uid2/operator/store/CloudSyncOptOutStore.java +++ b/src/main/java/com/uid2/operator/store/CloudSyncOptOutStore.java @@ -53,6 +53,7 @@ public class CloudSyncOptOutStore implements IOptOutStore { private final String remoteApiHost; private final String remoteApiPath; private final String remoteApiBearerToken; + private final boolean remoteApiSsl; public CloudSyncOptOutStore(Vertx vertx, ICloudStorage fsLocal, JsonObject jsonConfig, String operatorKey, Clock clock) throws MalformedURLException { this.fsLocal = fsLocal; @@ -61,7 +62,9 @@ public CloudSyncOptOutStore(Vertx vertx, ICloudStorage fsLocal, JsonObject jsonC String remoteApi = jsonConfig.getString(Const.Config.OptOutApiUriProp); if (remoteApi != null) { URL url = new URL(remoteApi); - this.remoteApiPort = -1 == url.getPort() ? 80 : url.getPort(); + boolean isHttps = "https".equalsIgnoreCase(url.getProtocol()); + this.remoteApiSsl = isHttps; + this.remoteApiPort = -1 == url.getPort() ? (isHttps ? 443 : 80) : url.getPort(); this.remoteApiHost = url.getHost(); this.remoteApiPath = url.getPath(); this.remoteApiBearerToken = "Bearer " + operatorKey; @@ -70,6 +73,7 @@ public CloudSyncOptOutStore(Vertx vertx, ICloudStorage fsLocal, JsonObject jsonC this.remoteApiHost = null; this.remoteApiPath = null; this.remoteApiBearerToken = null; + this.remoteApiSsl = false; } this.snapshot.set(new OptOutStoreSnapshot(fsLocal, jsonConfig, clock)); @@ -101,13 +105,17 @@ public void addEntry(UserIdentity firstLevelHashIdentity, return; } - HttpRequest request = this.webClient.post(remoteApiPort, remoteApiHost, remoteApiPath). - addQueryParam("identity_hash", EncodingUtils.toBase64String(firstLevelHashIdentity.id)) + HttpRequest request = this.webClient.post(remoteApiPort, remoteApiHost, remoteApiPath) + .addQueryParam("identity_hash", EncodingUtils.toBase64String(firstLevelHashIdentity.id)) .addQueryParam("advertising_id", EncodingUtils.toBase64String(advertisingId)) .putHeader("Authorization", remoteApiBearerToken) .putHeader(Audit.UID_INSTANCE_ID_HEADER, uidInstanceId) .as(BodyCodec.string()); + if (remoteApiSsl) { + request = request.ssl(true); + } + JsonObject payload = new JsonObject(); if (email != null) payload.put("email", email); if (phone != null) payload.put("phone", phone); From 85edc6b4a2910e65500efdc9f6d95b6a8a31ad49 Mon Sep 17 00:00:00 2001 From: Release Workflow Date: Thu, 6 Nov 2025 18:14:46 +0000 Subject: [PATCH 2/7] [CI Pipeline] Released Snapshot version: 5.60.31-alpha-258-SNAPSHOT --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 854d85944..7e985244f 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.uid2 uid2-operator - 5.60.30 + 5.60.31-alpha-258-SNAPSHOT UTF-8 From aa54b92ccde5373e7ed40a26a9d09f964cb63134 Mon Sep 17 00:00:00 2001 From: Ian Nara <135270994+Ian-Nara@users.noreply.github.com> Date: Thu, 6 Nov 2025 11:23:10 -0700 Subject: [PATCH 3/7] Update pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7e985244f..854d85944 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.uid2 uid2-operator - 5.60.31-alpha-258-SNAPSHOT + 5.60.30 UTF-8 From 07a7919db0fb790156d95a134afd25850509fdb4 Mon Sep 17 00:00:00 2001 From: Ian-Nara Date: Thu, 6 Nov 2025 12:05:56 -0700 Subject: [PATCH 4/7] refactor --- src/main/java/com/uid2/operator/store/CloudSyncOptOutStore.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/uid2/operator/store/CloudSyncOptOutStore.java b/src/main/java/com/uid2/operator/store/CloudSyncOptOutStore.java index 68b7d69e4..3da6531be 100644 --- a/src/main/java/com/uid2/operator/store/CloudSyncOptOutStore.java +++ b/src/main/java/com/uid2/operator/store/CloudSyncOptOutStore.java @@ -64,7 +64,7 @@ public CloudSyncOptOutStore(Vertx vertx, ICloudStorage fsLocal, JsonObject jsonC URL url = new URL(remoteApi); boolean isHttps = "https".equalsIgnoreCase(url.getProtocol()); this.remoteApiSsl = isHttps; - this.remoteApiPort = -1 == url.getPort() ? (isHttps ? 443 : 80) : url.getPort(); + this.remoteApiPort = url.getPort() != -1 ? url.getPort() : url.getDefaultPort(); this.remoteApiHost = url.getHost(); this.remoteApiPath = url.getPath(); this.remoteApiBearerToken = "Bearer " + operatorKey; From 58abc6d2c93747604415784ef1e08f7a340fba9e Mon Sep 17 00:00:00 2001 From: Ian-Nara Date: Thu, 6 Nov 2025 12:07:01 -0700 Subject: [PATCH 5/7] revert accidental commit --- .vscode/settings.json | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 .vscode/settings.json diff --git a/.vscode/settings.json b/.vscode/settings.json deleted file mode 100644 index c5f3f6b9c..000000000 --- a/.vscode/settings.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "java.configuration.updateBuildConfiguration": "interactive" -} \ No newline at end of file From ca67960d38d46d3cf14788fcebf53c4836fc1964 Mon Sep 17 00:00:00 2001 From: Ian-Nara Date: Thu, 6 Nov 2025 12:07:57 -0700 Subject: [PATCH 6/7] revert accidental commit --- conf/local-config.json | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/conf/local-config.json b/conf/local-config.json index d48c588f9..0d8720483 100644 --- a/conf/local-config.json +++ b/conf/local-config.json @@ -17,7 +17,7 @@ "refresh_token_v3": false, "identity_v3": false, "identity_scope": "uid2", - "enable_v2_encryption": true, + "enable_v2_encryption": false, "sharing_token_expiry_seconds": 2592000, "cloud_download_threads": 8, "cloud_upload_threads": 2, @@ -43,7 +43,5 @@ "encrypted_files": false, "disable_optout_token": true, "enable_remote_config": true, - "uid_instance_id_prefix": "local-operator", - "optout_api_uri": "http://localhost:8081/optout/replicate", - "core_api_token": "trusted-partner-key" + "uid_instance_id_prefix": "local-operator" } From 1635d2ade1521321a7453a6c3ff162c850b3ae99 Mon Sep 17 00:00:00 2001 From: Release Workflow Date: Thu, 6 Nov 2025 19:11:57 +0000 Subject: [PATCH 7/7] [CI Pipeline] Released Snapshot version: 5.60.31-alpha-259-SNAPSHOT --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 854d85944..ad5beb659 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.uid2 uid2-operator - 5.60.30 + 5.60.31-alpha-259-SNAPSHOT UTF-8