diff --git a/src/api2/admin/datastore.rs b/src/api2/admin/datastore.rs index 86d0847c..bce58a78 100644 --- a/src/api2/admin/datastore.rs +++ b/src/api2/admin/datastore.rs @@ -403,6 +403,14 @@ pub fn list_snapshots ( .and_then(|notes| notes.lines().next()) .map(String::from); + let fingerprint = match manifest.fingerprint() { + Ok(fp) => fp, + Err(err) => { + eprintln!("error parsing fingerprint: '{}'", err); + None + }, + }; + let verification = manifest.unprotected["verify_state"].clone(); let verification: Option = match serde_json::from_value(verification) { Ok(verify) => verify, @@ -420,6 +428,7 @@ pub fn list_snapshots ( backup_time, comment, verification, + fingerprint, files, size, owner, @@ -443,6 +452,7 @@ pub fn list_snapshots ( backup_time, comment: None, verification: None, + fingerprint: None, files, size: None, owner, diff --git a/src/api2/types/mod.rs b/src/api2/types/mod.rs index d7d5a8af..b347fc29 100644 --- a/src/api2/types/mod.rs +++ b/src/api2/types/mod.rs @@ -5,7 +5,7 @@ use proxmox::api::{api, schema::*}; use proxmox::const_regex; use proxmox::{IPRE, IPRE_BRACKET, IPV4RE, IPV6RE, IPV4OCTET, IPV6H16, IPV6LS32}; -use crate::backup::{CryptMode, BACKUP_ID_REGEX}; +use crate::backup::{CryptMode, Fingerprint, BACKUP_ID_REGEX}; use crate::server::UPID; #[macro_use] @@ -484,6 +484,10 @@ pub struct SnapshotVerifyState { type: SnapshotVerifyState, optional: true, }, + fingerprint: { + type: String, + optional: true, + }, files: { items: { schema: BACKUP_ARCHIVE_NAME_SCHEMA @@ -508,6 +512,9 @@ pub struct SnapshotListItem { /// The result of the last run verify task #[serde(skip_serializing_if="Option::is_none")] pub verification: Option, + /// Fingerprint of encryption key + #[serde(skip_serializing_if="Option::is_none")] + pub fingerprint: Option, /// List of contained archive files. pub files: Vec, /// Overall snapshot size (sum of all archive sizes).