From 23f9503a313302b9db2da055725eb985ca0577b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= Date: Fri, 20 Nov 2020 17:38:37 +0100 Subject: [PATCH] client: check fingerprint after downloading manifest MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 c1dbdc30..4d5f2d08 100644 --- a/src/bin/proxmox-backup-client.rs +++ b/src/bin/proxmox-backup-client.rs @@ -1099,10 +1099,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)?; @@ -1400,6 +1413,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)?;