You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@teaclave.apache.org by ms...@apache.org on 2020/04/08 00:51:18 UTC

[incubator-teaclave] branch develop updated: [attestation] Add a helper function to create AttestationConfig from Teaclave's RuntimeConfig

This is an automated email from the ASF dual-hosted git repository.

mssun pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-teaclave.git


The following commit(s) were added to refs/heads/develop by this push:
     new dc160af  [attestation] Add a helper function to create AttestationConfig from Teaclave's RuntimeConfig
dc160af is described below

commit dc160aff4429636a52de13582c8eac04ca592bcd
Author: Mingshen Sun <bo...@mssun.me>
AuthorDate: Tue Apr 7 17:36:57 2020 -0700

    [attestation] Add a helper function to create AttestationConfig from Teaclave's RuntimeConfig
---
 attestation/src/lib.rs                     | 11 +++++++++++
 services/access_control/enclave/src/lib.rs |  8 +-------
 services/authentication/enclave/src/lib.rs |  8 +-------
 services/frontend/enclave/src/lib.rs       |  8 +-------
 services/management/enclave/src/lib.rs     |  8 +-------
 services/scheduler/enclave/src/lib.rs      |  8 +-------
 services/storage/enclave/src/lib.rs        |  8 +-------
 7 files changed, 17 insertions(+), 42 deletions(-)

diff --git a/attestation/src/lib.rs b/attestation/src/lib.rs
index b2a9668..87b5e36 100644
--- a/attestation/src/lib.rs
+++ b/attestation/src/lib.rs
@@ -114,6 +114,17 @@ impl AttestationConfig {
 
         Arc::new(Self::WithAttestation(att_service_cfg))
     }
+
+    /// Crate attestation config from Teaclave runtime configuration.
+    pub fn from_teaclave_config(config: &teaclave_config::RuntimeConfig) -> Arc<Self> {
+        let as_config = &config.attestation;
+        Self::new(
+            &as_config.algorithm,
+            &as_config.url,
+            &as_config.key,
+            &as_config.spid,
+        )
+    }
 }
 
 /// AttestationReport can be endorsed by either the Intel Attestation Service
diff --git a/services/access_control/enclave/src/lib.rs b/services/access_control/enclave/src/lib.rs
index 0c08611..d36545c 100644
--- a/services/access_control/enclave/src/lib.rs
+++ b/services/access_control/enclave/src/lib.rs
@@ -47,13 +47,7 @@ mod service;
 
 fn start_service(config: &RuntimeConfig) -> anyhow::Result<()> {
     let listen_address = config.internal_endpoints.access_control.listen_address;
-    let as_config = &config.attestation;
-    let attestation_config = AttestationConfig::new(
-        &as_config.algorithm,
-        &as_config.url,
-        &as_config.key,
-        &as_config.spid,
-    );
+    let attestation_config = AttestationConfig::from_teaclave_config(&config);
     let attested_tls_config = RemoteAttestation::new()
         .config(attestation_config)
         .generate_and_endorse()
diff --git a/services/authentication/enclave/src/lib.rs b/services/authentication/enclave/src/lib.rs
index 8adcf64..8dbca38 100644
--- a/services/authentication/enclave/src/lib.rs
+++ b/services/authentication/enclave/src/lib.rs
@@ -132,13 +132,7 @@ fn start_service(config: &RuntimeConfig) -> anyhow::Result<()> {
         .collect();
     let api_listen_address = config.api_endpoints.authentication.listen_address;
     let internal_listen_address = config.internal_endpoints.authentication.listen_address;
-    let as_config = &config.attestation;
-    let attestation_config = AttestationConfig::new(
-        &as_config.algorithm,
-        &as_config.url,
-        &as_config.key,
-        &as_config.spid,
-    );
+    let attestation_config = AttestationConfig::from_teaclave_config(&config);
     let attested_tls_config = RemoteAttestation::new()
         .config(attestation_config)
         .generate_and_endorse()
diff --git a/services/frontend/enclave/src/lib.rs b/services/frontend/enclave/src/lib.rs
index b27d90e..0a01475 100644
--- a/services/frontend/enclave/src/lib.rs
+++ b/services/frontend/enclave/src/lib.rs
@@ -47,13 +47,7 @@ mod service;
 
 fn start_service(config: &RuntimeConfig) -> anyhow::Result<()> {
     let listen_address = config.api_endpoints.frontend.listen_address;
-    let as_config = &config.attestation;
-    let attestation_config = AttestationConfig::new(
-        &as_config.algorithm,
-        &as_config.url,
-        &as_config.key,
-        &as_config.spid,
-    );
+    let attestation_config = AttestationConfig::from_teaclave_config(&config);
     let attested_tls_config = RemoteAttestation::new()
         .config(attestation_config)
         .generate_and_endorse()
diff --git a/services/management/enclave/src/lib.rs b/services/management/enclave/src/lib.rs
index 0f6406f..8862a75 100644
--- a/services/management/enclave/src/lib.rs
+++ b/services/management/enclave/src/lib.rs
@@ -45,13 +45,7 @@ mod service;
 
 fn start_service(config: &RuntimeConfig) -> anyhow::Result<()> {
     let listen_address = config.internal_endpoints.management.listen_address;
-    let as_config = &config.attestation;
-    let attestation_config = AttestationConfig::new(
-        &as_config.algorithm,
-        &as_config.url,
-        &as_config.key,
-        &as_config.spid,
-    );
+    let attestation_config = AttestationConfig::from_teaclave_config(&config);
     let attested_tls_config = RemoteAttestation::new()
         .config(attestation_config)
         .generate_and_endorse()
diff --git a/services/scheduler/enclave/src/lib.rs b/services/scheduler/enclave/src/lib.rs
index 704129c..716496f 100644
--- a/services/scheduler/enclave/src/lib.rs
+++ b/services/scheduler/enclave/src/lib.rs
@@ -48,13 +48,7 @@ use teaclave_types::{EnclaveInfo, TeeServiceError, TeeServiceResult};
 
 fn start_service(config: &RuntimeConfig) -> anyhow::Result<()> {
     let listen_address = config.internal_endpoints.scheduler.listen_address;
-    let as_config = &config.attestation;
-    let attestation_config = AttestationConfig::new(
-        &as_config.algorithm,
-        &as_config.url,
-        &as_config.key,
-        &as_config.spid,
-    );
+    let attestation_config = AttestationConfig::from_teaclave_config(&config);
     let attested_tls_config = RemoteAttestation::new()
         .config(attestation_config)
         .generate_and_endorse()
diff --git a/services/storage/enclave/src/lib.rs b/services/storage/enclave/src/lib.rs
index 624f173..a7c1aa3 100644
--- a/services/storage/enclave/src/lib.rs
+++ b/services/storage/enclave/src/lib.rs
@@ -48,13 +48,7 @@ mod service;
 
 fn start_service(config: &RuntimeConfig) -> anyhow::Result<()> {
     let listen_address = config.internal_endpoints.storage.listen_address;
-    let as_config = &config.attestation;
-    let attestation_config = AttestationConfig::new(
-        &as_config.algorithm,
-        &as_config.url,
-        &as_config.key,
-        &as_config.spid,
-    );
+    let attestation_config = AttestationConfig::from_teaclave_config(&config);
     let attested_tls_config = RemoteAttestation::new()
         .config(attestation_config)
         .generate_and_endorse()


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@teaclave.apache.org
For additional commands, e-mail: commits-help@teaclave.apache.org