From 6cf938d09488f2fcf17c819e651cdbb85b2c10da Mon Sep 17 00:00:00 2001 From: abuabraham-ttd Date: Tue, 11 Feb 2025 15:42:23 -0800 Subject: [PATCH 01/81] Change URL update to entire URL --- scripts/aws/entrypoint.sh | 10 ++++------ scripts/azure-cc/azureEntryPoint.py | 14 +++++--------- scripts/gcp-oidc/gcp.py | 6 ++---- 3 files changed, 11 insertions(+), 19 deletions(-) diff --git a/scripts/aws/entrypoint.sh b/scripts/aws/entrypoint.sh index 5f324ce20..15138b60f 100755 --- a/scripts/aws/entrypoint.sh +++ b/scripts/aws/entrypoint.sh @@ -46,9 +46,7 @@ build_parameterized_config() { build_operator_config() { CORE_BASE_URL=$(jq -r ".core_base_url" < "${PARAMETERIZED_CONFIG}") - CORE_BASE_URL=$(echo "$CORE_BASE_URL" | sed -E 's#^(https?://)?([^/]+).*#\2#') OPTOUT_BASE_URL=$(jq -r ".optout_base_url" < "${PARAMETERIZED_CONFIG}") - OPTOUT_BASE_URL=$(echo "$OPTOUT_BASE_URL" | sed -E 's#^(https?://)?([^/]+).*#\2#') DEPLOYMENT_ENVIRONMENT=$(jq -r ".environment" < "${PARAMETERIZED_CONFIG}") DEBUG_MODE=$(jq -r ".debug_mode" < "${PARAMETERIZED_CONFIG}") @@ -69,11 +67,11 @@ build_operator_config() { if [[ "$DEPLOYMENT_ENVIRONMENT" != "prod" ]]; then #Allow override of base URL in non-prod environments - CORE_PATTERN="core.*uidapi.com" - OPTOUT_PATTERN="optout.*uidapi.com" + CORE_PATTERN="https://core.*uidapi.com" + OPTOUT_PATTERN="https://optout.*uidapi.com" if [[ "$DEPLOYMENT_ENVIRONMENT" == "euid" ]]; then - CORE_PATTERN="core.*euid.eu" - OPTOUT_PATTERN="optout.*euid.eu" + CORE_PATTERN="https://core.*euid.eu" + OPTOUT_PATTERN="https://optout.*euid.eu" fi sed -i "s#${CORE_PATTERN}#${CORE_BASE_URL}#g" "${OPERATOR_CONFIG}" sed -i "s#${OPTOUT_PATTERN}#${OPTOUT_BASE_URL}#g" "${OPERATOR_CONFIG}" diff --git a/scripts/azure-cc/azureEntryPoint.py b/scripts/azure-cc/azureEntryPoint.py index 25348e9fd..8da91a66c 100644 --- a/scripts/azure-cc/azureEntryPoint.py +++ b/scripts/azure-cc/azureEntryPoint.py @@ -8,7 +8,6 @@ import shutil import requests import logging -from urllib.parse import urlparse from confidential_compute import ConfidentialCompute, ConfigurationMissingError, OperatorKeyPermissionError, OperatorKeyNotFoundError, ConfidentialComputeStartupError from azure.keyvault.secrets import SecretClient from azure.identity import DefaultAzureCredential, CredentialUnavailableError @@ -50,17 +49,14 @@ def __create_final_config(self): except IOError as e: logging.error(f"Failed to create {AzureEntryPoint.FINAL_CONFIG} with error: {e}") sys.exit(1) - - CORE_BASE_URL = os.getenv("CORE_BASE_URL") - OPTOUT_BASE_URL = os.getenv("OPTOUT_BASE_URL") - if CORE_BASE_URL and OPTOUT_BASE_URL and AzureEntryPoint.env_name != 'prod': - logging.info(f"-- replacing URLs by {CORE_BASE_URL} and {OPTOUT_BASE_URL}") + if self.configs["core_base_url"] and self.configs["optout_base_url"] and AzureEntryPoint.env_name != 'prod': + logging.info(f"-- replacing URLs by {self.configs["core_base_url"]} and {self.configs["optout_base_url"]}") with open(AzureEntryPoint.FINAL_CONFIG, "r") as file: config = file.read() - config = config.replace("core-integ.uidapi.com", urlparse(CORE_BASE_URL).netloc) - config = config.replace("optout-integ.uidapi.com", urlparse(OPTOUT_BASE_URL).netloc) + config = config.replace("core-integ.uidapi.com", self.configs["core_base_url"]) + config = config.replace("optout-integ.uidapi.com", self.configs["optout_base_url"]) with open(AzureEntryPoint.FINAL_CONFIG, "w") as file: file.write(config) @@ -150,8 +146,8 @@ def _validate_auxiliaries(self): def run_compute(self) -> None: """Main execution flow for confidential compute.""" self.__check_env_variables() - self.__create_final_config() self._set_confidential_config() + self.__create_final_config() if not self.configs.get("skip_validations"): self.validate_configuration() self._setup_auxiliaries() diff --git a/scripts/gcp-oidc/gcp.py b/scripts/gcp-oidc/gcp.py index c2704c7ed..386320042 100644 --- a/scripts/gcp-oidc/gcp.py +++ b/scripts/gcp-oidc/gcp.py @@ -6,10 +6,8 @@ import sys import logging from google.cloud import secretmanager -from google.auth import default from google.auth.exceptions import DefaultCredentialsError from google.api_core.exceptions import PermissionDenied, NotFound -from urllib.parse import urlparse sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) from confidential_compute import ConfidentialCompute, ConfidentialComputeConfig, ConfigurationMissingError, OperatorKeyNotFoundError, OperatorKeyPermissionError, ConfidentialComputeStartupError @@ -50,8 +48,8 @@ def __populate_operator_config(self, destination): shutil.copy(target_config, destination) with open(destination, 'r') as file: config = file.read() - config = config.replace("core.uidapi.com", urlparse(self.configs.get("core_base_url")).netloc) - config = config.replace("optout.uidapi.com", urlparse(self.configs.get("optout_base_url")).netloc) + config = config.replace("core.uidapi.com", self.configs.get("core_base_url")) + config = config.replace("optout.uidapi.com", self.configs.get("optout_base_url")) with open(destination, 'w') as file: file.write(config) From c4d7703dea54ec727286a0dacc1ac418d55225a6 Mon Sep 17 00:00:00 2001 From: Release Workflow Date: Tue, 11 Feb 2025 23:43:51 +0000 Subject: [PATCH 02/81] [CI Pipeline] Released Snapshot version: 5.47.21-alpha-190-SNAPSHOT --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c190deb9b..ca4247754 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.uid2 uid2-operator - 5.47.20 + 5.47.21-alpha-190-SNAPSHOT UTF-8 From 27bab3096d12f40d9f4993b8b43192ca19198bad Mon Sep 17 00:00:00 2001 From: Release Workflow Date: Wed, 12 Feb 2025 19:25:11 +0000 Subject: [PATCH 03/81] [CI Pipeline] Released Snapshot version: 5.47.22-alpha-191-SNAPSHOT --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ca4247754..6e7beceb8 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.uid2 uid2-operator - 5.47.21-alpha-190-SNAPSHOT + 5.47.22-alpha-191-SNAPSHOT UTF-8 From 74a72462dda7b6482a4a8e8f4c2b6877d8ed3fee Mon Sep 17 00:00:00 2001 From: abuabraham-ttd Date: Wed, 12 Feb 2025 12:27:27 -0800 Subject: [PATCH 04/81] Add a print --- scripts/gcp-oidc/gcp.py | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/gcp-oidc/gcp.py b/scripts/gcp-oidc/gcp.py index 386320042..f14cdffa1 100644 --- a/scripts/gcp-oidc/gcp.py +++ b/scripts/gcp-oidc/gcp.py @@ -50,6 +50,7 @@ def __populate_operator_config(self, destination): config = file.read() config = config.replace("core.uidapi.com", self.configs.get("core_base_url")) config = config.replace("optout.uidapi.com", self.configs.get("optout_base_url")) + print("Final config used", config) with open(destination, 'w') as file: file.write(config) From e3b1a7944aae8af420bb8749d5b22edd6455bbaf Mon Sep 17 00:00:00 2001 From: Release Workflow Date: Wed, 12 Feb 2025 20:28:34 +0000 Subject: [PATCH 05/81] [CI Pipeline] Released Snapshot version: 5.47.23-alpha-192-SNAPSHOT --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6e7beceb8..21945a045 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.uid2 uid2-operator - 5.47.22-alpha-191-SNAPSHOT + 5.47.23-alpha-192-SNAPSHOT UTF-8 From 5cdaf2a7a51161f3644a5562cf53eff292e92dcf Mon Sep 17 00:00:00 2001 From: abuabraham-ttd Date: Wed, 12 Feb 2025 14:25:43 -0800 Subject: [PATCH 06/81] Fix sed --- scripts/azure-cc/azureEntryPoint.py | 4 ++-- scripts/gcp-oidc/gcp.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/azure-cc/azureEntryPoint.py b/scripts/azure-cc/azureEntryPoint.py index 8da91a66c..d5b10b06f 100644 --- a/scripts/azure-cc/azureEntryPoint.py +++ b/scripts/azure-cc/azureEntryPoint.py @@ -55,8 +55,8 @@ def __create_final_config(self): with open(AzureEntryPoint.FINAL_CONFIG, "r") as file: config = file.read() - config = config.replace("core-integ.uidapi.com", self.configs["core_base_url"]) - config = config.replace("optout-integ.uidapi.com", self.configs["optout_base_url"]) + config = config.replace("https://core-integ.uidapi.com", self.configs["core_base_url"]) + config = config.replace("https://optout-integ.uidapi.com", self.configs["optout_base_url"]) with open(AzureEntryPoint.FINAL_CONFIG, "w") as file: file.write(config) diff --git a/scripts/gcp-oidc/gcp.py b/scripts/gcp-oidc/gcp.py index f14cdffa1..7d65afc71 100644 --- a/scripts/gcp-oidc/gcp.py +++ b/scripts/gcp-oidc/gcp.py @@ -48,8 +48,8 @@ def __populate_operator_config(self, destination): shutil.copy(target_config, destination) with open(destination, 'r') as file: config = file.read() - config = config.replace("core.uidapi.com", self.configs.get("core_base_url")) - config = config.replace("optout.uidapi.com", self.configs.get("optout_base_url")) + config = config.replace("https://core.uidapi.com", self.configs.get("core_base_url")) + config = config.replace("https://optout.uidapi.com", self.configs.get("optout_base_url")) print("Final config used", config) with open(destination, 'w') as file: file.write(config) From bfb84e43d50eae05fe071a152c062fc8d08b54c6 Mon Sep 17 00:00:00 2001 From: Release Workflow Date: Wed, 12 Feb 2025 22:27:14 +0000 Subject: [PATCH 07/81] [CI Pipeline] Released Snapshot version: 5.47.24-alpha-201-SNAPSHOT --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 21945a045..b5701b8b3 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.uid2 uid2-operator - 5.47.23-alpha-192-SNAPSHOT + 5.47.24-alpha-201-SNAPSHOT UTF-8 From 5c5d232d76736a51e9072d342f192fcbceed872a Mon Sep 17 00:00:00 2001 From: abuabraham-ttd <130511456+abuabraham-ttd@users.noreply.github.com> Date: Fri, 14 Feb 2025 12:19:20 -0800 Subject: [PATCH 08/81] Update pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b5701b8b3..07b0196c4 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ 2.1.0 2.1.0 2.1.0 - 8.0.32 + 8.1.10 ${project.version} 21 21 From 3aea827031c3dde52d3a967ccccd7c042a9aa19e Mon Sep 17 00:00:00 2001 From: Release Workflow Date: Fri, 14 Feb 2025 20:20:19 +0000 Subject: [PATCH 09/81] [CI Pipeline] Released Snapshot version: 5.47.25-alpha-202-SNAPSHOT --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 07b0196c4..72ec92497 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.uid2 uid2-operator - 5.47.24-alpha-201-SNAPSHOT + 5.47.25-alpha-202-SNAPSHOT UTF-8 From 95f07a0005c615f3284434dfbc4f0f1edb474b68 Mon Sep 17 00:00:00 2001 From: Release Workflow Date: Fri, 14 Feb 2025 22:26:17 +0000 Subject: [PATCH 10/81] [CI Pipeline] Released Snapshot version: 5.47.26-alpha-150-SNAPSHOT --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 72ec92497..6b65c35bd 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.uid2 uid2-operator - 5.47.25-alpha-202-SNAPSHOT + 5.47.26-alpha-150-SNAPSHOT UTF-8 From a5a4f3ecf4031f5046f8c4b2f461322a50426379 Mon Sep 17 00:00:00 2001 From: Release Workflow Date: Sat, 15 Feb 2025 01:26:55 +0000 Subject: [PATCH 11/81] [CI Pipeline] Released Snapshot version: 5.47.27-alpha-190-SNAPSHOT --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6b65c35bd..6893461cb 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.uid2 uid2-operator - 5.47.26-alpha-150-SNAPSHOT + 5.47.27-alpha-190-SNAPSHOT UTF-8 From 074bd917605ca7b127fc8976163df78091679c71 Mon Sep 17 00:00:00 2001 From: abuabraham-ttd <130511456+abuabraham-ttd@users.noreply.github.com> Date: Fri, 14 Feb 2025 17:27:27 -0800 Subject: [PATCH 12/81] Update gcp.py --- scripts/gcp-oidc/gcp.py | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/gcp-oidc/gcp.py b/scripts/gcp-oidc/gcp.py index 7d65afc71..ce91c9f32 100644 --- a/scripts/gcp-oidc/gcp.py +++ b/scripts/gcp-oidc/gcp.py @@ -50,7 +50,6 @@ def __populate_operator_config(self, destination): config = file.read() config = config.replace("https://core.uidapi.com", self.configs.get("core_base_url")) config = config.replace("https://optout.uidapi.com", self.configs.get("optout_base_url")) - print("Final config used", config) with open(destination, 'w') as file: file.write(config) From cb69438c0fcd836eec32eaa718a8179171115bb2 Mon Sep 17 00:00:00 2001 From: Release Workflow Date: Sat, 15 Feb 2025 01:49:17 +0000 Subject: [PATCH 13/81] [CI Pipeline] Released Snapshot version: 5.47.28-alpha-191-SNAPSHOT --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6893461cb..0aa5b537f 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.uid2 uid2-operator - 5.47.27-alpha-190-SNAPSHOT + 5.47.28-alpha-191-SNAPSHOT UTF-8 From 2b37d1277e793eb6dbfe43a0267302875cbbc197 Mon Sep 17 00:00:00 2001 From: Katherine Chen Date: Tue, 18 Feb 2025 11:04:01 +1100 Subject: [PATCH 14/81] Use custom branch --- .github/workflows/run-e2e-tests-on-operator.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run-e2e-tests-on-operator.yaml b/.github/workflows/run-e2e-tests-on-operator.yaml index e57756c1b..16beced41 100644 --- a/.github/workflows/run-e2e-tests-on-operator.yaml +++ b/.github/workflows/run-e2e-tests-on-operator.yaml @@ -106,7 +106,7 @@ on: jobs: e2e-test: name: E2E Test - uses: IABTechLab/uid2-shared-actions/.github/workflows/shared-run-e2e-tests.yaml@v3 + uses: IABTechLab/uid2-shared-actions/.github/workflows/shared-run-e2e-tests.yaml@kcc-fix-e2e with: operator_type: ${{ inputs.operator_type }} operator_image_version: ${{ inputs.operator_image_version }} From d2cc748419080f2851a991e69507c56743b2cb12 Mon Sep 17 00:00:00 2001 From: Release Workflow Date: Tue, 18 Feb 2025 00:05:22 +0000 Subject: [PATCH 15/81] [CI Pipeline] Released Snapshot version: 5.47.29-alpha-198-SNAPSHOT --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0aa5b537f..d3af2a438 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.uid2 uid2-operator - 5.47.28-alpha-191-SNAPSHOT + 5.47.29-alpha-198-SNAPSHOT UTF-8 From 170e0774e20647c09ed888193450ff5fe417829d Mon Sep 17 00:00:00 2001 From: Release Workflow Date: Tue, 18 Feb 2025 17:10:06 +0000 Subject: [PATCH 16/81] [CI Pipeline] Released Snapshot version: 5.47.30-alpha-208-SNAPSHOT --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d3af2a438..a86312890 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.uid2 uid2-operator - 5.47.29-alpha-198-SNAPSHOT + 5.47.30-alpha-208-SNAPSHOT UTF-8 From a1dc6a381f4f3fe82adf0f824450562f95ebfd5f Mon Sep 17 00:00:00 2001 From: abuabraham-ttd Date: Tue, 18 Feb 2025 09:23:42 -0800 Subject: [PATCH 17/81] Fix bug --- scripts/azure-cc/azureEntryPoint.py | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/scripts/azure-cc/azureEntryPoint.py b/scripts/azure-cc/azureEntryPoint.py index d5b10b06f..7df27f100 100644 --- a/scripts/azure-cc/azureEntryPoint.py +++ b/scripts/azure-cc/azureEntryPoint.py @@ -64,12 +64,6 @@ def __create_final_config(self): with open(AzureEntryPoint.FINAL_CONFIG, "r") as file: logging.info(file.read()) - def __set_base_urls(self): - with open(AzureEntryPoint.FINAL_CONFIG, "r") as file: - jdata = json.load(file) - self.configs["core_base_url"] = jdata["core_attest_url"] - self.configs["optout_base_url"] = jdata["optout_api_uri"] - def __set_operator_key(self): try: credential = DefaultAzureCredential() @@ -91,11 +85,9 @@ def _set_confidential_config(self, secret_identifier: str = None): self.configs["skip_validations"] = os.getenv("SKIP_VALIDATIONS", "false").lower() == "true" self.configs["debug_mode"] = os.getenv("DEBUG_MODE", "false").lower() == "true" self.configs["environment"] = AzureEntryPoint.env_name - - # set self.configs["operator_key"] + self.configs["core_base_url"] = os.getenv("CORE_BASE_URL") + self.configs["optout_base_url"] = os.getenv("OPTOUT_BASE_URL") self.__set_operator_key() - # set base urls from final config file - self.__set_base_urls() def __run_operator(self): From 3c0071423098e95eb2f5171b40af00bf5d684c5e Mon Sep 17 00:00:00 2001 From: Release Workflow Date: Tue, 18 Feb 2025 17:31:59 +0000 Subject: [PATCH 18/81] [CI Pipeline] Released Snapshot version: 5.47.31-alpha-209-SNAPSHOT --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a86312890..d3a6b47a3 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.uid2 uid2-operator - 5.47.30-alpha-208-SNAPSHOT + 5.47.31-alpha-209-SNAPSHOT UTF-8 From be0e848c6fecae8eca7bf307cafc33af8db8bdd3 Mon Sep 17 00:00:00 2001 From: Release Workflow Date: Tue, 18 Feb 2025 20:19:54 +0000 Subject: [PATCH 19/81] [CI Pipeline] Released Snapshot version: 5.47.32-alpha-151-SNAPSHOT --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d3a6b47a3..86d32316e 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.uid2 uid2-operator - 5.47.31-alpha-209-SNAPSHOT + 5.47.32-alpha-151-SNAPSHOT UTF-8 From 44993397b79a8cbc85a2cfdf96f1e4f73e9fd408 Mon Sep 17 00:00:00 2001 From: abuabraham-ttd Date: Tue, 18 Feb 2025 13:22:42 -0800 Subject: [PATCH 20/81] Fix feat-flag copy --- Makefile.eif | 5 ++++- scripts/aws/Dockerfile | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Makefile.eif b/Makefile.eif index 38e47c13c..875fa9e40 100644 --- a/Makefile.eif +++ b/Makefile.eif @@ -28,11 +28,14 @@ euidoperator.eif: build_artifacts build_configs build/proxies.nitro.yaml build/s .PHONY: build_configs -build_configs: build/conf/default-config.json build/conf/euid-integ-config.json build/conf/euid-prod-config.json build/conf/uid2-integ-config.json build/conf/uid2-prod-config.json build/conf/logback.xml build/conf/logback-debug.xml +build_configs: build/conf/default-config.json build/conf/feat-flag.json build/conf/euid-integ-config.json build/conf/euid-prod-config.json build/conf/uid2-integ-config.json build/conf/uid2-prod-config.json build/conf/logback.xml build/conf/logback-debug.xml build/conf/default-config.json: build_artifacts ./scripts/aws/conf/default-config.json cp ./scripts/aws/conf/default-config.json ./build/conf/ +build/conf/feat-flag.json: build_artifacts ./scripts/aws/conf/feat-flag.json + cp ./scripts/aws/conf/feat-flag/feat-flag.json ./build/conf/ + build/conf/euid-integ-config.json: build_artifacts ./scripts/aws/conf/euid-integ-config.json cp ./scripts/aws/conf/euid-integ-config.json ./build/conf/ diff --git a/scripts/aws/Dockerfile b/scripts/aws/Dockerfile index b0d6a10ff..88e1a2242 100644 --- a/scripts/aws/Dockerfile +++ b/scripts/aws/Dockerfile @@ -37,7 +37,7 @@ COPY ./conf/default-config.json /app/conf/ COPY ./conf/*.json /app/conf/ COPY ./conf/*.xml /app/conf/ COPY ./syslog-ng-client.conf /etc/syslog-ng/syslog-ng.conf -COPY ./conf/feat-flag/feat-flag.json /app/conf/feat-flag/ +COPY ./conf/feat-flag.json /app/conf/feat-flag/ RUN chmod +x /app/vsockpx && chmod +x /app/entrypoint.sh From e34cb7330c17614b3d6b245191fb4952f9bf944c Mon Sep 17 00:00:00 2001 From: Release Workflow Date: Tue, 18 Feb 2025 21:23:35 +0000 Subject: [PATCH 21/81] [CI Pipeline] Released Snapshot version: 5.47.33-alpha-157-SNAPSHOT --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 86d32316e..c41eec4c9 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.uid2 uid2-operator - 5.47.32-alpha-151-SNAPSHOT + 5.47.33-alpha-157-SNAPSHOT UTF-8 From 45c01d43de269bcf7d5ba8ccb525926dce71e5a0 Mon Sep 17 00:00:00 2001 From: abuabraham-ttd Date: Tue, 18 Feb 2025 14:37:15 -0800 Subject: [PATCH 22/81] fix --- Makefile.eif | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.eif b/Makefile.eif index 875fa9e40..2b65069f5 100644 --- a/Makefile.eif +++ b/Makefile.eif @@ -33,7 +33,7 @@ build_configs: build/conf/default-config.json build/conf/feat-flag.json build/co build/conf/default-config.json: build_artifacts ./scripts/aws/conf/default-config.json cp ./scripts/aws/conf/default-config.json ./build/conf/ -build/conf/feat-flag.json: build_artifacts ./scripts/aws/conf/feat-flag.json +build/conf/feat-flag.json: build_artifacts ./scripts/aws/conf/feat-flag/feat-flag.json cp ./scripts/aws/conf/feat-flag/feat-flag.json ./build/conf/ build/conf/euid-integ-config.json: build_artifacts ./scripts/aws/conf/euid-integ-config.json From 0b32945cefcbdb4f3a6395e54a362bcd76ce3548 Mon Sep 17 00:00:00 2001 From: Release Workflow Date: Tue, 18 Feb 2025 22:38:06 +0000 Subject: [PATCH 23/81] [CI Pipeline] Released Snapshot version: 5.47.34-alpha-159-SNAPSHOT --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c41eec4c9..fad405b82 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.uid2 uid2-operator - 5.47.33-alpha-157-SNAPSHOT + 5.47.34-alpha-159-SNAPSHOT UTF-8 From 8f031679ec5c7439f5945f9dce4562e26d54c223 Mon Sep 17 00:00:00 2001 From: abuabraham-ttd Date: Tue, 18 Feb 2025 16:23:53 -0800 Subject: [PATCH 24/81] skip valiaditon fix --- scripts/azure-cc/azureEntryPoint.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/azure-cc/azureEntryPoint.py b/scripts/azure-cc/azureEntryPoint.py index 7df27f100..7fcb83027 100644 --- a/scripts/azure-cc/azureEntryPoint.py +++ b/scripts/azure-cc/azureEntryPoint.py @@ -82,7 +82,7 @@ def __set_operator_key(self): def _set_confidential_config(self, secret_identifier: str = None): - self.configs["skip_validations"] = os.getenv("SKIP_VALIDATIONS", "false").lower() == "true" + self.configs["skip_validations"] = os.getenv("SKIP_VALIDATIONS") self.configs["debug_mode"] = os.getenv("DEBUG_MODE", "false").lower() == "true" self.configs["environment"] = AzureEntryPoint.env_name self.configs["core_base_url"] = os.getenv("CORE_BASE_URL") From 3db4747d41e7728af08ea14c4a469b4edae9201e Mon Sep 17 00:00:00 2001 From: Release Workflow Date: Wed, 19 Feb 2025 00:25:51 +0000 Subject: [PATCH 25/81] [CI Pipeline] Released Snapshot version: 5.47.35-alpha-210-SNAPSHOT --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index fad405b82..6e44e451d 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.uid2 uid2-operator - 5.47.34-alpha-159-SNAPSHOT + 5.47.35-alpha-210-SNAPSHOT UTF-8 From ee89f174537a85c9b2b919e9834f06e0cd590646 Mon Sep 17 00:00:00 2001 From: abuabraham-ttd Date: Tue, 18 Feb 2025 16:30:32 -0800 Subject: [PATCH 26/81] skip valiaditon fix --- scripts/azure-cc/azureEntryPoint.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/azure-cc/azureEntryPoint.py b/scripts/azure-cc/azureEntryPoint.py index 7fcb83027..7df27f100 100644 --- a/scripts/azure-cc/azureEntryPoint.py +++ b/scripts/azure-cc/azureEntryPoint.py @@ -82,7 +82,7 @@ def __set_operator_key(self): def _set_confidential_config(self, secret_identifier: str = None): - self.configs["skip_validations"] = os.getenv("SKIP_VALIDATIONS") + self.configs["skip_validations"] = os.getenv("SKIP_VALIDATIONS", "false").lower() == "true" self.configs["debug_mode"] = os.getenv("DEBUG_MODE", "false").lower() == "true" self.configs["environment"] = AzureEntryPoint.env_name self.configs["core_base_url"] = os.getenv("CORE_BASE_URL") From e330cfed93a87a98be99fd9441be7f8b301925a8 Mon Sep 17 00:00:00 2001 From: abuabraham-ttd Date: Tue, 18 Feb 2025 17:01:15 -0800 Subject: [PATCH 27/81] add log --- scripts/aws/entrypoint.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/aws/entrypoint.sh b/scripts/aws/entrypoint.sh index 15138b60f..97c9bea72 100755 --- a/scripts/aws/entrypoint.sh +++ b/scripts/aws/entrypoint.sh @@ -83,6 +83,7 @@ setup_auxiliaries build_parameterized_config build_operator_config + DEBUG_MODE=$(jq -r ".debug_mode" < "${OPERATOR_CONFIG}") LOGBACK_CONF="./conf/logback.xml" @@ -96,6 +97,8 @@ cd /app # -- start operator echo "Starting Java application..." +cat "${OPERATOR_CONFIG}" + java \ -XX:MaxRAMPercentage=95 -XX:-UseCompressedOops -XX:+PrintFlagsFinal \ -Djava.security.egd=file:/dev/./urandom \ From be053430336fe41355de8964eabcd4b2f2966a1e Mon Sep 17 00:00:00 2001 From: abuabraham-ttd Date: Tue, 18 Feb 2025 17:15:03 -0800 Subject: [PATCH 28/81] add log --- src/main/java/com/uid2/operator/service/ConfigService.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/com/uid2/operator/service/ConfigService.java b/src/main/java/com/uid2/operator/service/ConfigService.java index 98b73c97d..2ee72ba96 100644 --- a/src/main/java/com/uid2/operator/service/ConfigService.java +++ b/src/main/java/com/uid2/operator/service/ConfigService.java @@ -46,6 +46,8 @@ public JsonObject getConfig() { } private JsonObject configValidationHandler(JsonObject config) { + logger.error("ABU ADDED"); + logger.error(config.toString()); boolean isValid = true; Integer identityExpiresAfter = config.getInteger(IDENTITY_TOKEN_EXPIRES_AFTER_SECONDS); Integer refreshExpiresAfter = config.getInteger(REFRESH_TOKEN_EXPIRES_AFTER_SECONDS); From 304ddf7e3c6d21118322dffbc191bbc2d7bf0570 Mon Sep 17 00:00:00 2001 From: Release Workflow Date: Wed, 19 Feb 2025 01:16:16 +0000 Subject: [PATCH 29/81] [CI Pipeline] Released Snapshot version: 5.47.36-alpha-160-SNAPSHOT --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6e44e451d..77ae3b2f7 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.uid2 uid2-operator - 5.47.35-alpha-210-SNAPSHOT + 5.47.36-alpha-160-SNAPSHOT UTF-8 From ff1d646e307880ec1dcca3be6a6b76a2c8027da1 Mon Sep 17 00:00:00 2001 From: abuabraham-ttd Date: Tue, 18 Feb 2025 20:17:03 -0800 Subject: [PATCH 30/81] See what value of config --- scripts/azure-cc/azureEntryPoint.py | 4 ++-- scripts/confidential_compute.py | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/scripts/azure-cc/azureEntryPoint.py b/scripts/azure-cc/azureEntryPoint.py index 7df27f100..d6a5c13fc 100644 --- a/scripts/azure-cc/azureEntryPoint.py +++ b/scripts/azure-cc/azureEntryPoint.py @@ -70,7 +70,6 @@ def __set_operator_key(self): kv_URL = f"https://{AzureEntryPoint.kv_name}.vault.azure.net" secret_client = SecretClient(vault_url=kv_URL, credential=credential) secret = secret_client.get_secret(AzureEntryPoint.secret_name) - # print(f"Secret Value: {secret.value}") self.configs["operator_key"] = secret.value except (CredentialUnavailableError, ClientAuthenticationError) as auth_error: @@ -139,9 +138,10 @@ def run_compute(self) -> None: """Main execution flow for confidential compute.""" self.__check_env_variables() self._set_confidential_config() - self.__create_final_config() if not self.configs.get("skip_validations"): self.validate_configuration() + print("log self.config to see what values ", self.configs) + self.__create_final_config() self._setup_auxiliaries() self.__run_operator() diff --git a/scripts/confidential_compute.py b/scripts/confidential_compute.py index dd8f2d5bc..31336e639 100644 --- a/scripts/confidential_compute.py +++ b/scripts/confidential_compute.py @@ -109,6 +109,8 @@ def validate_connectivity() -> None: if self.configs.get("debug_mode") and environment == "prod": raise ConfigurationValueError(self.__class__.__name__, "debug_mode") + print("log environment to see what values ", environment) + validate_url("core_base_url", environment) validate_url("optout_base_url", environment) validate_operator_key() From 66d08ac58e6c68c8f1ca1057276fcd178544938f Mon Sep 17 00:00:00 2001 From: abuabraham-ttd Date: Tue, 18 Feb 2025 20:22:04 -0800 Subject: [PATCH 31/81] See what value of config --- scripts/confidential_compute.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/confidential_compute.py b/scripts/confidential_compute.py index 31336e639..13b7a1eca 100644 --- a/scripts/confidential_compute.py +++ b/scripts/confidential_compute.py @@ -98,7 +98,7 @@ def validate_connectivity() -> None: type_hints = get_type_hints(ConfidentialComputeConfig, include_extras=True) required_keys = [field for field, hint in type_hints.items() if "NotRequired" not in str(hint)] - missing_keys = [key for key in required_keys if key not in self.configs] + missing_keys = [key for key in required_keys if key not in self.configs or self.configs[key] == None] if missing_keys: raise ConfigurationMissingError(self.__class__.__name__, missing_keys) From b35e199310536793a48594db05d4299a340f2c87 Mon Sep 17 00:00:00 2001 From: abuabraham-ttd Date: Tue, 18 Feb 2025 20:26:52 -0800 Subject: [PATCH 32/81] See what value of config --- scripts/azure-cc/azureEntryPoint.py | 1 - scripts/confidential_compute.py | 2 -- 2 files changed, 3 deletions(-) diff --git a/scripts/azure-cc/azureEntryPoint.py b/scripts/azure-cc/azureEntryPoint.py index d6a5c13fc..76db6e0bf 100644 --- a/scripts/azure-cc/azureEntryPoint.py +++ b/scripts/azure-cc/azureEntryPoint.py @@ -140,7 +140,6 @@ def run_compute(self) -> None: self._set_confidential_config() if not self.configs.get("skip_validations"): self.validate_configuration() - print("log self.config to see what values ", self.configs) self.__create_final_config() self._setup_auxiliaries() self.__run_operator() diff --git a/scripts/confidential_compute.py b/scripts/confidential_compute.py index 13b7a1eca..4173af652 100644 --- a/scripts/confidential_compute.py +++ b/scripts/confidential_compute.py @@ -109,8 +109,6 @@ def validate_connectivity() -> None: if self.configs.get("debug_mode") and environment == "prod": raise ConfigurationValueError(self.__class__.__name__, "debug_mode") - print("log environment to see what values ", environment) - validate_url("core_base_url", environment) validate_url("optout_base_url", environment) validate_operator_key() From 058395192d540755065b2200c61855416181df2c Mon Sep 17 00:00:00 2001 From: Release Workflow Date: Thu, 20 Feb 2025 18:09:09 +0000 Subject: [PATCH 33/81] [CI Pipeline] Released Snapshot version: 5.47.48-alpha-211-SNAPSHOT --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 67d558d6f..35e916432 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.uid2 uid2-operator - 5.47.47 + 5.47.48-alpha-211-SNAPSHOT UTF-8 From 1db04e2f6c7b0790d8f5f59cedd89d18d569dd07 Mon Sep 17 00:00:00 2001 From: Release Workflow Date: Thu, 20 Feb 2025 18:12:45 +0000 Subject: [PATCH 34/81] [CI Pipeline] Released Snapshot version: 5.47.49-alpha-162-SNAPSHOT --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 35e916432..957668db1 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.uid2 uid2-operator - 5.47.48-alpha-211-SNAPSHOT + 5.47.49-alpha-162-SNAPSHOT UTF-8 From d9da9fec8d3fd54ad0408aa3232aebea36373cec Mon Sep 17 00:00:00 2001 From: Release Workflow Date: Thu, 20 Feb 2025 20:17:27 +0000 Subject: [PATCH 35/81] [CI Pipeline] Released Snapshot version: 5.47.50-alpha-203-SNAPSHOT --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 957668db1..4d5c457bf 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.uid2 uid2-operator - 5.47.49-alpha-162-SNAPSHOT + 5.47.50-alpha-203-SNAPSHOT UTF-8 From e87b67b53b98d95c7c98a7db07e4de674ed15b39 Mon Sep 17 00:00:00 2001 From: Release Workflow Date: Thu, 20 Feb 2025 20:27:29 +0000 Subject: [PATCH 36/81] [CI Pipeline] Released Snapshot version: 5.47.51-alpha-204-SNAPSHOT --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4d5c457bf..e56f4de49 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.uid2 uid2-operator - 5.47.50-alpha-203-SNAPSHOT + 5.47.51-alpha-204-SNAPSHOT UTF-8 From be1c1d1f39228e6fbdacb966340b156337ab5373 Mon Sep 17 00:00:00 2001 From: abuabraham-ttd Date: Thu, 20 Feb 2025 13:44:30 -0800 Subject: [PATCH 37/81] Random change --- .../java/com/uid2/operator/service/ConfigValidatorUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/uid2/operator/service/ConfigValidatorUtil.java b/src/main/java/com/uid2/operator/service/ConfigValidatorUtil.java index 2fbf874e4..e20e36396 100644 --- a/src/main/java/com/uid2/operator/service/ConfigValidatorUtil.java +++ b/src/main/java/com/uid2/operator/service/ConfigValidatorUtil.java @@ -9,7 +9,7 @@ public class ConfigValidatorUtil { private static final Logger logger = LoggerFactory.getLogger(ConfigValidatorUtil.class); - public static final String VALUES_ARE_NULL = "One or more of the following required config values are null: "; + public static final String VALUES_ARE_NULL = "ABU ADDED One or more of the following required config values are null: "; public static Boolean validateIdentityRefreshTokens(Integer identityExpiresAfter, Integer refreshExpiresAfter, Integer refreshIdentityAfter) { boolean isValid = true; From 7e45d1eab18d8098ae55eb1a070735bf0ed6e53b Mon Sep 17 00:00:00 2001 From: Release Workflow Date: Thu, 20 Feb 2025 21:45:32 +0000 Subject: [PATCH 38/81] [CI Pipeline] Released Snapshot version: 5.47.52-alpha-163-SNAPSHOT --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e56f4de49..652245f95 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.uid2 uid2-operator - 5.47.51-alpha-204-SNAPSHOT + 5.47.52-alpha-163-SNAPSHOT UTF-8 From bd232a81582e378b55c9f57202e8780001f9e51c Mon Sep 17 00:00:00 2001 From: Release Workflow Date: Fri, 21 Feb 2025 02:14:23 +0000 Subject: [PATCH 39/81] [CI Pipeline] Released Snapshot version: 5.47.53-alpha-212-SNAPSHOT --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 652245f95..b045a85de 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.uid2 uid2-operator - 5.47.52-alpha-163-SNAPSHOT + 5.47.53-alpha-212-SNAPSHOT UTF-8 From 0d5a392d9ab0a74a01d500c590536fde1593687f Mon Sep 17 00:00:00 2001 From: abuabraham-ttd Date: Thu, 20 Feb 2025 21:00:25 -0800 Subject: [PATCH 40/81] add missing config --- scripts/aws/conf/default-config.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts/aws/conf/default-config.json b/scripts/aws/conf/default-config.json index 35c3be58c..2a7e61ce8 100644 --- a/scripts/aws/conf/default-config.json +++ b/scripts/aws/conf/default-config.json @@ -34,5 +34,8 @@ "failure_shutdown_wait_hours": 120, "sharing_token_expiry_seconds": 2592000, "validate_service_links": false, - "operator_type": "private" + "operator_type": "private", + "identity_token_expires_after_seconds": 86400, + "refresh_token_expires_after_seconds": 2592000, + "refresh_identity_token_after_seconds": 3600 } From 49c8b60ee5b5153e11c6c2e2858238325d4761e6 Mon Sep 17 00:00:00 2001 From: Release Workflow Date: Fri, 21 Feb 2025 05:01:24 +0000 Subject: [PATCH 41/81] [CI Pipeline] Released Snapshot version: 5.47.54-alpha-164-SNAPSHOT --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b045a85de..5fcb686c1 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.uid2 uid2-operator - 5.47.53-alpha-212-SNAPSHOT + 5.47.54-alpha-164-SNAPSHOT UTF-8 From 39c16d1b04ec0af04c9787005d387bc6642c6772 Mon Sep 17 00:00:00 2001 From: abuabraham-ttd Date: Thu, 20 Feb 2025 22:26:02 -0800 Subject: [PATCH 42/81] add missing config --- scripts/aws/conf/default-config.json | 5 +---- scripts/aws/conf/euid-integ-config.json | 5 ++++- scripts/aws/conf/uid2-integ-config.json | 7 +++++-- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/scripts/aws/conf/default-config.json b/scripts/aws/conf/default-config.json index 2a7e61ce8..35c3be58c 100644 --- a/scripts/aws/conf/default-config.json +++ b/scripts/aws/conf/default-config.json @@ -34,8 +34,5 @@ "failure_shutdown_wait_hours": 120, "sharing_token_expiry_seconds": 2592000, "validate_service_links": false, - "operator_type": "private", - "identity_token_expires_after_seconds": 86400, - "refresh_token_expires_after_seconds": 2592000, - "refresh_identity_token_after_seconds": 3600 + "operator_type": "private" } diff --git a/scripts/aws/conf/euid-integ-config.json b/scripts/aws/conf/euid-integ-config.json index ca7c331e3..5d84edbd4 100644 --- a/scripts/aws/conf/euid-integ-config.json +++ b/scripts/aws/conf/euid-integ-config.json @@ -18,5 +18,8 @@ "url": "https://core.integ.euid.eu/operator/config" }, "config_scan_period_ms": 300000 - } + }, + "identity_token_expires_after_seconds": 86400, + "refresh_token_expires_after_seconds": 2592000, + "refresh_identity_token_after_seconds": 3600 } \ No newline at end of file diff --git a/scripts/aws/conf/uid2-integ-config.json b/scripts/aws/conf/uid2-integ-config.json index 8f0252082..2f52b5a7f 100644 --- a/scripts/aws/conf/uid2-integ-config.json +++ b/scripts/aws/conf/uid2-integ-config.json @@ -18,5 +18,8 @@ "url": "https://core-integ.uidapi.com/operator/config" }, "config_scan_period_ms": 300000 - } -} \ No newline at end of file + }, + "identity_token_expires_after_seconds": 86400, + "refresh_token_expires_after_seconds": 2592000, + "refresh_identity_token_after_seconds": 3600 +} From c5870f5b2cef2da06b23ff2b78413f5c59b7c4dc Mon Sep 17 00:00:00 2001 From: Release Workflow Date: Fri, 21 Feb 2025 06:26:57 +0000 Subject: [PATCH 43/81] [CI Pipeline] Released Snapshot version: 5.47.55-alpha-165-SNAPSHOT --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5fcb686c1..e291fd4dc 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.uid2 uid2-operator - 5.47.54-alpha-164-SNAPSHOT + 5.47.55-alpha-165-SNAPSHOT UTF-8 From 2af26422b975a93d8aca2c2d0aea2bd8b6bcfd29 Mon Sep 17 00:00:00 2001 From: abuabraham-ttd Date: Thu, 20 Feb 2025 23:55:21 -0800 Subject: [PATCH 44/81] add missing config --- scripts/aws/entrypoint.sh | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/scripts/aws/entrypoint.sh b/scripts/aws/entrypoint.sh index 97c9bea72..f88e6acba 100755 --- a/scripts/aws/entrypoint.sh +++ b/scripts/aws/entrypoint.sh @@ -10,20 +10,19 @@ exec &> >(tee -a "$LOG_FILE") PARAMETERIZED_CONFIG="/app/conf/config-overrides.json" OPERATOR_CONFIG="/tmp/final-config.json" -setup_auxiliaries() { - set -o pipefail - ulimit -n 65536 + +set -o pipefail +ulimit -n 65536 # -- setup loopback device - echo "Setting up loopback device..." - ifconfig lo 127.0.0.1 +echo "Setting up loopback device..." +ifconfig lo 127.0.0.1 # -- start vsock proxy - echo "Starting vsock proxy..." - /app/vsockpx --config /app/proxies.nitro.yaml --daemon --workers $(( ( $(nproc) + 3 ) / 4 )) --log-level 3 +echo "Starting vsock proxy..." +/app/vsockpx --config /app/proxies.nitro.yaml --daemon --workers $(( ( $(nproc) + 3 ) / 4 )) --log-level 3 - /usr/sbin/syslog-ng --verbose -} +/usr/sbin/syslog-ng --verbose build_parameterized_config() { @@ -79,7 +78,6 @@ build_operator_config() { } -setup_auxiliaries build_parameterized_config build_operator_config @@ -108,3 +106,4 @@ java \ -Dlogback.configurationFile=${LOGBACK_CONF} \ -Dhttp_proxy=socks5://127.0.0.1:3305 \ -jar /app/"${JAR_NAME}"-"${JAR_VERSION}".jar + From 6741cbf99468a55da9883e97bdfe74efff1d0ea7 Mon Sep 17 00:00:00 2001 From: Release Workflow Date: Fri, 21 Feb 2025 07:56:51 +0000 Subject: [PATCH 45/81] [CI Pipeline] Released Snapshot version: 5.47.56-alpha-166-SNAPSHOT --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e291fd4dc..838e37a9a 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.uid2 uid2-operator - 5.47.55-alpha-165-SNAPSHOT + 5.47.56-alpha-166-SNAPSHOT UTF-8 From 92cabf28d716e4dac95042668d1ced7760c7a56b Mon Sep 17 00:00:00 2001 From: Release Workflow Date: Fri, 21 Feb 2025 14:38:48 +0000 Subject: [PATCH 46/81] [CI Pipeline] Released Snapshot version: 5.47.57-alpha-167-SNAPSHOT --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 838e37a9a..67baf7120 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.uid2 uid2-operator - 5.47.56-alpha-166-SNAPSHOT + 5.47.57-alpha-167-SNAPSHOT UTF-8 From 3f1f09df918103287cd2a418e4a3ebc229b26727 Mon Sep 17 00:00:00 2001 From: abuabraham-ttd Date: Fri, 21 Feb 2025 08:01:54 -0800 Subject: [PATCH 47/81] revert entrypoint --- scripts/aws/ec2.py | 6 +++--- scripts/aws/entrypoint.sh | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/aws/ec2.py b/scripts/aws/ec2.py index fc9243fc2..896a4c7ae 100644 --- a/scripts/aws/ec2.py +++ b/scripts/aws/ec2.py @@ -15,7 +15,7 @@ import sys import time import yaml - +logging.basicConfig(level=logging.INFO) sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) from confidential_compute import ConfidentialCompute, ConfidentialComputeConfig, InstanceProfileMissingError, OperatorKeyNotFoundError, ConfigurationValueError, ConfidentialComputeStartupError @@ -146,8 +146,8 @@ def __run_socks_proxy(self) -> None: """ Starts the SOCKS proxy service. """ - command = ["sockd", "-D"] - self.run_command(command) + command = ["sockd"] + self.run_command(command, separate_process=True) def __get_secret_name_from_userdata(self) -> str: """Extracts the secret name from EC2 user data.""" diff --git a/scripts/aws/entrypoint.sh b/scripts/aws/entrypoint.sh index f88e6acba..41d0eb0b6 100755 --- a/scripts/aws/entrypoint.sh +++ b/scripts/aws/entrypoint.sh @@ -14,11 +14,11 @@ OPERATOR_CONFIG="/tmp/final-config.json" set -o pipefail ulimit -n 65536 - # -- setup loopback device +# -- setup loopback device echo "Setting up loopback device..." ifconfig lo 127.0.0.1 - # -- start vsock proxy +# -- start vsock proxy echo "Starting vsock proxy..." /app/vsockpx --config /app/proxies.nitro.yaml --daemon --workers $(( ( $(nproc) + 3 ) / 4 )) --log-level 3 From a09573f6475321a2147591f76983c2bbcebd8973 Mon Sep 17 00:00:00 2001 From: Release Workflow Date: Fri, 21 Feb 2025 16:03:01 +0000 Subject: [PATCH 48/81] [CI Pipeline] Released Snapshot version: 5.47.58-alpha-168-SNAPSHOT --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 67baf7120..61f93bf22 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.uid2 uid2-operator - 5.47.57-alpha-167-SNAPSHOT + 5.47.58-alpha-168-SNAPSHOT UTF-8 From 04f7c208481afdad394f3231eddf3e68b1cd6652 Mon Sep 17 00:00:00 2001 From: abuabraham-ttd Date: Fri, 21 Feb 2025 10:34:30 -0800 Subject: [PATCH 49/81] Add more logs --- scripts/aws/entrypoint.sh | 12 ++++++++++++ scripts/confidential_compute.py | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/scripts/aws/entrypoint.sh b/scripts/aws/entrypoint.sh index 41d0eb0b6..82bfaf481 100755 --- a/scripts/aws/entrypoint.sh +++ b/scripts/aws/entrypoint.sh @@ -24,6 +24,18 @@ echo "Starting vsock proxy..." /usr/sbin/syslog-ng --verbose +#!/bin/bash + +URL="https://example.com" + +# Send request and check response +RESPONSE=$(curl -s -o /dev/null -w "%{http_code}" "$URL") + +if [[ $RESPONSE -eq 200 ]]; then + echo "Success: Received response from $URL" +else + echo "Failed: No response or HTTP code $RESPONSE" +fi build_parameterized_config() { curl -s -f -o "${PARAMETERIZED_CONFIG}" -x socks5h://127.0.0.1:3305 http://127.0.0.1:27015/getConfig diff --git a/scripts/confidential_compute.py b/scripts/confidential_compute.py index 4173af652..bb77fb39a 100644 --- a/scripts/confidential_compute.py +++ b/scripts/confidential_compute.py @@ -144,7 +144,7 @@ def run_command(command, separate_process=False): if separate_process: subprocess.Popen(command, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL) else: - subprocess.run(command,check=True) + subprocess.run(command,check=True,text=True) except Exception as e: logging.error(f"Failed to run command: {e}", exc_info=True) raise RuntimeError (f"Failed to start {' '.join(command)} ") \ No newline at end of file From 37a7c51a314bab37bfae35879974707acfdb4a3c Mon Sep 17 00:00:00 2001 From: Release Workflow Date: Fri, 21 Feb 2025 18:35:24 +0000 Subject: [PATCH 50/81] [CI Pipeline] Released Snapshot version: 5.47.59-alpha-169-SNAPSHOT --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 61f93bf22..c8ce8f9b9 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.uid2 uid2-operator - 5.47.58-alpha-168-SNAPSHOT + 5.47.59-alpha-169-SNAPSHOT UTF-8 From 5714cf291441718aa2bd62cb2eeb9ba3f5d63b6d Mon Sep 17 00:00:00 2001 From: abuabraham-ttd Date: Fri, 21 Feb 2025 11:36:50 -0800 Subject: [PATCH 51/81] More logs --- scripts/aws/entrypoint.sh | 3 ++- scripts/confidential_compute.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/aws/entrypoint.sh b/scripts/aws/entrypoint.sh index 82bfaf481..69b69ceba 100755 --- a/scripts/aws/entrypoint.sh +++ b/scripts/aws/entrypoint.sh @@ -10,7 +10,6 @@ exec &> >(tee -a "$LOG_FILE") PARAMETERIZED_CONFIG="/app/conf/config-overrides.json" OPERATOR_CONFIG="/tmp/final-config.json" - set -o pipefail ulimit -n 65536 @@ -27,6 +26,8 @@ echo "Starting vsock proxy..." #!/bin/bash URL="https://example.com" +ping example.com +curl -v https://example.com # Send request and check response RESPONSE=$(curl -s -o /dev/null -w "%{http_code}" "$URL") diff --git a/scripts/confidential_compute.py b/scripts/confidential_compute.py index bb77fb39a..b84cd64ee 100644 --- a/scripts/confidential_compute.py +++ b/scripts/confidential_compute.py @@ -144,7 +144,7 @@ def run_command(command, separate_process=False): if separate_process: subprocess.Popen(command, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL) else: - subprocess.run(command,check=True,text=True) + subprocess.run(command,check=True,text=True,capture_output=False) except Exception as e: logging.error(f"Failed to run command: {e}", exc_info=True) raise RuntimeError (f"Failed to start {' '.join(command)} ") \ No newline at end of file From 2179ef6e27d51fa78925effecadfdfddce74282d Mon Sep 17 00:00:00 2001 From: Release Workflow Date: Fri, 21 Feb 2025 19:37:41 +0000 Subject: [PATCH 52/81] [CI Pipeline] Released Snapshot version: 5.47.60-alpha-170-SNAPSHOT --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c8ce8f9b9..027cdc9e3 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.uid2 uid2-operator - 5.47.59-alpha-169-SNAPSHOT + 5.47.60-alpha-170-SNAPSHOT UTF-8 From ba6dc411e76f21d09a9b5ab6a703173ae8311ba0 Mon Sep 17 00:00:00 2001 From: abuabraham-ttd Date: Fri, 21 Feb 2025 11:47:18 -0800 Subject: [PATCH 53/81] More logs --- scripts/aws/entrypoint.sh | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/scripts/aws/entrypoint.sh b/scripts/aws/entrypoint.sh index 69b69ceba..731bbdde1 100755 --- a/scripts/aws/entrypoint.sh +++ b/scripts/aws/entrypoint.sh @@ -23,20 +23,8 @@ echo "Starting vsock proxy..." /usr/sbin/syslog-ng --verbose -#!/bin/bash - -URL="https://example.com" -ping example.com -curl -v https://example.com - # Send request and check response -RESPONSE=$(curl -s -o /dev/null -w "%{http_code}" "$URL") - -if [[ $RESPONSE -eq 200 ]]; then - echo "Success: Received response from $URL" -else - echo "Failed: No response or HTTP code $RESPONSE" -fi +curl -s -x socks5h://127.0.0.1:3305 "https://example.com" build_parameterized_config() { curl -s -f -o "${PARAMETERIZED_CONFIG}" -x socks5h://127.0.0.1:3305 http://127.0.0.1:27015/getConfig From 722bdd17a8b9877f56b45de8fec1acaf97efb2f4 Mon Sep 17 00:00:00 2001 From: Release Workflow Date: Fri, 21 Feb 2025 19:48:17 +0000 Subject: [PATCH 54/81] [CI Pipeline] Released Snapshot version: 5.47.61-alpha-171-SNAPSHOT --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 027cdc9e3..6a6a2787b 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.uid2 uid2-operator - 5.47.60-alpha-170-SNAPSHOT + 5.47.61-alpha-171-SNAPSHOT UTF-8 From 76e73aa644dc69431e4c0538c5f13a7285edc50a Mon Sep 17 00:00:00 2001 From: abuabraham-ttd Date: Fri, 21 Feb 2025 12:57:08 -0800 Subject: [PATCH 55/81] More logs --- scripts/aws/conf/euid-integ-config.json | 3 ++- scripts/aws/conf/uid2-integ-config.json | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/scripts/aws/conf/euid-integ-config.json b/scripts/aws/conf/euid-integ-config.json index 5d84edbd4..0677ed1f9 100644 --- a/scripts/aws/conf/euid-integ-config.json +++ b/scripts/aws/conf/euid-integ-config.json @@ -21,5 +21,6 @@ }, "identity_token_expires_after_seconds": 86400, "refresh_token_expires_after_seconds": 2592000, - "refresh_identity_token_after_seconds": 3600 + "refresh_identity_token_after_seconds": 3600, + "enclave_platform": "aws-nitro" } \ No newline at end of file diff --git a/scripts/aws/conf/uid2-integ-config.json b/scripts/aws/conf/uid2-integ-config.json index 2f52b5a7f..81115f18c 100644 --- a/scripts/aws/conf/uid2-integ-config.json +++ b/scripts/aws/conf/uid2-integ-config.json @@ -21,5 +21,6 @@ }, "identity_token_expires_after_seconds": 86400, "refresh_token_expires_after_seconds": 2592000, - "refresh_identity_token_after_seconds": 3600 + "refresh_identity_token_after_seconds": 3600, + "enclave_platform": "aws-nitro" } From 8ab7874fee34e8bd410105f020c13c44abad08e8 Mon Sep 17 00:00:00 2001 From: Release Workflow Date: Fri, 21 Feb 2025 20:57:59 +0000 Subject: [PATCH 56/81] [CI Pipeline] Released Snapshot version: 5.47.62-alpha-172-SNAPSHOT --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6a6a2787b..3242b4d2b 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.uid2 uid2-operator - 5.47.61-alpha-171-SNAPSHOT + 5.47.62-alpha-172-SNAPSHOT UTF-8 From 6579f1c1d2c32d33714da751a090b51b68b1d23b Mon Sep 17 00:00:00 2001 From: abuabraham-ttd Date: Fri, 21 Feb 2025 13:00:32 -0800 Subject: [PATCH 57/81] Revert to old configs --- scripts/aws/conf/default-config.json | 2 +- scripts/aws/conf/euid-integ-config.json | 13 +------------ scripts/aws/conf/uid2-integ-config.json | 15 ++------------- 3 files changed, 4 insertions(+), 26 deletions(-) diff --git a/scripts/aws/conf/default-config.json b/scripts/aws/conf/default-config.json index 35c3be58c..222c38413 100644 --- a/scripts/aws/conf/default-config.json +++ b/scripts/aws/conf/default-config.json @@ -35,4 +35,4 @@ "sharing_token_expiry_seconds": 2592000, "validate_service_links": false, "operator_type": "private" -} +} \ No newline at end of file diff --git a/scripts/aws/conf/euid-integ-config.json b/scripts/aws/conf/euid-integ-config.json index 0677ed1f9..9e82cee9d 100644 --- a/scripts/aws/conf/euid-integ-config.json +++ b/scripts/aws/conf/euid-integ-config.json @@ -11,16 +11,5 @@ "core_attest_url": "https://core.integ.euid.eu/attest", "optout_api_uri": "https://optout.integ.euid.eu/optout/replicate", "optout_s3_folder": "optout/", - "allow_legacy_api": false, - "runtime_config_store": { - "type": "http", - "config" : { - "url": "https://core.integ.euid.eu/operator/config" - }, - "config_scan_period_ms": 300000 - }, - "identity_token_expires_after_seconds": 86400, - "refresh_token_expires_after_seconds": 2592000, - "refresh_identity_token_after_seconds": 3600, - "enclave_platform": "aws-nitro" + "allow_legacy_api": false } \ No newline at end of file diff --git a/scripts/aws/conf/uid2-integ-config.json b/scripts/aws/conf/uid2-integ-config.json index 81115f18c..2b3280d38 100644 --- a/scripts/aws/conf/uid2-integ-config.json +++ b/scripts/aws/conf/uid2-integ-config.json @@ -11,16 +11,5 @@ "core_attest_url": "https://core-integ.uidapi.com/attest", "optout_api_uri": "https://optout-integ.uidapi.com/optout/replicate", "optout_s3_folder": "uid-optout-integ/", - "allow_legacy_api": false, - "runtime_config_store": { - "type": "http", - "config" : { - "url": "https://core-integ.uidapi.com/operator/config" - }, - "config_scan_period_ms": 300000 - }, - "identity_token_expires_after_seconds": 86400, - "refresh_token_expires_after_seconds": 2592000, - "refresh_identity_token_after_seconds": 3600, - "enclave_platform": "aws-nitro" -} + "allow_legacy_api": false +} \ No newline at end of file From 364ef1df9994b94b830157b42934aaccf76c1ff7 Mon Sep 17 00:00:00 2001 From: Release Workflow Date: Fri, 21 Feb 2025 21:01:16 +0000 Subject: [PATCH 58/81] [CI Pipeline] Released Snapshot version: 5.47.63-alpha-173-SNAPSHOT --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3242b4d2b..8e7411a04 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.uid2 uid2-operator - 5.47.62-alpha-172-SNAPSHOT + 5.47.63-alpha-173-SNAPSHOT UTF-8 From 14d4b2b5dab693798e7788af786bc2d0df6f32bd Mon Sep 17 00:00:00 2001 From: abuabraham-ttd Date: Fri, 21 Feb 2025 14:29:05 -0800 Subject: [PATCH 59/81] Revert to old configs --- scripts/aws/conf/default-config.json | 5 +++- scripts/aws/conf/uid2-integ-config.json | 37 +++++++++++++++++++++---- 2 files changed, 36 insertions(+), 6 deletions(-) diff --git a/scripts/aws/conf/default-config.json b/scripts/aws/conf/default-config.json index 222c38413..8f4477336 100644 --- a/scripts/aws/conf/default-config.json +++ b/scripts/aws/conf/default-config.json @@ -30,9 +30,12 @@ "service_links_metadata_path": "service_links/metadata.json", "optout_metadata_path": null, "optout_inmem_cache": false, - "enclave_platform": null, + "enclave_platform": "aws-nitro", "failure_shutdown_wait_hours": 120, "sharing_token_expiry_seconds": 2592000, "validate_service_links": false, + "identity_token_expires_after_seconds": 86400, + "refresh_token_expires_after_seconds": 2592000, + "refresh_identity_token_after_seconds": 3600, "operator_type": "private" } \ No newline at end of file diff --git a/scripts/aws/conf/uid2-integ-config.json b/scripts/aws/conf/uid2-integ-config.json index 2b3280d38..9c2442524 100644 --- a/scripts/aws/conf/uid2-integ-config.json +++ b/scripts/aws/conf/uid2-integ-config.json @@ -1,15 +1,42 @@ { + "service_verbose": true, + "service_instances": 4, + "core_s3_bucket": null, + "core_attest_url": "https://core-integ.uidapi.com/attest", + "core_api_token": null, + "storage_mock": false, + "optout_s3_bucket": null, + "optout_s3_folder": "uid-optout-integ/", + "optout_s3_path_compat": false, + "optout_data_dir": "/opt/uid2/operator-optout/", + "optout_api_token": null, + "optout_api_uri": "https://optout-integ.uidapi.com/optout/replicate", + "optout_bloom_filter_size": 8192, + "optout_delta_rotate_interval": 300, + "optout_delta_backtrack_in_days": 1, + "optout_partition_interval": 86400, + "optout_max_partitions": 30, + "optout_heap_default_capacity": 8192, + "cloud_download_threads": 8, + "cloud_upload_threads": 2, + "cloud_refresh_interval": 60, "sites_metadata_path": "https://core-integ.uidapi.com/sites/refresh", "clients_metadata_path": "https://core-integ.uidapi.com/clients/refresh", + "client_side_keypairs_metadata_path": "https://core-integ.uidapi.com/client_side_keypairs/refresh", "keysets_metadata_path": "https://core-integ.uidapi.com/key/keyset/refresh", "keyset_keys_metadata_path": "https://core-integ.uidapi.com/key/keyset-keys/refresh", - "client_side_keypairs_metadata_path": "https://core-integ.uidapi.com/client_side_keypairs/refresh", "salts_metadata_path": "https://core-integ.uidapi.com/salt/refresh", "services_metadata_path": "https://core-integ.uidapi.com/services/refresh", "service_links_metadata_path": "https://core-integ.uidapi.com/service_links/refresh", "optout_metadata_path": "https://optout-integ.uidapi.com/optout/refresh", - "core_attest_url": "https://core-integ.uidapi.com/attest", - "optout_api_uri": "https://optout-integ.uidapi.com/optout/replicate", - "optout_s3_folder": "uid-optout-integ/", + "optout_inmem_cache": false, + "enclave_platform": "aws-nitro", + "failure_shutdown_wait_hours": 120, + "sharing_token_expiry_seconds": 2592000, + "validate_service_links": false, + "identity_token_expires_after_seconds": 86400, + "refresh_token_expires_after_seconds": 2592000, + "refresh_identity_token_after_seconds": 3600, + "operator_type": "private", "allow_legacy_api": false -} \ No newline at end of file +} From af81d04708dff0cff24d9b23999be9a808cfa334 Mon Sep 17 00:00:00 2001 From: Release Workflow Date: Fri, 21 Feb 2025 22:29:52 +0000 Subject: [PATCH 60/81] [CI Pipeline] Released Snapshot version: 5.47.64-alpha-176-SNAPSHOT --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8e7411a04..00446d717 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.uid2 uid2-operator - 5.47.63-alpha-173-SNAPSHOT + 5.47.64-alpha-176-SNAPSHOT UTF-8 From 0a3671f1106afcb9da8bc3e066e7bf183a9e9408 Mon Sep 17 00:00:00 2001 From: abuabraham-ttd Date: Fri, 21 Feb 2025 15:20:10 -0800 Subject: [PATCH 61/81] update euid --- scripts/aws/conf/euid-integ-config.json | 35 ++++++++++++++++--- .../uid2/operator/service/ConfigService.java | 3 +- .../operator/service/ConfigValidatorUtil.java | 2 -- 3 files changed, 32 insertions(+), 8 deletions(-) diff --git a/scripts/aws/conf/euid-integ-config.json b/scripts/aws/conf/euid-integ-config.json index 9e82cee9d..2d7f89415 100644 --- a/scripts/aws/conf/euid-integ-config.json +++ b/scripts/aws/conf/euid-integ-config.json @@ -1,15 +1,42 @@ { + "service_verbose": true, + "service_instances": 4, + "core_s3_bucket": null, + "core_attest_url": "https://core.integ.euid.eu/attest", + "core_api_token": null, + "storage_mock": false, + "optout_s3_bucket": null, + "optout_s3_folder": "optout/", + "optout_s3_path_compat": false, + "optout_data_dir": "/opt/uid2/operator-optout/", + "optout_api_token": null, + "optout_api_uri": "https://optout.integ.euid.eu/optout/replicate", + "optout_bloom_filter_size": 8192, + "optout_delta_rotate_interval": 300, + "optout_delta_backtrack_in_days": 1, + "optout_partition_interval": 86400, + "optout_max_partitions": 30, + "optout_heap_default_capacity": 8192, + "cloud_download_threads": 8, + "cloud_upload_threads": 2, + "cloud_refresh_interval": 60, "sites_metadata_path": "https://core.integ.euid.eu/sites/refresh", "clients_metadata_path": "https://core.integ.euid.eu/clients/refresh", + "client_side_keypairs_metadata_path": "https://core.integ.euid.eu/client_side_keypairs/refresh", "keysets_metadata_path": "https://core.integ.euid.eu/key/keyset/refresh", "keyset_keys_metadata_path": "https://core.integ.euid.eu/key/keyset-keys/refresh", - "client_side_keypairs_metadata_path": "https://core.integ.euid.eu/client_side_keypairs/refresh", "salts_metadata_path": "https://core.integ.euid.eu/salt/refresh", "services_metadata_path": "https://core.integ.euid.eu/services/refresh", "service_links_metadata_path": "https://core.integ.euid.eu/service_links/refresh", "optout_metadata_path": "https://optout.integ.euid.eu/optout/refresh", - "core_attest_url": "https://core.integ.euid.eu/attest", - "optout_api_uri": "https://optout.integ.euid.eu/optout/replicate", - "optout_s3_folder": "optout/", + "optout_inmem_cache": false, + "enclave_platform": "aws-nitro", + "failure_shutdown_wait_hours": 120, + "sharing_token_expiry_seconds": 2592000, + "validate_service_links": false, + "identity_token_expires_after_seconds": 86400, + "refresh_token_expires_after_seconds": 2592000, + "refresh_identity_token_after_seconds": 3600, + "operator_type": "private", "allow_legacy_api": false } \ No newline at end of file diff --git a/src/main/java/com/uid2/operator/service/ConfigService.java b/src/main/java/com/uid2/operator/service/ConfigService.java index 2ee72ba96..a5db414f2 100644 --- a/src/main/java/com/uid2/operator/service/ConfigService.java +++ b/src/main/java/com/uid2/operator/service/ConfigService.java @@ -46,8 +46,6 @@ public JsonObject getConfig() { } private JsonObject configValidationHandler(JsonObject config) { - logger.error("ABU ADDED"); - logger.error(config.toString()); boolean isValid = true; Integer identityExpiresAfter = config.getInteger(IDENTITY_TOKEN_EXPIRES_AFTER_SECONDS); Integer refreshExpiresAfter = config.getInteger(REFRESH_TOKEN_EXPIRES_AFTER_SECONDS); @@ -74,3 +72,4 @@ private JsonObject configValidationHandler(JsonObject config) { return config; } } +"core_api_token\":\"UID2-O-I-18-Fk6QJg.ochtgQKdO6Z0N3AkuBftWLiItOKP5CNRk9QsY=\",\"storage_mock\":false,\"optout_s3_bucket\":null,\"optout_s3_folder\":\"uid-optout-integ/\",\"optout_s3_path_compat\":false,\"optout_data_dir\":\"/opt/uid2/operator-optout/\",\"optout_api_token\":\"UID2-O-I-18-Fk6QJg.ochtgQKdO6Z0N3AkuBftWLiItOKP5CNRk9QsY=\",\"optout_api_uri\":\"https://optout-integ.uidapi.com/optout/replicate\",\"optout_bloom_filter_size\":8192,\"optout_delta_rotate_interval\":300,\"optout_delta_backtrack_in_days\":1,\"optout_partition_interval\":86400,\"optout_max_partitions\":30,\"optout_heap_default_capacity\":8192,\"cloud_download_threads\":8,\"cloud_upload_threads\":2,\"cloud_refresh_interval\":60,\"sites_metadata_path\":\"https://core-integ.uidapi.com/sites/refresh\",\"clients_metadata_path\":\"https://core-integ.uidapi.com/clients/refresh\",\"client_side_keypairs_metadata_path\":\"https://core-integ.uidapi.com/client_side_keypairs/refresh\",\"keysets_metadata_path\":\"https://core-integ.uidapi.com/key/keyset/refresh\",\"keyset_keys_metadata_path\":\"https://core-integ.uidapi.com/key/keyset-keys/refresh\",\"salts_metadata_path\":\"https://core-integ.uidapi.com/salt/refresh\",\"services_metadata_path\":\"https://core-integ.uidapi.com/services/refresh\",\"service_links_metadata_path\":\"https://core-integ.uidapi.com/service_links/refresh\",\"optout_metadata_path\":\"https://optout-integ.uidapi.com/optout/refresh\",\"optout_inmem_cache\":false,\"enclave_platform\":null,\"failure_shutdown_wait_hours\":120,\"sharing_token_expiry_seconds\":2592000,\"validate_service_links\":false,\"operator_type\":\"private\",\"java.specification.version\":21,\"sun.jnu.encoding\":\"UTF-8\",\"java.class.path\":\"/app/uid2-operator-5.47.61-alpha-171-SNAPSHOT.jar\",\"java.vm.vendor\":\"Eclipse Adoptium\",\"sun.arch.data.model\":64,\"vertx-config-path\":\"/tmp/final-config.json\",\"java.vendor.url\":\"https://adoptium.net/\",\"user.timezone\":\"Etc/UTC\",\"java.vm.specification.version\":21,\"os.name\":\"Linux\",\"sun.java.launcher\":\"SUN_STANDARD\",\"user.country\":\"US\",\"sun.boot.library.path\":\"/opt/java/openjdk/lib\",\"sun.java.command\":\"/app/uid2-operator-5.47.61-alpha-171-SNAPSHOT.jar\",\"jdk.debug\":\"release\",\"sun.cpu.endian\":\"little\",\"user.home\":\"/root\",\"user.language\":\"en\",\"java.specification.vendor\":\"Oracle Corporation\",\"java.version.date\":\"2025-01-21\",\"java.home\":\"/opt/java/openjdk\",\"file.separator\":\"/\",\"line.separator\":\"\\n\",\"java.vm.specification.vendor\":\"Oracle Corporation\",\"java.specification.name\":\"Java Platform API Specification\",\"logback.configurationFile\":\"./conf/logback-debug.xml\",\"sun.management.compiler\":\"HotSpot 64-Bit Tiered Compilers\",\"java.runtime.version\":\"21.0.6+7-LTS\",\"user.name\":\"root\",\"stdout.encoding\":\"UTF-8\",\"path.separator\":\":\",\"java.security.egd\":\"file:/dev/./urandom\",\"os.version\":\"4.14.256-209.484.amzn2.x86_64\",\"java.runtime.name\":\"OpenJDK Runtime Environment\",\"file.encoding\":\"UTF-8\",\"java.vm.name\":\"OpenJDK 64-Bit Server VM\",\"java.vendor.version\":\"Temurin-21.0.6+7\",\"http_proxy\":\"socks5://127.0.0.1:3305\",\"java.vendor.url.bug\":\"https://github.com/adoptium/adoptium-support/issues\",\"java.io.tmpdir\":\"/tmp\",\"java.version\":\"21.0.6\",\"user.dir\":\"/app\",\"os.arch\":\"amd64\",\"java.vm.specification.name\":\"Java Virtual Machine Specification\",\"native.encoding\":\"UTF-8\",\"java.library.path\":\"/app/lib\",\"java.vm.info\":\"mixed mode, sharing\",\"stderr.encoding\":\"UTF-8\",\"java.vendor\":\"Eclipse Adoptium\",\"java.vm.version\":\"21.0.6+7-LTS\",\"vertx.logger-delegate-factory-class-name\":\"io.vertx.core.logging.SLF4JLogDelegateFactory\",\"sun.io.unicode.encoding\":\"UnicodeLittle\",\"java.class.version\":65.0,\"SHLVL\":1,\"LANGUAGE\":\"en_US:en\",\"JAVA_HOME\":\"/opt/java/openjdk\",\"IMAGE_VERSION\":\"5.47.61-alpha-171-SNAPSHOT-722bdd17\",\"LC_ALL\":\"en_US.UTF-8\",\"JAR_NAME\":\"uid2-operator\",\"OLDPWD\":\"/\",\"PATH\":\"/opt/java/openjdk/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin\",\"JAVA_VERSION\":\"jdk-21.0.6+7\",\"IDENTITY_SCOPE\":\"UID2\",\"ENCLAVE_ENVIRONMENT\":\"aws-nitro\",\"JAR_VERSION\":\"5.47.61-alpha-171-SNAPSHOT\",\"PWD\":\"/app\",\"_\":\"/opt/java/openjdk/bin/java\",\"UID2_CONFIG_SECRET_KEY\":\"uid2-operator-config-key\",\"LANG\":\"en_US.UTF-8\",\"allow_legacy_api\":false,\"runtime_config_store\":{\"type\":\"http\",\"config\":{\"url\":\"https://core-integ.uidapi.com/operator/config\"},\"config_scan_period_ms\":300000},\"identity_token_expires_after_seconds\":86400,\"refresh_token_expires_after_seconds\":2592000,\"refresh_identity_token_after_seconds\":3600,\"optout_base_url\":\"https://optout-integ.uidapi.com\",\"core_base_url\":\"https://core-integ.uidapi.com\",\"environment\":\"integ\",\"debug_mode\":true}","logger_name":"com.uid2.operator.service.ConfigService","thread_name":"vert.x-eventloop-thread-0","level":"ERROR","level_value":40000} \ No newline at end of file diff --git a/src/main/java/com/uid2/operator/service/ConfigValidatorUtil.java b/src/main/java/com/uid2/operator/service/ConfigValidatorUtil.java index e20e36396..1ef63977e 100644 --- a/src/main/java/com/uid2/operator/service/ConfigValidatorUtil.java +++ b/src/main/java/com/uid2/operator/service/ConfigValidatorUtil.java @@ -9,8 +9,6 @@ public class ConfigValidatorUtil { private static final Logger logger = LoggerFactory.getLogger(ConfigValidatorUtil.class); - public static final String VALUES_ARE_NULL = "ABU ADDED One or more of the following required config values are null: "; - public static Boolean validateIdentityRefreshTokens(Integer identityExpiresAfter, Integer refreshExpiresAfter, Integer refreshIdentityAfter) { boolean isValid = true; From dfe01aef44b38884662bb9d2a1dffff4a23dda34 Mon Sep 17 00:00:00 2001 From: abuabraham-ttd Date: Fri, 21 Feb 2025 15:21:39 -0800 Subject: [PATCH 62/81] update euid --- src/main/java/com/uid2/operator/service/ConfigService.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/com/uid2/operator/service/ConfigService.java b/src/main/java/com/uid2/operator/service/ConfigService.java index a5db414f2..98b73c97d 100644 --- a/src/main/java/com/uid2/operator/service/ConfigService.java +++ b/src/main/java/com/uid2/operator/service/ConfigService.java @@ -72,4 +72,3 @@ private JsonObject configValidationHandler(JsonObject config) { return config; } } -"core_api_token\":\"UID2-O-I-18-Fk6QJg.ochtgQKdO6Z0N3AkuBftWLiItOKP5CNRk9QsY=\",\"storage_mock\":false,\"optout_s3_bucket\":null,\"optout_s3_folder\":\"uid-optout-integ/\",\"optout_s3_path_compat\":false,\"optout_data_dir\":\"/opt/uid2/operator-optout/\",\"optout_api_token\":\"UID2-O-I-18-Fk6QJg.ochtgQKdO6Z0N3AkuBftWLiItOKP5CNRk9QsY=\",\"optout_api_uri\":\"https://optout-integ.uidapi.com/optout/replicate\",\"optout_bloom_filter_size\":8192,\"optout_delta_rotate_interval\":300,\"optout_delta_backtrack_in_days\":1,\"optout_partition_interval\":86400,\"optout_max_partitions\":30,\"optout_heap_default_capacity\":8192,\"cloud_download_threads\":8,\"cloud_upload_threads\":2,\"cloud_refresh_interval\":60,\"sites_metadata_path\":\"https://core-integ.uidapi.com/sites/refresh\",\"clients_metadata_path\":\"https://core-integ.uidapi.com/clients/refresh\",\"client_side_keypairs_metadata_path\":\"https://core-integ.uidapi.com/client_side_keypairs/refresh\",\"keysets_metadata_path\":\"https://core-integ.uidapi.com/key/keyset/refresh\",\"keyset_keys_metadata_path\":\"https://core-integ.uidapi.com/key/keyset-keys/refresh\",\"salts_metadata_path\":\"https://core-integ.uidapi.com/salt/refresh\",\"services_metadata_path\":\"https://core-integ.uidapi.com/services/refresh\",\"service_links_metadata_path\":\"https://core-integ.uidapi.com/service_links/refresh\",\"optout_metadata_path\":\"https://optout-integ.uidapi.com/optout/refresh\",\"optout_inmem_cache\":false,\"enclave_platform\":null,\"failure_shutdown_wait_hours\":120,\"sharing_token_expiry_seconds\":2592000,\"validate_service_links\":false,\"operator_type\":\"private\",\"java.specification.version\":21,\"sun.jnu.encoding\":\"UTF-8\",\"java.class.path\":\"/app/uid2-operator-5.47.61-alpha-171-SNAPSHOT.jar\",\"java.vm.vendor\":\"Eclipse Adoptium\",\"sun.arch.data.model\":64,\"vertx-config-path\":\"/tmp/final-config.json\",\"java.vendor.url\":\"https://adoptium.net/\",\"user.timezone\":\"Etc/UTC\",\"java.vm.specification.version\":21,\"os.name\":\"Linux\",\"sun.java.launcher\":\"SUN_STANDARD\",\"user.country\":\"US\",\"sun.boot.library.path\":\"/opt/java/openjdk/lib\",\"sun.java.command\":\"/app/uid2-operator-5.47.61-alpha-171-SNAPSHOT.jar\",\"jdk.debug\":\"release\",\"sun.cpu.endian\":\"little\",\"user.home\":\"/root\",\"user.language\":\"en\",\"java.specification.vendor\":\"Oracle Corporation\",\"java.version.date\":\"2025-01-21\",\"java.home\":\"/opt/java/openjdk\",\"file.separator\":\"/\",\"line.separator\":\"\\n\",\"java.vm.specification.vendor\":\"Oracle Corporation\",\"java.specification.name\":\"Java Platform API Specification\",\"logback.configurationFile\":\"./conf/logback-debug.xml\",\"sun.management.compiler\":\"HotSpot 64-Bit Tiered Compilers\",\"java.runtime.version\":\"21.0.6+7-LTS\",\"user.name\":\"root\",\"stdout.encoding\":\"UTF-8\",\"path.separator\":\":\",\"java.security.egd\":\"file:/dev/./urandom\",\"os.version\":\"4.14.256-209.484.amzn2.x86_64\",\"java.runtime.name\":\"OpenJDK Runtime Environment\",\"file.encoding\":\"UTF-8\",\"java.vm.name\":\"OpenJDK 64-Bit Server VM\",\"java.vendor.version\":\"Temurin-21.0.6+7\",\"http_proxy\":\"socks5://127.0.0.1:3305\",\"java.vendor.url.bug\":\"https://github.com/adoptium/adoptium-support/issues\",\"java.io.tmpdir\":\"/tmp\",\"java.version\":\"21.0.6\",\"user.dir\":\"/app\",\"os.arch\":\"amd64\",\"java.vm.specification.name\":\"Java Virtual Machine Specification\",\"native.encoding\":\"UTF-8\",\"java.library.path\":\"/app/lib\",\"java.vm.info\":\"mixed mode, sharing\",\"stderr.encoding\":\"UTF-8\",\"java.vendor\":\"Eclipse Adoptium\",\"java.vm.version\":\"21.0.6+7-LTS\",\"vertx.logger-delegate-factory-class-name\":\"io.vertx.core.logging.SLF4JLogDelegateFactory\",\"sun.io.unicode.encoding\":\"UnicodeLittle\",\"java.class.version\":65.0,\"SHLVL\":1,\"LANGUAGE\":\"en_US:en\",\"JAVA_HOME\":\"/opt/java/openjdk\",\"IMAGE_VERSION\":\"5.47.61-alpha-171-SNAPSHOT-722bdd17\",\"LC_ALL\":\"en_US.UTF-8\",\"JAR_NAME\":\"uid2-operator\",\"OLDPWD\":\"/\",\"PATH\":\"/opt/java/openjdk/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin\",\"JAVA_VERSION\":\"jdk-21.0.6+7\",\"IDENTITY_SCOPE\":\"UID2\",\"ENCLAVE_ENVIRONMENT\":\"aws-nitro\",\"JAR_VERSION\":\"5.47.61-alpha-171-SNAPSHOT\",\"PWD\":\"/app\",\"_\":\"/opt/java/openjdk/bin/java\",\"UID2_CONFIG_SECRET_KEY\":\"uid2-operator-config-key\",\"LANG\":\"en_US.UTF-8\",\"allow_legacy_api\":false,\"runtime_config_store\":{\"type\":\"http\",\"config\":{\"url\":\"https://core-integ.uidapi.com/operator/config\"},\"config_scan_period_ms\":300000},\"identity_token_expires_after_seconds\":86400,\"refresh_token_expires_after_seconds\":2592000,\"refresh_identity_token_after_seconds\":3600,\"optout_base_url\":\"https://optout-integ.uidapi.com\",\"core_base_url\":\"https://core-integ.uidapi.com\",\"environment\":\"integ\",\"debug_mode\":true}","logger_name":"com.uid2.operator.service.ConfigService","thread_name":"vert.x-eventloop-thread-0","level":"ERROR","level_value":40000} \ No newline at end of file From 982fec17516c1752fe22707dbb8a1914376e8854 Mon Sep 17 00:00:00 2001 From: abuabraham-ttd Date: Fri, 21 Feb 2025 15:22:17 -0800 Subject: [PATCH 63/81] update euid --- .../java/com/uid2/operator/service/ConfigValidatorUtil.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/com/uid2/operator/service/ConfigValidatorUtil.java b/src/main/java/com/uid2/operator/service/ConfigValidatorUtil.java index 1ef63977e..2fbf874e4 100644 --- a/src/main/java/com/uid2/operator/service/ConfigValidatorUtil.java +++ b/src/main/java/com/uid2/operator/service/ConfigValidatorUtil.java @@ -9,6 +9,8 @@ public class ConfigValidatorUtil { private static final Logger logger = LoggerFactory.getLogger(ConfigValidatorUtil.class); + public static final String VALUES_ARE_NULL = "One or more of the following required config values are null: "; + public static Boolean validateIdentityRefreshTokens(Integer identityExpiresAfter, Integer refreshExpiresAfter, Integer refreshIdentityAfter) { boolean isValid = true; From a97dfcb190383d5f058853880aa88a474fcc00e1 Mon Sep 17 00:00:00 2001 From: Release Workflow Date: Fri, 21 Feb 2025 23:42:20 +0000 Subject: [PATCH 64/81] [CI Pipeline] Released Snapshot version: 5.47.65-alpha-177-SNAPSHOT --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 00446d717..0cd7e66c0 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.uid2 uid2-operator - 5.47.64-alpha-176-SNAPSHOT + 5.47.65-alpha-177-SNAPSHOT UTF-8 From 4ab5aacaeb412b7ea27ce29f02415751fc80a454 Mon Sep 17 00:00:00 2001 From: abuabraham-ttd Date: Fri, 21 Feb 2025 15:51:07 -0800 Subject: [PATCH 65/81] update shared action --- .github/workflows/run-e2e-tests-on-operator.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run-e2e-tests-on-operator.yaml b/.github/workflows/run-e2e-tests-on-operator.yaml index 16beced41..e57756c1b 100644 --- a/.github/workflows/run-e2e-tests-on-operator.yaml +++ b/.github/workflows/run-e2e-tests-on-operator.yaml @@ -106,7 +106,7 @@ on: jobs: e2e-test: name: E2E Test - uses: IABTechLab/uid2-shared-actions/.github/workflows/shared-run-e2e-tests.yaml@kcc-fix-e2e + uses: IABTechLab/uid2-shared-actions/.github/workflows/shared-run-e2e-tests.yaml@v3 with: operator_type: ${{ inputs.operator_type }} operator_image_version: ${{ inputs.operator_image_version }} From 64730a3d248b0b6ecc8e6e0d0bc7e202a160a996 Mon Sep 17 00:00:00 2001 From: abuabraham-ttd Date: Fri, 21 Feb 2025 16:33:10 -0800 Subject: [PATCH 66/81] Try with minimal config --- scripts/aws/conf/euid-integ-config.json | 35 +++---------------------- scripts/aws/conf/uid2-integ-config.json | 30 +-------------------- 2 files changed, 5 insertions(+), 60 deletions(-) diff --git a/scripts/aws/conf/euid-integ-config.json b/scripts/aws/conf/euid-integ-config.json index 2d7f89415..9e82cee9d 100644 --- a/scripts/aws/conf/euid-integ-config.json +++ b/scripts/aws/conf/euid-integ-config.json @@ -1,42 +1,15 @@ { - "service_verbose": true, - "service_instances": 4, - "core_s3_bucket": null, - "core_attest_url": "https://core.integ.euid.eu/attest", - "core_api_token": null, - "storage_mock": false, - "optout_s3_bucket": null, - "optout_s3_folder": "optout/", - "optout_s3_path_compat": false, - "optout_data_dir": "/opt/uid2/operator-optout/", - "optout_api_token": null, - "optout_api_uri": "https://optout.integ.euid.eu/optout/replicate", - "optout_bloom_filter_size": 8192, - "optout_delta_rotate_interval": 300, - "optout_delta_backtrack_in_days": 1, - "optout_partition_interval": 86400, - "optout_max_partitions": 30, - "optout_heap_default_capacity": 8192, - "cloud_download_threads": 8, - "cloud_upload_threads": 2, - "cloud_refresh_interval": 60, "sites_metadata_path": "https://core.integ.euid.eu/sites/refresh", "clients_metadata_path": "https://core.integ.euid.eu/clients/refresh", - "client_side_keypairs_metadata_path": "https://core.integ.euid.eu/client_side_keypairs/refresh", "keysets_metadata_path": "https://core.integ.euid.eu/key/keyset/refresh", "keyset_keys_metadata_path": "https://core.integ.euid.eu/key/keyset-keys/refresh", + "client_side_keypairs_metadata_path": "https://core.integ.euid.eu/client_side_keypairs/refresh", "salts_metadata_path": "https://core.integ.euid.eu/salt/refresh", "services_metadata_path": "https://core.integ.euid.eu/services/refresh", "service_links_metadata_path": "https://core.integ.euid.eu/service_links/refresh", "optout_metadata_path": "https://optout.integ.euid.eu/optout/refresh", - "optout_inmem_cache": false, - "enclave_platform": "aws-nitro", - "failure_shutdown_wait_hours": 120, - "sharing_token_expiry_seconds": 2592000, - "validate_service_links": false, - "identity_token_expires_after_seconds": 86400, - "refresh_token_expires_after_seconds": 2592000, - "refresh_identity_token_after_seconds": 3600, - "operator_type": "private", + "core_attest_url": "https://core.integ.euid.eu/attest", + "optout_api_uri": "https://optout.integ.euid.eu/optout/replicate", + "optout_s3_folder": "optout/", "allow_legacy_api": false } \ No newline at end of file diff --git a/scripts/aws/conf/uid2-integ-config.json b/scripts/aws/conf/uid2-integ-config.json index 9c2442524..8ab5b3e7b 100644 --- a/scripts/aws/conf/uid2-integ-config.json +++ b/scripts/aws/conf/uid2-integ-config.json @@ -1,25 +1,6 @@ { - "service_verbose": true, - "service_instances": 4, - "core_s3_bucket": null, "core_attest_url": "https://core-integ.uidapi.com/attest", - "core_api_token": null, - "storage_mock": false, - "optout_s3_bucket": null, - "optout_s3_folder": "uid-optout-integ/", - "optout_s3_path_compat": false, - "optout_data_dir": "/opt/uid2/operator-optout/", - "optout_api_token": null, "optout_api_uri": "https://optout-integ.uidapi.com/optout/replicate", - "optout_bloom_filter_size": 8192, - "optout_delta_rotate_interval": 300, - "optout_delta_backtrack_in_days": 1, - "optout_partition_interval": 86400, - "optout_max_partitions": 30, - "optout_heap_default_capacity": 8192, - "cloud_download_threads": 8, - "cloud_upload_threads": 2, - "cloud_refresh_interval": 60, "sites_metadata_path": "https://core-integ.uidapi.com/sites/refresh", "clients_metadata_path": "https://core-integ.uidapi.com/clients/refresh", "client_side_keypairs_metadata_path": "https://core-integ.uidapi.com/client_side_keypairs/refresh", @@ -29,14 +10,5 @@ "services_metadata_path": "https://core-integ.uidapi.com/services/refresh", "service_links_metadata_path": "https://core-integ.uidapi.com/service_links/refresh", "optout_metadata_path": "https://optout-integ.uidapi.com/optout/refresh", - "optout_inmem_cache": false, - "enclave_platform": "aws-nitro", - "failure_shutdown_wait_hours": 120, - "sharing_token_expiry_seconds": 2592000, - "validate_service_links": false, - "identity_token_expires_after_seconds": 86400, - "refresh_token_expires_after_seconds": 2592000, - "refresh_identity_token_after_seconds": 3600, - "operator_type": "private", - "allow_legacy_api": false + "optout_s3_folder": "uid-optout-integ/" } From 192ffd8f652320d19fa0ab506b26753795fa680c Mon Sep 17 00:00:00 2001 From: Release Workflow Date: Sat, 22 Feb 2025 00:34:25 +0000 Subject: [PATCH 67/81] [CI Pipeline] Released Snapshot version: 5.47.66-alpha-178-SNAPSHOT --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0cd7e66c0..800b0a1e5 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.uid2 uid2-operator - 5.47.65-alpha-177-SNAPSHOT + 5.47.66-alpha-178-SNAPSHOT UTF-8 From 5dfd7c7e0acb56b2cb09a0892b0caa0fa078b356 Mon Sep 17 00:00:00 2001 From: Release Workflow Date: Sat, 22 Feb 2025 00:36:30 +0000 Subject: [PATCH 68/81] [CI Pipeline] Released Snapshot version: 5.47.67-alpha-213-SNAPSHOT --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 800b0a1e5..3d4c2b9a2 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.uid2 uid2-operator - 5.47.66-alpha-178-SNAPSHOT + 5.47.67-alpha-213-SNAPSHOT UTF-8 From 20fc7cd5289ad3942e764ad17d2ccaf867cabbc5 Mon Sep 17 00:00:00 2001 From: Release Workflow Date: Sat, 22 Feb 2025 00:45:42 +0000 Subject: [PATCH 69/81] [CI Pipeline] Released Snapshot version: 5.47.68-alpha-214-SNAPSHOT --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3d4c2b9a2..ca6615cb4 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.uid2 uid2-operator - 5.47.67-alpha-213-SNAPSHOT + 5.47.68-alpha-214-SNAPSHOT UTF-8 From cfb5082d28350787c5a0a5a71100a27dc4fb9d0f Mon Sep 17 00:00:00 2001 From: Release Workflow Date: Sat, 22 Feb 2025 00:59:06 +0000 Subject: [PATCH 70/81] [CI Pipeline] Released Snapshot version: 5.47.69-alpha-206-SNAPSHOT --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ca6615cb4..aeedfcb5a 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.uid2 uid2-operator - 5.47.68-alpha-214-SNAPSHOT + 5.47.69-alpha-206-SNAPSHOT UTF-8 From aa841bfc84acf5a88e978b57c9f6e4ea1c395495 Mon Sep 17 00:00:00 2001 From: Release Workflow Date: Sat, 22 Feb 2025 01:04:19 +0000 Subject: [PATCH 71/81] [CI Pipeline] Released Snapshot version: 5.47.70-alpha-207-SNAPSHOT --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index aeedfcb5a..9bebd4c5e 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.uid2 uid2-operator - 5.47.69-alpha-206-SNAPSHOT + 5.47.70-alpha-207-SNAPSHOT UTF-8 From 0a38ebb5f4609307cde5fbae5144fb23e3321418 Mon Sep 17 00:00:00 2001 From: abuabraham-ttd Date: Fri, 21 Feb 2025 17:25:17 -0800 Subject: [PATCH 72/81] Try with minimal config --- .../confidential_compute.cpython-313.pyc | Bin 0 -> 12635 bytes scripts/aws/ec2.py | 4 ++-- scripts/confidential_compute.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) create mode 100644 scripts/__pycache__/confidential_compute.cpython-313.pyc diff --git a/scripts/__pycache__/confidential_compute.cpython-313.pyc b/scripts/__pycache__/confidential_compute.cpython-313.pyc new file mode 100644 index 0000000000000000000000000000000000000000..d9a6d2606d4156081fa2c2918b40a469ae3d6208 GIT binary patch literal 12635 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 None: """ Starts the SOCKS proxy service. """ - command = ["sockd"] - self.run_command(command, separate_process=True) + command = ["sockd", "-D"] + self.run_command(command) def __get_secret_name_from_userdata(self) -> str: """Extracts the secret name from EC2 user data.""" diff --git a/scripts/confidential_compute.py b/scripts/confidential_compute.py index b84cd64ee..bb77fb39a 100644 --- a/scripts/confidential_compute.py +++ b/scripts/confidential_compute.py @@ -144,7 +144,7 @@ def run_command(command, separate_process=False): if separate_process: subprocess.Popen(command, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL) else: - subprocess.run(command,check=True,text=True,capture_output=False) + subprocess.run(command,check=True,text=True) except Exception as e: logging.error(f"Failed to run command: {e}", exc_info=True) raise RuntimeError (f"Failed to start {' '.join(command)} ") \ No newline at end of file From c3ef2030737ab330365521422c542ac23ccca065 Mon Sep 17 00:00:00 2001 From: abuabraham-ttd Date: Fri, 21 Feb 2025 22:14:14 -0800 Subject: [PATCH 73/81] Making Azure GCP behave same way --- scripts/azure-cc/azureEntryPoint.py | 23 ++++++++++--------- scripts/azure-cc/conf/integ-uid2-config.json | 24 ++++++++++---------- scripts/azure-cc/conf/prod-uid2-config.json | 24 ++++++++++---------- 3 files changed, 36 insertions(+), 35 deletions(-) diff --git a/scripts/azure-cc/azureEntryPoint.py b/scripts/azure-cc/azureEntryPoint.py index 76db6e0bf..d061d03af 100644 --- a/scripts/azure-cc/azureEntryPoint.py +++ b/scripts/azure-cc/azureEntryPoint.py @@ -21,6 +21,8 @@ class AzureEntryPoint(ConfidentialCompute): env_name = os.getenv("DEPLOYMENT_ENVIRONMENT") jar_name = os.getenv("JAR_NAME", "default-jar-name") jar_version = os.getenv("JAR_VERSION", "default-jar-version") + default_core_endpoint = f"https://core-{env_name}.uidapi.com" + default_optout_endpoint = f"https://optout-{env_name}.uidapi.com" FINAL_CONFIG = "/tmp/final-config.json" @@ -50,16 +52,14 @@ def __create_final_config(self): logging.error(f"Failed to create {AzureEntryPoint.FINAL_CONFIG} with error: {e}") sys.exit(1) - if self.configs["core_base_url"] and self.configs["optout_base_url"] and AzureEntryPoint.env_name != 'prod': - logging.info(f"-- replacing URLs by {self.configs["core_base_url"]} and {self.configs["optout_base_url"]}") - with open(AzureEntryPoint.FINAL_CONFIG, "r") as file: - config = file.read() - - config = config.replace("https://core-integ.uidapi.com", self.configs["core_base_url"]) - config = config.replace("https://optout-integ.uidapi.com", self.configs["optout_base_url"]) + logging.info(f"-- replacing URLs by {self.configs["core_base_url"]} and {self.configs["optout_base_url"]}") + with open(AzureEntryPoint.FINAL_CONFIG, "r") as file: + config = file.read() - with open(AzureEntryPoint.FINAL_CONFIG, "w") as file: - file.write(config) + config = config.replace("https://core.uidapi.com", self.configs["core_base_url"]) + config = config.replace("https://optout.uidapi.com", self.configs["optout_base_url"]) + with open(AzureEntryPoint.FINAL_CONFIG, "w") as file: + file.write(config) with open(AzureEntryPoint.FINAL_CONFIG, "r") as file: logging.info(file.read()) @@ -81,11 +81,12 @@ def __set_operator_key(self): def _set_confidential_config(self, secret_identifier: str = None): + """Builds and sets ConfidentialComputeConfig""" self.configs["skip_validations"] = os.getenv("SKIP_VALIDATIONS", "false").lower() == "true" self.configs["debug_mode"] = os.getenv("DEBUG_MODE", "false").lower() == "true" self.configs["environment"] = AzureEntryPoint.env_name - self.configs["core_base_url"] = os.getenv("CORE_BASE_URL") - self.configs["optout_base_url"] = os.getenv("OPTOUT_BASE_URL") + self.configs["core_base_url"] = os.getenv("CORE_BASE_URL") if os.getenv("CORE_BASE_URL") and AzureEntryPoint.env_name == "integ" else AzureEntryPoint.default_core_endpoint + self.configs["optout_base_url"] = os.getenv("OPTOUT_BASE_URL") if os.getenv("OPTOUT_BASE_URL") and AzureEntryPoint.env_name == "integ" else AzureEntryPoint.default_optout_endpoint self.__set_operator_key() def __run_operator(self): diff --git a/scripts/azure-cc/conf/integ-uid2-config.json b/scripts/azure-cc/conf/integ-uid2-config.json index e3d34d846..569304e35 100644 --- a/scripts/azure-cc/conf/integ-uid2-config.json +++ b/scripts/azure-cc/conf/integ-uid2-config.json @@ -1,20 +1,20 @@ { - "sites_metadata_path": "https://core-integ.uidapi.com/sites/refresh", - "clients_metadata_path": "https://core-integ.uidapi.com/clients/refresh", - "keysets_metadata_path": "https://core-integ.uidapi.com/key/keyset/refresh", - "keyset_keys_metadata_path": "https://core-integ.uidapi.com/key/keyset-keys/refresh", - "client_side_keypairs_metadata_path": "https://core-integ.uidapi.com/client_side_keypairs/refresh", - "salts_metadata_path": "https://core-integ.uidapi.com/salt/refresh", - "services_metadata_path": "https://core-integ.uidapi.com/services/refresh", - "service_links_metadata_path": "https://core-integ.uidapi.com/service_links/refresh", - "optout_metadata_path": "https://optout-integ.uidapi.com/optout/refresh", - "core_attest_url": "https://core-integ.uidapi.com/attest", - "optout_api_uri": "https://optout-integ.uidapi.com/optout/replicate", + "sites_metadata_path": "https://core.uidapi.com/sites/refresh", + "clients_metadata_path": "https://core.uidapi.com/clients/refresh", + "keysets_metadata_path": "https://core.uidapi.com/key/keyset/refresh", + "keyset_keys_metadata_path": "https://core.uidapi.com/key/keyset-keys/refresh", + "client_side_keypairs_metadata_path": "https://core.uidapi.com/client_side_keypairs/refresh", + "salts_metadata_path": "https://core.uidapi.com/salt/refresh", + "services_metadata_path": "https://core.uidapi.com/services/refresh", + "service_links_metadata_path": "https://core.uidapi.com/service_links/refresh", + "optout_metadata_path": "https://optout.uidapi.com/optout/refresh", + "core_attest_url": "https://core.uidapi.com/attest", + "optout_api_uri": "https://optout.uidapi.com/optout/replicate", "optout_s3_folder": "uid-optout-integ/", "runtime_config_store": { "type": "http", "config" : { - "url": "https://core-integ.uidapi.com/operator/config" + "url": "https://core.uidapi.com/operator/config" }, "config_scan_period_ms": 300000 } diff --git a/scripts/azure-cc/conf/prod-uid2-config.json b/scripts/azure-cc/conf/prod-uid2-config.json index bccbc2444..9c4eba18a 100644 --- a/scripts/azure-cc/conf/prod-uid2-config.json +++ b/scripts/azure-cc/conf/prod-uid2-config.json @@ -1,21 +1,21 @@ { - "sites_metadata_path": "https://core-prod.uidapi.com/sites/refresh", - "clients_metadata_path": "https://core-prod.uidapi.com/clients/refresh", - "keysets_metadata_path": "https://core-prod.uidapi.com/key/keyset/refresh", - "keyset_keys_metadata_path": "https://core-prod.uidapi.com/key/keyset-keys/refresh", - "client_side_keypairs_metadata_path": "https://core-prod.uidapi.com/client_side_keypairs/refresh", - "salts_metadata_path": "https://core-prod.uidapi.com/salt/refresh", - "services_metadata_path": "https://core-prod.uidapi.com/services/refresh", - "service_links_metadata_path": "https://core-prod.uidapi.com/service_links/refresh", - "optout_metadata_path": "https://optout-prod.uidapi.com/optout/refresh", - "core_attest_url": "https://core-prod.uidapi.com/attest", - "optout_api_uri": "https://optout-prod.uidapi.com/optout/replicate", + "sites_metadata_path": "https://core.uidapi.com/sites/refresh", + "clients_metadata_path": "https://core.uidapi.com/clients/refresh", + "keysets_metadata_path": "https://core.uidapi.com/key/keyset/refresh", + "keyset_keys_metadata_path": "https://core.uidapi.com/key/keyset-keys/refresh", + "client_side_keypairs_metadata_path": "https://core.uidapi.com/client_side_keypairs/refresh", + "salts_metadata_path": "https://core.uidapi.com/salt/refresh", + "services_metadata_path": "https://core.uidapi.com/services/refresh", + "service_links_metadata_path": "https://core.uidapi.com/service_links/refresh", + "optout_metadata_path": "https://optout.uidapi.com/optout/refresh", + "core_attest_url": "https://core.uidapi.com/attest", + "optout_api_uri": "https://optout.uidapi.com/optout/replicate", "optout_s3_folder": "optout-v2/", "identity_token_expires_after_seconds": 259200, "runtime_config_store": { "type": "http", "config" : { - "url": "https://core-prod.uidapi.com/operator/config" + "url": "https://core.uidapi.com/operator/config" }, "config_scan_period_ms": 300000 } From e9f6691d73c288aad3b61e95d241742baca368c7 Mon Sep 17 00:00:00 2001 From: Release Workflow Date: Sat, 22 Feb 2025 06:15:17 +0000 Subject: [PATCH 74/81] [CI Pipeline] Released Snapshot version: 5.47.71-alpha-215-SNAPSHOT --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9bebd4c5e..582bc75b5 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.uid2 uid2-operator - 5.47.70-alpha-207-SNAPSHOT + 5.47.71-alpha-215-SNAPSHOT UTF-8 From 0960ee6f94b578d7b54a345b8e054de52f80d4fc Mon Sep 17 00:00:00 2001 From: abuabraham-ttd Date: Fri, 21 Feb 2025 22:29:42 -0800 Subject: [PATCH 75/81] Making Azure GCP behave same way --- scripts/azure-cc/azureEntryPoint.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/azure-cc/azureEntryPoint.py b/scripts/azure-cc/azureEntryPoint.py index d061d03af..ffa49b3c7 100644 --- a/scripts/azure-cc/azureEntryPoint.py +++ b/scripts/azure-cc/azureEntryPoint.py @@ -21,8 +21,8 @@ class AzureEntryPoint(ConfidentialCompute): env_name = os.getenv("DEPLOYMENT_ENVIRONMENT") jar_name = os.getenv("JAR_NAME", "default-jar-name") jar_version = os.getenv("JAR_VERSION", "default-jar-version") - default_core_endpoint = f"https://core-{env_name}.uidapi.com" - default_optout_endpoint = f"https://optout-{env_name}.uidapi.com" + default_core_endpoint = f"https://core-{env_name}.uidapi.com".lower() + default_optout_endpoint = f"https://optout-{env_name}.uidapi.com".lower() FINAL_CONFIG = "/tmp/final-config.json" From dab022bd953143d1d3d8c688827e68f450939b63 Mon Sep 17 00:00:00 2001 From: abuabraham-ttd Date: Fri, 21 Feb 2025 22:50:41 -0800 Subject: [PATCH 76/81] remove --- .../confidential_compute.cpython-313.pyc | Bin 12635 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 scripts/__pycache__/confidential_compute.cpython-313.pyc diff --git a/scripts/__pycache__/confidential_compute.cpython-313.pyc b/scripts/__pycache__/confidential_compute.cpython-313.pyc deleted file mode 100644 index d9a6d2606d4156081fa2c2918b40a469ae3d6208..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12635 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 Date: Fri, 21 Feb 2025 22:51:45 -0800 Subject: [PATCH 77/81] remove --- scripts/aws/entrypoint.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/scripts/aws/entrypoint.sh b/scripts/aws/entrypoint.sh index 731bbdde1..2a5c39e31 100755 --- a/scripts/aws/entrypoint.sh +++ b/scripts/aws/entrypoint.sh @@ -23,9 +23,6 @@ echo "Starting vsock proxy..." /usr/sbin/syslog-ng --verbose -# Send request and check response -curl -s -x socks5h://127.0.0.1:3305 "https://example.com" - build_parameterized_config() { curl -s -f -o "${PARAMETERIZED_CONFIG}" -x socks5h://127.0.0.1:3305 http://127.0.0.1:27015/getConfig REQUIRED_KEYS=("optout_base_url" "core_base_url" "core_api_token" "optout_api_token" "environment") From 3218db2c8446e563a4ff74c6ac0c21841bd12ecd Mon Sep 17 00:00:00 2001 From: abuabraham-ttd Date: Sat, 22 Feb 2025 08:40:08 -0800 Subject: [PATCH 78/81] Fix EUID --- scripts/aws/entrypoint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/aws/entrypoint.sh b/scripts/aws/entrypoint.sh index 2a5c39e31..7a19df36f 100755 --- a/scripts/aws/entrypoint.sh +++ b/scripts/aws/entrypoint.sh @@ -66,7 +66,7 @@ build_operator_config() { #Allow override of base URL in non-prod environments CORE_PATTERN="https://core.*uidapi.com" OPTOUT_PATTERN="https://optout.*uidapi.com" - if [[ "$DEPLOYMENT_ENVIRONMENT" == "euid" ]]; then + if [[ "$IDENTITY_SCOPE_LOWER" == "euid" ]]; then CORE_PATTERN="https://core.*euid.eu" OPTOUT_PATTERN="https://optout.*euid.eu" fi From 6b474121fcd3a2f0d92304922a704b59703f36cb Mon Sep 17 00:00:00 2001 From: Release Workflow Date: Sat, 22 Feb 2025 16:40:51 +0000 Subject: [PATCH 79/81] [CI Pipeline] Released Snapshot version: 5.47.72-alpha-179-SNAPSHOT --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 582bc75b5..295fe30d8 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.uid2 uid2-operator - 5.47.71-alpha-215-SNAPSHOT + 5.47.72-alpha-179-SNAPSHOT UTF-8 From 6b0342e24b3f3826b4b6864b9ac6d7e195ba947a Mon Sep 17 00:00:00 2001 From: abuabraham-ttd Date: Mon, 24 Feb 2025 07:58:17 -0800 Subject: [PATCH 80/81] remove cat --- scripts/aws/entrypoint.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/scripts/aws/entrypoint.sh b/scripts/aws/entrypoint.sh index 7a19df36f..4d67a14fa 100755 --- a/scripts/aws/entrypoint.sh +++ b/scripts/aws/entrypoint.sh @@ -93,8 +93,6 @@ cd /app # -- start operator echo "Starting Java application..." -cat "${OPERATOR_CONFIG}" - java \ -XX:MaxRAMPercentage=95 -XX:-UseCompressedOops -XX:+PrintFlagsFinal \ -Djava.security.egd=file:/dev/./urandom \ From e3e14bbd5834cc62de4fd44c33bc03ec09e00143 Mon Sep 17 00:00:00 2001 From: Release Workflow Date: Mon, 24 Feb 2025 16:00:38 +0000 Subject: [PATCH 81/81] [CI Pipeline] Released Snapshot version: 5.47.73-alpha-180-SNAPSHOT --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 295fe30d8..00fac30af 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.uid2 uid2-operator - 5.47.72-alpha-179-SNAPSHOT + 5.47.73-alpha-180-SNAPSHOT UTF-8