From 882c08236988a7405f5ae1afbf146503a0f5cce6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= Date: Mon, 10 Aug 2020 13:25:09 +0200 Subject: [PATCH] mark signed manifests as such MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit for less-confusing display in the web interface Signed-off-by: Fabian Grünbichler --- src/api2/admin/datastore.rs | 5 ++++- src/backup/manifest.rs | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/api2/admin/datastore.rs b/src/api2/admin/datastore.rs index 81ca02eb..fe72ea32 100644 --- a/src/api2/admin/datastore.rs +++ b/src/api2/admin/datastore.rs @@ -67,7 +67,10 @@ fn read_backup_index( result.push(BackupContent { filename: MANIFEST_BLOB_NAME.to_string(), - crypt_mode: Some(CryptMode::None), + crypt_mode: match manifest.signature { + Some(_) => Some(CryptMode::SignOnly), + None => Some(CryptMode::None), + }, size: Some(index_size), }); diff --git a/src/backup/manifest.rs b/src/backup/manifest.rs index 6af110d1..56f6cf42 100644 --- a/src/backup/manifest.rs +++ b/src/backup/manifest.rs @@ -72,6 +72,7 @@ pub struct BackupManifest { files: Vec, #[serde(default="empty_value")] // to be compatible with < 0.8.0 backups pub unprotected: Value, + pub signature: Option, } #[derive(PartialEq)] @@ -105,6 +106,7 @@ impl BackupManifest { backup_time: snapshot.backup_time().timestamp(), files: Vec::new(), unprotected: json!({}), + signature: None, } }