From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id BD2B369D47 for ; Mon, 10 Aug 2020 13:25:36 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id BA7F814995 for ; Mon, 10 Aug 2020 13:25:36 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 41B1A1498B for ; Mon, 10 Aug 2020 13:25:36 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 0D68244548 for ; Mon, 10 Aug 2020 13:25:36 +0200 (CEST) From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= To: pbs-devel@lists.proxmox.com Date: Mon, 10 Aug 2020 13:25:09 +0200 Message-Id: <20200810112509.70129-7-f.gruenbichler@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200810112509.70129-1-f.gruenbichler@proxmox.com> References: <20200810112509.70129-1-f.gruenbichler@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.043 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pbs-devel] [RFC proxmox-backup 5/5] mark signed manifests as such X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Aug 2020 11:25:36 -0000 for less-confusing display in the web interface Signed-off-by: Fabian Grünbichler --- Notes: I am not so sure about this one - I think I'd rather move the index.json and client.log out of the backup content and into some new backup metadata struct, and split the display/add an info button to the GUI view.. 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, } } -- 2.20.1