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 DD7E06198E for ; Fri, 20 Nov 2020 17:39:44 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id DB7F215182 for ; Fri, 20 Nov 2020 17:39:44 +0100 (CET) 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 5268E15178 for ; Fri, 20 Nov 2020 17:39:44 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 1FF6843D4B for ; Fri, 20 Nov 2020 17:39:44 +0100 (CET) From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= To: pbs-devel@lists.proxmox.com Date: Fri, 20 Nov 2020 17:38:37 +0100 Message-Id: <20201120163845.1225080-8-f.gruenbichler@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201120163845.1225080-1-f.gruenbichler@proxmox.com> References: <20201120163845.1225080-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.025 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [catalog.rs, proxmox-backup-client.rs, mount.rs] Subject: [pbs-devel] [PATCH proxmox-backup 07/13] client: check fingerprint after downloading manifest 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: Fri, 20 Nov 2020 16:39:44 -0000 this is stricter than the check that happened on manifest load, as it also fails if the manifest is signed but we don't have a key available. add some additional output at the start of a backup to indicate whether a previous manifest is available to base the backup on. Signed-off-by: Fabian Grünbichler --- src/bin/proxmox-backup-client.rs | 22 ++++++++++++++++++---- src/bin/proxmox_backup_client/catalog.rs | 2 ++ src/bin/proxmox_backup_client/mount.rs | 1 + 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/src/bin/proxmox-backup-client.rs b/src/bin/proxmox-backup-client.rs index ee2623f0..b4f87071 100644 --- a/src/bin/proxmox-backup-client.rs +++ b/src/bin/proxmox-backup-client.rs @@ -1100,10 +1100,23 @@ async fn create_backup( false ).await?; - let previous_manifest = if let Ok(previous_manifest) = client.download_previous_manifest().await { - Some(Arc::new(previous_manifest)) - } else { - None + let previous_manifest = match client.download_previous_manifest().await { + Ok(previous_manifest) => { + match previous_manifest.check_fingerprint(crypt_config.as_ref().map(Arc::as_ref)) { + Ok(()) => { + println!("Successfully downloaded previous manifest."); + Some(Arc::new(previous_manifest)) + }, + Err(err) => { + println!("Couldn't re-use pevious manifest - {}", err); + None + }, + } + }, + Err(err) => { + println!("Couldn't download pevious manifest - {}", err); + None + }, }; let snapshot = BackupDir::new(backup_type, backup_id, backup_time)?; @@ -1401,6 +1414,7 @@ async fn restore(param: Value) -> Result { ).await?; let (manifest, backup_index_data) = client.download_manifest().await?; + manifest.check_fingerprint(crypt_config.as_ref().map(Arc::as_ref))?; let (archive_name, archive_type) = parse_archive_type(archive_name); diff --git a/src/bin/proxmox_backup_client/catalog.rs b/src/bin/proxmox_backup_client/catalog.rs index 37ad842f..61bcc57f 100644 --- a/src/bin/proxmox_backup_client/catalog.rs +++ b/src/bin/proxmox_backup_client/catalog.rs @@ -92,6 +92,7 @@ async fn dump_catalog(param: Value) -> Result { ).await?; let (manifest, _) = client.download_manifest().await?; + manifest.check_fingerprint(crypt_config.as_ref().map(Arc::as_ref))?; let index = client.download_dynamic_index(&manifest, CATALOG_NAME).await?; @@ -199,6 +200,7 @@ async fn catalog_shell(param: Value) -> Result<(), Error> { .open("/tmp")?; let (manifest, _) = client.download_manifest().await?; + manifest.check_fingerprint(crypt_config.as_ref().map(Arc::as_ref))?; let index = client.download_dynamic_index(&manifest, &server_archive_name).await?; let most_used = index.find_most_used_chunks(8); diff --git a/src/bin/proxmox_backup_client/mount.rs b/src/bin/proxmox_backup_client/mount.rs index 187deab5..c586b764 100644 --- a/src/bin/proxmox_backup_client/mount.rs +++ b/src/bin/proxmox_backup_client/mount.rs @@ -214,6 +214,7 @@ async fn mount_do(param: Value, pipe: Option) -> Result { ).await?; let (manifest, _) = client.download_manifest().await?; + manifest.check_fingerprint(crypt_config.as_ref().map(Arc::as_ref))?; let file_info = manifest.lookup_file_info(&server_archive_name)?; -- 2.20.1