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 A6EA161997 for ; Fri, 20 Nov 2020 17:40:04 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 9E25E15035 for ; Fri, 20 Nov 2020 17:39:34 +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 3D8511502B for ; Fri, 20 Nov 2020 17:39:34 +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 07F4643D48 for ; Fri, 20 Nov 2020 17:39:34 +0100 (CET) From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= To: pbs-devel@lists.proxmox.com Date: Fri, 20 Nov 2020 17:38:36 +0100 Message-Id: <20201120163845.1225080-7-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.026 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. [manifest.rs] Subject: [pbs-devel] [PATCH proxmox-backup 06/13] manifest: check fingerprint when loading with key 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:40:04 -0000 otherwise loading will run into the signature mismatch which is technically true, but not the complete picture in this case. Signed-off-by: Fabian Grünbichler --- src/backup/manifest.rs | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/backup/manifest.rs b/src/backup/manifest.rs index 00dafbd6..a64cbe15 100644 --- a/src/backup/manifest.rs +++ b/src/backup/manifest.rs @@ -273,6 +273,19 @@ impl BackupManifest { if let Some(ref crypt_config) = crypt_config { if let Some(signature) = signature { let expected_signature = proxmox::tools::digest_to_hex(&Self::json_signature(&json, crypt_config)?); + + let fingerprint = &json["unprotected"]["key-fingerprint"]; + if fingerprint != &Value::Null { + let fingerprint = serde_json::from_value(fingerprint.clone())?; + let config_fp = crypt_config.fingerprint(); + if config_fp != fingerprint { + bail!( + "wrong key - unable to verify signature since manifest's key {} does not match provided key {}", + fingerprint, + config_fp + ); + } + } if signature != expected_signature { bail!("wrong signature in manifest"); } -- 2.20.1