github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-08-16 15:07:46 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #5407 from wedsonaf/fail-gracefully

Browse Source 
image_rpc: Make `init_attestation_agent` fail gracefully
This commit is contained in:
Fabiano Fidêncio 2022-10-13 18:57:35 +02:00 committed by GitHub
commit e42fce6ece
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/agent/src/image_rpc.rs
View File

@ -177,7 +177,7 @@ impl ImageService {
// If we fail to start the AA, Skopeo/ocicrypt won't be able to unwrap keys // If we fail to start the AA, Skopeo/ocicrypt won't be able to unwrap keys
// and container decryption will fail. // and container decryption will fail.
fn init_attestation_agent() { fn init_attestation_agent() -> Result<()> {
let config_path = OCICRYPT_CONFIG_PATH; let config_path = OCICRYPT_CONFIG_PATH;
// The image will need to be encrypted using a keyprovider // The image will need to be encrypted using a keyprovider
@ -190,10 +190,8 @@ impl ImageService {
} }
}); });
let mut config_file = fs::File::create(config_path).unwrap(); let mut config_file = fs::File::create(config_path)?;
config_file config_file.write_all(ocicrypt_config.to_string().as_bytes())?;
.write_all(ocicrypt_config.to_string().as_bytes())
.unwrap();
// The Attestation Agent will run for the duration of the guest. // The Attestation Agent will run for the duration of the guest.
Command::new(AA_PATH) Command::new(AA_PATH)
@ -201,8 +199,8 @@ impl ImageService {
.arg(AA_KEYPROVIDER_PORT) .arg(AA_KEYPROVIDER_PORT)
.arg("--getresource_sock") .arg("--getresource_sock")
.arg(AA_GETRESOURCE_PORT) .arg(AA_GETRESOURCE_PORT)
.spawn() .spawn()?;
.unwrap(); Ok(())
} }
async fn pull_image(&self, req: &image::PullImageRequest) -> Result<String> { async fn pull_image(&self, req: &image::PullImageRequest) -> Result<String> {
@ -252,7 +250,7 @@ impl ImageService {
Ordering::SeqCst, Ordering::SeqCst,
Ordering::SeqCst, Ordering::SeqCst,
) { ) {
Ok(_) => Self::init_attestation_agent(), Ok(_) => Self::init_attestation_agent()?,
Err(_) => info!(sl!(), "Attestation Agent already running"), Err(_) => info!(sl!(), "Attestation Agent already running"),
} }
} }