From 0019e088008fc9d3bf0a560aad133b6827f64679 Mon Sep 17 00:00:00 2001 From: Katherine Chen Date: Tue, 4 Feb 2025 14:40:03 +1100 Subject: [PATCH 1/5] Add azure-cc-aks protocol --- src/main/java/com/uid2/operator/Main.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/uid2/operator/Main.java b/src/main/java/com/uid2/operator/Main.java index cc71114db..44b1bbe79 100644 --- a/src/main/java/com/uid2/operator/Main.java +++ b/src/main/java/com/uid2/operator/Main.java @@ -486,6 +486,7 @@ private Map.Entry createUidClients(Vertx vertx, private AttestationResponseHandler getAttestationTokenRetriever(Vertx vertx, String attestationUrl, String clientApiToken, Handler> responseWatcher) throws Exception { String enclavePlatform = this.config.getString(Const.Config.EnclavePlatformProp); String operatorType = this.config.getString(Const.Config.OperatorTypeProp, ""); + String maaServerBaseUrl = this.config.getString(Const.Config.MaaServerBaseUrlProp, "https://sharedeus.eus.attest.azure.net"); IAttestationProvider attestationProvider; switch (enclavePlatform) { @@ -508,7 +509,10 @@ private AttestationResponseHandler getAttestationTokenRetriever(Vertx vertx, Str break; case "azure-cc": LOGGER.info("creating uid core client with azure cc attestation protocol"); - String maaServerBaseUrl = this.config.getString(Const.Config.MaaServerBaseUrlProp, "https://sharedeus.eus.attest.azure.net"); + attestationProvider = AttestationFactory.getAzureCCAttestation(maaServerBaseUrl); + break; + case "azure-cc-aks": + LOGGER.info("creating uid core client with azure cc aks attestation protocol"); attestationProvider = AttestationFactory.getAzureCCAttestation(maaServerBaseUrl); break; default: From 21c462afe50fef06f9d18c3969e36c97b1d66d73 Mon Sep 17 00:00:00 2001 From: Katherine Chen Date: Tue, 4 Feb 2025 16:15:25 +1100 Subject: [PATCH 2/5] Comment out `validate_url` --- scripts/confidential_compute.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/confidential_compute.py b/scripts/confidential_compute.py index e156758ee..933384f28 100644 --- a/scripts/confidential_compute.py +++ b/scripts/confidential_compute.py @@ -113,8 +113,8 @@ def validate_connectivity() -> None: if self.configs.get("debug_mode") and environment == "prod": raise InvalidConfigValue(self.__class__.__name__, "debug_mode") - validate_url("core_base_url", environment) - validate_url("optout_base_url", environment) + # validate_url("core_base_url", environment) + # validate_url("optout_base_url", environment) validate_operator_key() validate_connectivity() logging.info("Completed static validation of confidential compute config values") From 41d02b37e59d8bd6b70c9dc8c302db476c6931fc Mon Sep 17 00:00:00 2001 From: Katherine Chen Date: Tue, 4 Feb 2025 16:34:31 +1100 Subject: [PATCH 3/5] Comment out validate_operator_key --- 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 933384f28..6da0de1ec 100644 --- a/scripts/confidential_compute.py +++ b/scripts/confidential_compute.py @@ -115,7 +115,7 @@ def validate_connectivity() -> None: # validate_url("core_base_url", environment) # validate_url("optout_base_url", environment) - validate_operator_key() + # validate_operator_key() validate_connectivity() logging.info("Completed static validation of confidential compute config values") From 8cdb394df55e94372b8db5839c898b7aecacfe56 Mon Sep 17 00:00:00 2001 From: Release Workflow Date: Tue, 4 Feb 2025 05:35:31 +0000 Subject: [PATCH 4/5] [CI Pipeline] Released Snapshot version: 5.45.9-alpha-181-SNAPSHOT --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7e5db7312..61994e86b 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.uid2 uid2-operator - 5.45.8 + 5.45.9-alpha-181-SNAPSHOT UTF-8 From 499ea63e9dc0531bc47c09bd94844701683d3cc2 Mon Sep 17 00:00:00 2001 From: Katherine Chen Date: Wed, 5 Feb 2025 10:41:04 +1100 Subject: [PATCH 5/5] Merge azure to one case --- src/main/java/com/uid2/operator/Main.java | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/uid2/operator/Main.java b/src/main/java/com/uid2/operator/Main.java index 44b1bbe79..3e6a306da 100644 --- a/src/main/java/com/uid2/operator/Main.java +++ b/src/main/java/com/uid2/operator/Main.java @@ -486,7 +486,6 @@ private Map.Entry createUidClients(Vertx vertx, private AttestationResponseHandler getAttestationTokenRetriever(Vertx vertx, String attestationUrl, String clientApiToken, Handler> responseWatcher) throws Exception { String enclavePlatform = this.config.getString(Const.Config.EnclavePlatformProp); String operatorType = this.config.getString(Const.Config.OperatorTypeProp, ""); - String maaServerBaseUrl = this.config.getString(Const.Config.MaaServerBaseUrlProp, "https://sharedeus.eus.attest.azure.net"); IAttestationProvider attestationProvider; switch (enclavePlatform) { @@ -507,12 +506,9 @@ private AttestationResponseHandler getAttestationTokenRetriever(Vertx vertx, Str LOGGER.info("creating uid core client with gcp oidc attestation protocol"); attestationProvider = AttestationFactory.getGcpOidcAttestation(); break; - case "azure-cc": - LOGGER.info("creating uid core client with azure cc attestation protocol"); - attestationProvider = AttestationFactory.getAzureCCAttestation(maaServerBaseUrl); - break; - case "azure-cc-aks": - LOGGER.info("creating uid core client with azure cc aks attestation protocol"); + case "azure-cc", "azure-cc-aks": + LOGGER.info("creating uid core client with" + enclavePlatform + "attestation protocol"); + String maaServerBaseUrl = this.config.getString(Const.Config.MaaServerBaseUrlProp, "https://sharedeus.eus.attest.azure.net"); attestationProvider = AttestationFactory.getAzureCCAttestation(maaServerBaseUrl); break; default: