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) server-digest SHA256) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id E8326616C7 for ; Mon, 14 Sep 2020 10:50:26 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id D92DDEDE4 for ; Mon, 14 Sep 2020 10:50:26 +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 1C10CEDD4 for ; Mon, 14 Sep 2020 10:50:26 +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 D893244BBD for ; Mon, 14 Sep 2020 10:50:25 +0200 (CEST) From: Stefan Reiter To: pbs-devel@lists.proxmox.com Date: Mon, 14 Sep 2020 10:50:18 +0200 Message-Id: <20200914085019.14101-1-s.reiter@proxmox.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.054 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] [PATCH v4 proxmox-backup 1/2] backup: check verify state of previous backup before allowing reuse 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, 14 Sep 2020 08:50:27 -0000 Do not allow clients to reuse chunks from the previous backup if it has a failed validation result. This would result in a new "successful" backup that potentially references broken chunks. If the previous backup has not been verified, assume it is fine and continue on. Signed-off-by: Stefan Reiter --- v4: * check earlier in upgrade_to_backup_protocol * update error messages to include "valid" src/api2/backup.rs | 29 ++++++++++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/src/api2/backup.rs b/src/api2/backup.rs index 9420b146..2b855554 100644 --- a/src/api2/backup.rs +++ b/src/api2/backup.rs @@ -113,7 +113,30 @@ async move { bail!("backup owner check failed ({} != {})", userid, owner); } - let last_backup = BackupInfo::last_backup(&datastore.base_path(), &backup_group, true).unwrap_or(None); + let last_backup = { + let info = BackupInfo::last_backup(&datastore.base_path(), &backup_group, true).unwrap_or(None); + if let Some(info) = info { + let (manifest, _) = datastore.load_manifest(&info.backup_dir)?; + let verify = manifest.unprotected["verify_state"].clone(); + match serde_json::from_value::(verify) { + Ok(verify) => { + if verify.state != "ok" { + // verify failed, treat as if no previous backup exists + None + } else { + Some(info) + } + }, + Err(_) => { + // no verify state found, treat as valid + Some(info) + } + } + } else { + None + } + }; + let backup_dir = BackupDir::new_with_group(backup_group.clone(), backup_time)?; let _last_guard = if let Some(last) = &last_backup { @@ -355,7 +378,7 @@ fn create_fixed_index( let last_backup = match &env.last_backup { Some(info) => info, None => { - bail!("cannot reuse index - no previous backup exists"); + bail!("cannot reuse index - no valid previous backup exists"); } }; @@ -670,7 +693,7 @@ fn download_previous( let last_backup = match &env.last_backup { Some(info) => info, - None => bail!("no previous backup"), + None => bail!("no valid previous backup"), }; let mut path = env.datastore.snapshot_path(&last_backup.backup_dir); -- 2.20.1