Skip to content

Commit

Permalink
AA: add flag to enable eventlog
Browse files Browse the repository at this point in the history
On most platforms, runtime measurement is now not supported. Thus the
init PCR extension will fail.

This commit adds a flag for AA launch config to control whether eventlog
is enabled. By default it will be closed.

In future, with initdata, the deployer would specify whether to enable
eventlog in AA's config.

Signed-off-by: Xynnn007 <xynnn@linux.alibaba.com>
  • Loading branch information
Xynnn007 authored and arronwy committed Jul 30, 2024
1 parent bf7ccd3 commit d996c69
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 14 deletions.
5 changes: 5 additions & 0 deletions attestation-agent/attestation-agent/src/config/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -69,13 +69,17 @@ pub struct EventlogConfig {

/// PCR Register to extend INIT entry
pub init_pcr: u64,

/// Flag whether enable eventlog recording
pub enable_eventlog: bool,
}

impl Default for EventlogConfig {
fn default() -> Self {
Self {
eventlog_algorithm: HashAlgorithm::Sha384,
init_pcr: DEFAULT_PCR_INDEX,
enable_eventlog: false,
}
}
}
Expand Down Expand Up @@ -119,6 +123,7 @@ impl TryFrom<&str> for Config {
.add_source(config::File::with_name(config_path))
.set_default("eventlog_config.eventlog_algorithm", DEFAULT_EVENTLOG_HASH)?
.set_default("eventlog_config.init_pcr", DEFAULT_PCR_INDEX)?
.set_default("eventlog_config.enable_eventlog", "false")?
.build()?;

let cfg = c.try_deserialize()?;
Expand Down
35 changes: 21 additions & 14 deletions attestation-agent/attestation-agent/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// SPDX-License-Identifier: Apache-2.0
//

use anyhow::{Context, Result};
use anyhow::{bail, Context, Result};
use async_trait::async_trait;
use attester::{detect_tee_type, BoxedAttester};
use kbs_types::Tee;
Expand Down Expand Up @@ -85,20 +85,23 @@ pub struct AttestationAgent {

impl AttestationAgent {
pub async fn init(&mut self) -> Result<()> {
let alg = self.config.eventlog_config.eventlog_algorithm;
let pcr = self.config.eventlog_config.init_pcr;
let init_entry = LogEntry::Init(alg);
let digest = init_entry.digest_with(alg);
{
// perform atomicly in this block
let mut eventlog = self.eventlog.lock().await;
self.attester
.extend_runtime_measurement(digest, pcr)
.await
.context("write INIT entry")?;
if self.config.eventlog_config.enable_eventlog {
let alg = self.config.eventlog_config.eventlog_algorithm;
let pcr = self.config.eventlog_config.init_pcr;
let init_entry = LogEntry::Init(alg);
let digest = init_entry.digest_with(alg);
{
// perform atomicly in this block
let mut eventlog = self.eventlog.lock().await;
self.attester
.extend_runtime_measurement(digest, pcr)
.await
.context("write INIT entry")?;

eventlog.write_log(&init_entry).context("write INIT log")?;
};
}

eventlog.write_log(&init_entry).context("write INIT log")?;
};
Ok(())
}

Expand Down Expand Up @@ -189,6 +192,10 @@ impl AttestationAPIs for AttestationAgent {
content: &str,
register_index: Option<u64>,
) -> Result<()> {
if !self.config.eventlog_config.enable_eventlog {
bail!("Extend eventlog not enabled when launching!");
}

let pcr = register_index.unwrap_or_else(|| {
let pcr = self.config.eventlog_config.init_pcr;
debug!("No PCR index provided, use default {pcr}");
Expand Down

0 comments on commit d996c69

Please sign in to comment.