From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 05E0D1FF165 for ; Thu, 23 Oct 2025 12:40:21 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id EF76C70E8; Thu, 23 Oct 2025 12:40:35 +0200 (CEST) From: Nicolas Frey To: pve-devel@lists.proxmox.com Date: Thu, 23 Oct 2025 12:39:53 +0200 Message-ID: <20251023103953.305810-5-n.frey@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20251023103953.305810-1-n.frey@proxmox.com> References: <20251023103953.305810-1-n.frey@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.035 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods RDNS_NONE 0.793 Delivered to internal network by a host with no rDNS SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_NONE 0.001 SPF: sender does not publish an SPF Record Subject: [pve-devel] [PATCH proxmox v5 4/4] apt: check for local POM InRelease as fallback 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: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" Add local file fallback in case that the URI starts with `file://`, which is useful if a POM repo is stored on a medium. This improves UX by not necessarily needing to apt update to see immediate feedback in the Repositories UI of pve/pbs. If the medium is not present, the signature verification will simply fail. Signed-off-by: Nicolas Frey --- proxmox-apt/src/repositories/repository.rs | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/proxmox-apt/src/repositories/repository.rs b/proxmox-apt/src/repositories/repository.rs index 1b3f010e..b8b2ecc4 100644 --- a/proxmox-apt/src/repositories/repository.rs +++ b/proxmox-apt/src/repositories/repository.rs @@ -396,12 +396,7 @@ fn write_stanza(repo: &APTRepository, w: &mut dyn Write) -> Result<(), Error> { /// Reads file contents of cached/local POM InRelease file from uri /// and key to verify pgp signature fn is_signed_by_key(uri: &str, suite: &str, key_path: &str) -> bool { - let data = match std::fs::read(&release_filename( - Path::new("/var/lib/apt/lists"), - uri, - suite, - false, - )) { + let data = match read_inrelease(uri, suite) { Ok(d) => d, Err(err) => { log::warn!("could not read InRelease file: {err}"); @@ -425,6 +420,20 @@ fn is_signed_by_key(uri: &str, suite: &str, key_path: &str) -> bool { true } +/// Reads cached/local POM InRelease file +fn read_inrelease(uri: &str, suite: &str) -> Result, Error> { + let path = release_filename(Path::new("/var/lib/apt/lists"), uri, suite, false); + + if path.exists() { + std::fs::read(&path).map_err(Into::into) + } else if let Some(local_path) = uri.strip_prefix("file://") { + let inrelease_path = format!("{}/dists/{}/InRelease", local_path, suite); + std::fs::read(&inrelease_path).map_err(Into::into) + } else { + bail!("Unsupported URI scheme: {}", uri); + } +} + #[test] fn test_uri_to_filename() { let filename = uri_to_filename("https://some_host/some/path"); -- 2.47.3 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel