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 D048D65C59 for ; Fri, 24 Jul 2020 11:53:52 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id CDBF59776 for ; Fri, 24 Jul 2020 11:53:52 +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 47C07976C for ; Fri, 24 Jul 2020 11:53:52 +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 149584331D for ; Fri, 24 Jul 2020 11:53:52 +0200 (CEST) From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= To: pve-devel@lists.proxmox.com Date: Fri, 24 Jul 2020 11:53:35 +0200 Message-Id: <20200724095335.2869192-4-f.gruenbichler@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200724095335.2869192-1-f.gruenbichler@proxmox.com> References: <20200724095335.2869192-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.046 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. [backup.rs, commands.rs] Subject: [pve-devel] [PATCH proxmox-backup-qemu v2 3/3] fix #2866: invalidate bitmap on crypt_mode change X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 24 Jul 2020 09:53:52 -0000 signed and plain backups share chunks, so bitmap reusal is okay for those combinations. switching from encrypted to not encrypted or vice-versa could have pretty fatal consequences - either referencing plain-text chunks in 'encrypted' backups, or referencing encrypted chunks in 'unencrypted' backups without still having the corresponding keys.. Signed-off-by: Fabian Grünbichler --- src/backup.rs | 5 ++++- src/commands.rs | 23 +++++++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/src/backup.rs b/src/backup.rs index dab1da0..9e3d66a 100644 --- a/src/backup.rs +++ b/src/backup.rs @@ -203,7 +203,10 @@ impl BackupTask { size: u64, ) -> bool { match self.last_manifest() { - Some(ref manifest) => check_last_incremental_csum(manifest.clone(), &device_name, size), + Some(ref manifest) => { + check_last_incremental_csum(manifest.clone(), &device_name, size) + && check_last_encryption_mode(manifest.clone(), &device_name, self.crypt_mode) + }, None => false, } } diff --git a/src/commands.rs b/src/commands.rs index e2584ab..c59ee1b 100644 --- a/src/commands.rs +++ b/src/commands.rs @@ -94,6 +94,29 @@ pub(crate) fn check_last_incremental_csum( } } +pub(crate) fn check_last_encryption_mode( + manifest: Arc, + device_name: &str, + crypt_mode: CryptMode, +) -> bool { + match manifest.lookup_file_info(&archive_name(device_name)) { + Ok(file) => { + match file.crypt_mode { + CryptMode::Encrypt => match crypt_mode { + CryptMode::Encrypt => true, + _ => false, + }, + CryptMode::SignOnly | CryptMode::None => match crypt_mode { + CryptMode::Encrypt => false, + _ => true, + }, + } + }, + _ => false, + } +} + + pub(crate) async fn register_image( client: Arc, crypt_config: Option>, -- 2.20.1