Skip to content

Commit

Permalink
AA: Add Config file mechanism
Browse files Browse the repository at this point in the history
Signed-off-by: Jiale Zhang <zhangjiale@linux.alibaba.com>
  • Loading branch information
jialez0 committed Jan 26, 2024
1 parent f603d1e commit 1259e1a
Show file tree
Hide file tree
Showing 10 changed files with 67 additions and 15 deletions.
2 changes: 1 addition & 1 deletion attestation-agent/app/src/grpc.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ const DEFAULT_ATTESTATION_AGENT_ADDR: &str = "127.0.0.1:50002";

lazy_static! {
pub static ref ASYNC_ATTESTATION_AGENT: Arc<tokio::sync::Mutex<AttestationAgent>> =
Arc::new(tokio::sync::Mutex::new(AttestationAgent::new()));
Arc::new(tokio::sync::Mutex::new(AttestationAgent::default()));
}

#[derive(Debug, Parser)]
Expand Down
2 changes: 1 addition & 1 deletion attestation-agent/app/src/rpc/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ const PROTOCOL: &str = "grpc";

lazy_static! {
pub static ref ABOUT: String = {
let aa_about = AttestationAgent::new().about();
let aa_about = AttestationAgent::default().about();
format!("Protocol: {PROTOCOL}\n{aa_about}")
};
}
2 changes: 1 addition & 1 deletion attestation-agent/app/src/ttrpc.rs
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ const DEFAULT_ATTESTATION_SOCKET_ADDR: &str = concatcp!(

lazy_static! {
pub static ref ASYNC_ATTESTATION_AGENT: Arc<Mutex<AttestationAgent>> =
Arc::new(Mutex::new(AttestationAgent::new()));
Arc::new(Mutex::new(AttestationAgent::default()));
}

#[derive(Debug, Parser)]
Expand Down
File renamed without changes.
38 changes: 38 additions & 0 deletions attestation-agent/lib/src/config/mod.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
// Copyright (c) 2024 Alibaba Cloud
//
// SPDX-License-Identifier: Apache-2.0
//

use anyhow::Result;
use serde::Deserialize;
use std::fs::File;
use thiserror::Error;

pub mod aa_kbc_params;

pub const DEFAULT_AA_CONFIG_PATH: &str = "/etc/attestation-agent.toml";

#[derive(Clone, Debug, Deserialize)]
#[allow(dead_code)]
pub struct Config {
/// URL Address of Attestation Service
pub as_uri: String,
// TODO: Add more fields that accessing AS needs.
}

#[derive(Error, Debug)]
pub enum ConfigFileError {
#[error("failed to open")]
Io(#[from] std::io::Error),
#[error("failed to parse")]
Parse(#[from] serde_json::Error),
}

impl TryFrom<&str> for Config {
type Error = ConfigFileError;
fn try_from(config_path: &str) -> Result<Self, Self::Error> {
let file = File::open(config_path)?;
let cfg: Config = serde_json::from_reader(file)?;
Ok(cfg)
}
}
28 changes: 21 additions & 7 deletions attestation-agent/lib/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,13 @@ use kbc::{AnnotationPacket, KbcCheckInfo, KbcInstance, KbcModuleList};
use resource_uri::ResourceUri;
use std::collections::HashMap;

pub mod config;
mod token;

#[allow(unused_imports)]
use token::{GetToken, TokenType};

pub mod aa_kbc_params;
use crate::config::aa_kbc_params;

/// Attestation Agent (AA for short) is a rust library crate for attestation procedure
/// in confidential containers. It provides kinds of service APIs that need to make
Expand All @@ -33,7 +34,7 @@ pub mod aa_kbc_params;
/// use attestation_agent::AttestationAgent;
/// use attestation_agent::AttestationAPIs;
///
/// let mut aa = AttestationAgent::new();
/// let mut aa = AttestationAgent::default();
///
/// let key_result = aa.decrypt_image_layer_annotation(
/// "sample_kbc",
Expand Down Expand Up @@ -94,20 +95,26 @@ pub trait AttestationAPIs {
pub struct AttestationAgent {
kbc_module_list: KbcModuleList,
kbc_instance_map: HashMap<String, KbcInstance>,
config_file_path: String,
}

impl Default for AttestationAgent {
fn default() -> Self {
Self::new()
AttestationAgent {
kbc_module_list: KbcModuleList::new(),
kbc_instance_map: HashMap::new(),
config_file_path: config::DEFAULT_AA_CONFIG_PATH.to_string(),
}
}
}

impl AttestationAgent {
/// Create a new instance of [AttestationAgent].
pub fn new() -> Self {
pub fn new(config_path: &str) -> Self {
AttestationAgent {
kbc_module_list: KbcModuleList::new(),
kbc_instance_map: HashMap::new(),
config_file_path: config_path.to_string(),
}
}

Expand Down Expand Up @@ -178,21 +185,28 @@ impl AttestationAPIs for AttestationAgent {

#[allow(unreachable_code)]
async fn get_token(&mut self, _token_type: &str) -> Result<Vec<u8>> {
let _params = aa_kbc_params::get_params().await?;
let _uri = match aa_kbc_params::get_params().await {
Ok(params) => params.uri().to_string(),
Err(_) => {
let config = config::Config::try_from(self.config_file_path.as_str())
.map_err(|e| anyhow!("Get AS address from config file failed: {e}"))?;
config.as_uri.clone()
}
};

let _token = match serde_json::from_str::<TokenType>(_token_type)
.map_err(|e| anyhow!("Unsupported token type: {e}"))?
{
#[cfg(feature = "kbs")]
TokenType::Kbs => {
token::kbs::KbsTokenGetter::default()
.get_token(_params.uri().to_string())
.get_token(_uri)
.await?
}
#[cfg(feature = "coco_as")]
TokenType::CoCoAS => {
token::coco_as::CoCoASTokenGetter::default()
.get_token(_params.uri().to_string())
.get_token(_uri)
.await?
}
};
Expand Down
4 changes: 2 additions & 2 deletions attestation-agent/lib/src/token/coco_as.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ pub struct CoCoASTokenGetter {}

#[async_trait]
impl GetToken for CoCoASTokenGetter {
async fn get_token(&self, as_url: String) -> Result<Vec<u8>> {
async fn get_token(&self, as_uri: String) -> Result<Vec<u8>> {
let tee_type = attester::detect_tee_type();
let attester = attester::BoxedAttester::try_from(tee_type)?;
let evidence = attester.get_evidence(vec![]).await?;
Expand All @@ -26,7 +26,7 @@ impl GetToken for CoCoASTokenGetter {

let client = reqwest::Client::new();
let res = client
.post(as_url)
.post(as_uri)
.header("Content-Type", "application/json")
.json(&request_body)
.send()
Expand Down
2 changes: 1 addition & 1 deletion confidential-data-hub/hub/src/auth/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ impl Hub {
#[cfg(feature = "sev")]
{
use log::{info, warn};
match attestation_agent::aa_kbc_params::get_params().await {
match attestation_agent::config::aa_kbc_params::get_params().await {
Ok(aa_kbc_params) => {
if aa_kbc_params.kbc() == "online_sev_kbc" {
info!("online_sev_kbc used. Start to initialize sev.");
Expand Down
2 changes: 1 addition & 1 deletion confidential-data-hub/kms/src/error.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// SPDX-License-Identifier: Apache-2.0
//

use attestation_agent::aa_kbc_params;
use attestation_agent::config::aa_kbc_params;
use thiserror::Error;

pub type Result<T> = std::result::Result<T, Error>;
Expand Down
2 changes: 1 addition & 1 deletion confidential-data-hub/kms/src/plugins/kbs/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ mod offline_fs;
use std::sync::Arc;

use async_trait::async_trait;
use attestation_agent::aa_kbc_params;
use attestation_agent::config::aa_kbc_params;
use lazy_static::lazy_static;
pub use resource_uri::ResourceUri;
use tokio::sync::Mutex;
Expand Down

0 comments on commit 1259e1a

Please sign in to comment.