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 E2A208A852 for ; Thu, 4 Aug 2022 11:44:01 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id D80332395B for ; Thu, 4 Aug 2022 11:44:01 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (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 firstgate.proxmox.com (Proxmox) with ESMTPS for ; Thu, 4 Aug 2022 11:44:00 +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 7D88542D36 for ; Thu, 4 Aug 2022 11:43:54 +0200 (CEST) From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= To: pbs-devel@lists.proxmox.com Date: Thu, 4 Aug 2022 11:43:50 +0200 Message-Id: <20220804094350.3262432-1-f.gruenbichler@proxmox.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.158 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment 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 proxmox-apt] release-file: improve invalid file-reference handling 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: Thu, 04 Aug 2022 09:44:01 -0000 if we encounter a file reference pointing to a component that is not contained in the componenents list, we can just ignore it as unknown. only treat parsing errors for references pointing to known components as actual errors. this currently triggers with (In)Release files for debian-updates and debian-security, which reference (empty) files for a "non-free-firmware" component that is not listed in the `Components` field of the release file. Signed-off-by: Fabian Grünbichler --- src/deb822/release_file.rs | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/deb822/release_file.rs b/src/deb822/release_file.rs index ee805bb..6068238 100644 --- a/src/deb822/release_file.rs +++ b/src/deb822/release_file.rs @@ -389,11 +389,16 @@ impl TryFrom for ReleaseFile { let (component, file_type) = components .iter() .find_map(|component| { - FileReferenceType::parse(component, &file) - .ok() - .map(|file_type| (component.clone(), file_type)) + if !file.starts_with(&format!("{component}/")) { + return None; + } + + Some( + FileReferenceType::parse(component, &file) + .map(|file_type| (component.clone(), file_type)), + ) }) - .ok_or_else(|| format_err!("failed to parse file reference '{file}'"))?; + .unwrap_or_else(|| Ok(("UNKNOWN".to_string(), FileReferenceType::Unknown)))?; Ok(( FileReference { -- 2.30.2