From 970157f13fcf58be5b044daacd186d85ef258cce Mon Sep 17 00:00:00 2001 From: "Zheng, Qi" Date: Thu, 1 Jun 2023 14:24:52 +0800 Subject: [PATCH] [demos] Do cargo fmt for azure attestation --- .../maa_attestation/azure_att/src/maa.rs | 32 +++++++++---------- .../maa_attestation/azure_att/src/main.rs | 4 +-- .../maa_init/init/src/maa.rs | 32 +++++++++---------- .../maa_init/init/src/main.rs | 13 +++----- 4 files changed, 37 insertions(+), 44 deletions(-) diff --git a/demos/remote_attestation/azure_attestation/maa_attestation/azure_att/src/maa.rs b/demos/remote_attestation/azure_attestation/maa_attestation/azure_att/src/maa.rs index 566d0775..f39a37ed 100644 --- a/demos/remote_attestation/azure_attestation/maa_attestation/azure_att/src/maa.rs +++ b/demos/remote_attestation/azure_attestation/maa_attestation/azure_att/src/maa.rs @@ -1,8 +1,7 @@ +use occlum_dcap::*; +use reqwest::blocking::Client; use serde_json::json; use sha2::{Digest, Sha256}; -use reqwest::blocking::Client; -use occlum_dcap::*; - pub const MAX_REPORT_DATA_SIZE: usize = 64; @@ -25,7 +24,9 @@ fn maa_get_quote_base64(user_data: &[u8]) -> Result { report_data.d[i] = user_data[i]; } - let ret = dcap.generate_quote(quote_buf.as_mut_ptr(), &mut report_data).unwrap(); + let ret = dcap + .generate_quote(quote_buf.as_mut_ptr(), &mut report_data) + .unwrap(); dcap.close(); if ret < 0 { return Err("DCAP generate quote failed"); @@ -52,31 +53,28 @@ pub fn maa_generate_json(user_data: &[u8]) -> Result Result> { +pub fn maa_attestation( + url: String, + request_body: serde_json::Value, +) -> Result> { let client = Client::new(); let att_url = format!("{}/attest/SgxEnclave?api-version=2020-10-01", url); - let resp = client.post(att_url) - .json(&request_body) - .send()?; - + let resp = client.post(att_url).json(&request_body).send()?; + match resp.status() { reqwest::StatusCode::OK => { println!("success!"); Ok(resp.json().unwrap()) - }, + } s => { println!("Received response status: {:?}", s); Err("maa attestation failed".into()) diff --git a/demos/remote_attestation/azure_attestation/maa_attestation/azure_att/src/main.rs b/demos/remote_attestation/azure_attestation/maa_attestation/azure_att/src/main.rs index 9fb39ab1..323b1bb6 100644 --- a/demos/remote_attestation/azure_attestation/maa_attestation/azure_att/src/main.rs +++ b/demos/remote_attestation/azure_attestation/maa_attestation/azure_att/src/main.rs @@ -1,4 +1,4 @@ -use crate::maa::{maa_generate_json, maa_attestation}; +use crate::maa::{maa_attestation, maa_generate_json}; pub mod maa; @@ -6,7 +6,7 @@ const ATTESTATION_PROVIDER_URL: &str = "https://shareduks.uks.attest.azure.net"; fn main() { // Sample enclave held data - let ehd: [u8;8] = [1,2,3,4,5,6,7,8]; + let ehd: [u8; 8] = [1, 2, 3, 4, 5, 6, 7, 8]; let maa_json = maa_generate_json(&ehd).unwrap(); println!("maa json: {}", maa_json); diff --git a/demos/remote_attestation/azure_attestation/maa_init/init/src/maa.rs b/demos/remote_attestation/azure_attestation/maa_init/init/src/maa.rs index c1d11be8..01757591 100644 --- a/demos/remote_attestation/azure_attestation/maa_init/init/src/maa.rs +++ b/demos/remote_attestation/azure_attestation/maa_init/init/src/maa.rs @@ -1,8 +1,7 @@ +use occlum_dcap::*; +use reqwest::blocking::Client; use serde_json::json; use sha2::{Digest, Sha256}; -use reqwest::blocking::Client; -use occlum_dcap::*; - pub const MAX_REPORT_DATA_SIZE: usize = 64; @@ -25,7 +24,9 @@ fn maa_get_quote_base64(user_data: &[u8]) -> Result { report_data.d[i] = user_data[i]; } - let ret = dcap.generate_quote(quote_buf.as_mut_ptr(), &mut report_data).unwrap(); + let ret = dcap + .generate_quote(quote_buf.as_mut_ptr(), &mut report_data) + .unwrap(); dcap.close(); if ret < 0 { return Err("DCAP generate quote failed"); @@ -52,31 +53,28 @@ pub fn maa_generate_json(user_data: &[u8]) -> Result Result> { +pub fn maa_attestation( + url: String, + request_body: serde_json::Value, +) -> Result> { let client = Client::new(); let att_url = format!("{}/attest/SgxEnclave?api-version=2020-10-01", url); - let resp = client.post(att_url) - .json(&request_body) - .send()?; - + let resp = client.post(att_url).json(&request_body).send()?; + match resp.status() { reqwest::StatusCode::OK => { // println!("success!"); Ok(resp.json().unwrap()) - }, + } s => { println!("Received response status: {:?}", s); Err("maa attestation failed".into()) diff --git a/demos/remote_attestation/azure_attestation/maa_init/init/src/main.rs b/demos/remote_attestation/azure_attestation/maa_init/init/src/main.rs index 22b64b38..4fd6fdb4 100644 --- a/demos/remote_attestation/azure_attestation/maa_init/init/src/main.rs +++ b/demos/remote_attestation/azure_attestation/maa_init/init/src/main.rs @@ -5,12 +5,12 @@ extern crate serde_json; use libc::syscall; use serde::Deserialize; +use std::env; use std::error::Error; use std::fs::{write, File}; use std::io::{ErrorKind, Read}; -use std::env; -use crate::maa::{maa_generate_json, maa_attestation}; +use crate::maa::{maa_attestation, maa_generate_json}; pub mod maa; fn main() -> Result<(), Box> { @@ -40,10 +40,8 @@ fn main() -> Result<(), Box> { // Get Attestation provider URL, rootfs token path and report data string from env let maa_provider_url = env::var("MAA_PROVIDER_URL") .unwrap_or("https://shareduks.uks.attest.azure.net".to_string()); - let maa_token_path = env::var("MAA_TOKEN_PATH") - .unwrap_or("/root".to_string()); - let report_data_base64 = env::var("MAA_REPORT_DATA") - .unwrap_or("example".to_string()); + let maa_token_path = env::var("MAA_TOKEN_PATH").unwrap_or("/root".to_string()); + let report_data_base64 = env::var("MAA_REPORT_DATA").unwrap_or("example".to_string()); let report_data = base64::decode(&report_data_base64).unwrap(); // Get maa quote json @@ -58,8 +56,7 @@ fn main() -> Result<(), Box> { // User can provide valid path for runtime mount and boot // Otherwise, just pass null pointer to do general mount and boot let root_config_path: *const i8 = std::ptr::null(); - let ret = unsafe { syscall( - SYS_MOUNT_FS, key_ptr, root_config_path) }; + let ret = unsafe { syscall(SYS_MOUNT_FS, key_ptr, root_config_path) }; if ret < 0 { return Err(Box::new(std::io::Error::last_os_error())); }