Merge pull request #71 from IABTechLab/ysh-support_azure_cc_attestation

support azure-cc attestation provider in core
IABTechLab · Oct 12, 2023 · 50d5966 · 50d5966
2 parents 2c54d4f + 26d4a4f
commit 50d5966
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 4 deletions.
diff --git a/pom.xml b/pom.xml
@@ -24,7 +24,7 @@
     <vertx.verticle>com.uid2.core.vertx.CoreVerticle</vertx.verticle>
     <launcher.class>io.vertx.core.Launcher</launcher.class>
 
-    <uid2-shared.version>5.9.6-62621be878</uid2-shared.version>
+    <uid2-shared.version>5.13.0-a714a3ef26</uid2-shared.version>
     <image.version>${project.version}</image.version>
   </properties>
 

diff --git a/src/main/java/com/uid2/core/Main.java b/src/main/java/com/uid2/core/Main.java
@@ -116,11 +116,11 @@ public static void main(String[] args) {
                 EnclaveIdentifierProvider enclaveIdProvider = new EnclaveIdentifierProvider(cloudStorage, enclaveMetadataPath);
                 enclaveRotatingVerticle = new RotatingStoreVerticle("enclaves", 60000, enclaveIdProvider);
 
+
+                var maaServerBaseUrl = ConfigStore.Global.getOrDefault(com.uid2.core.Const.Config.MaaServerBaseUrlProp, "https://sharedeus.eus.attest.azure.net");
                 AttestationService attestationService = new AttestationService()
                         .with("trusted", new TrustedAttestationProvider())
-                        .with("azure-sgx", new AzureAttestationProvider(
-                                ConfigStore.Global.getOrDefault("maa_server_base_url", "https://sharedeus.eus.attest.azure.net"),
-                                WebClient.create(vertx)))
+                        .with("azure-sgx", new AzureAttestationProvider(maaServerBaseUrl, WebClient.create(vertx)))
                         .with("aws-nitro", new NitroAttestationProvider(new InMemoryAWSCertificateStore()));
 
                 // try read GoogleCredentials
@@ -137,6 +137,8 @@ public static void main(String[] args) {
                             .with("gcp-vmid", new GcpVmidAttestationProvider(googleCredentials, enclaveParams));
                 }
 
+                attestationService.with("azure-cc", new AzureCCAttestationProvider(maaServerBaseUrl));
+
                 attestationService.with("gcp-oidc", new GcpOidcAttestationProvider());
 
                 OperatorJWTTokenProvider operatorJWTTokenProvider = new OperatorJWTTokenProvider(config);

diff --git a/src/main/resources/com.uid2.core/test/enclaves/enclaves.json b/src/main/resources/com.uid2.core/test/enclaves/enclaves.json
@@ -16,5 +16,11 @@
     "protocol": "gcp-oidc",
     "identifier": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
     "created": 1620693995
+  },
+  {
+    "name": "debug-azure-cc",
+    "protocol": "azure-cc",
+    "identifier": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+    "created": 1620693995
   }
 ]
diff --git a/src/main/resources/com.uid2.core/test/operators/operators.json b/src/main/resources/com.uid2.core/test/operators/operators.json
@@ -26,6 +26,15 @@
     "key_hash": "nF2JfhBwEd1J9W2aiO2XWBnVGWaTHKzmq5WadU9GFC+gHjkFhkT4sG0boNG76fZQpBjQWYcCEhWFNPCBje52iA==",
     "key_salt": "WSwyr8znzT0Yj/QiSRGZlsPz2lUIfRuO5FSpl89biiI="
   },
+  {
+    "key": "test-azure-key",
+    "name": "[email protected]",
+    "contact": "[email protected]",
+    "created": 1617149276,
+    "protocol": "azure-cc",
+    "key_hash": "9hmTDqMPlR7Y6mnCDKWFOWGCK8uepsg/s6pCHPCqL16ziQ8OvUSpTlqOERJJkcyvZLRShgNVbafPO66TH91Vkw==",
+    "key_salt": "VhOxETeT1+hvq8y2YRCpdcPg0JrHkBfZXI58twuohGY="
+  },
   {
     "key": "trusted-partner-key",
     "name": "[email protected]",