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 6B9D31FF187 for ; Mon, 20 Oct 2025 16:46:58 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 0DE7FBDB6; Mon, 20 Oct 2025 16:47:23 +0200 (CEST) Message-ID: Date: Mon, 20 Oct 2025 16:47:19 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird To: pve-devel@lists.proxmox.com References: <20251017101020.129075-1-n.frey@proxmox.com> Content-Language: en-US From: Nicolas Frey In-Reply-To: <20251017101020.129075-1-n.frey@proxmox.com> X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1760971633670 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.905 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 SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: Re: [pve-devel] [PATCH] fix #5207: apt: check signage of repos with gpgv for POM 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" Superseded-by: https://lore.proxmox.com/pve-devel/20251020144553.360147-1-n.frey@proxmox.com/T/#u On 10/17/25 12:10 PM, Nicolas Frey wrote: > If POM is set up to mirror the PVE repository and only this repository > is added on a PVE host, the `Repositories` panel will show an `Error` > status with the message: > > `No Proxmox VE repository is enabled, you do not get any updates!` > > This is because the current implementation only checks if the uri of > the repo matches that of one of the standard repos. > > This patch aims to fix this issue by verifying it through signage > info via gpgv. Checking against the cached InRelease file at > `/var/lib/apt/lists/` with the help of the function `release_filename` > to encode the uri into the filename generated by APT's URItoFileName > in contrib/strutl.cc. > > Added tests to ensure common file paths for POM would be encoded > correctly. > > Fixes: https://bugzilla.proxmox.com/show_bug.cgi?id=5207 > Signed-off-by: Nicolas Frey > --- > proxmox-apt/src/repositories/repository.rs | 50 ++++++++++++++++++++-- > 1 file changed, 46 insertions(+), 4 deletions(-) > > diff --git a/proxmox-apt/src/repositories/repository.rs b/proxmox-apt/src/repositories/repository.rs > index 24e7943b..a460f5e7 100644 > --- a/proxmox-apt/src/repositories/repository.rs > +++ b/proxmox-apt/src/repositories/repository.rs > @@ -122,18 +122,20 @@ impl APTRepositoryImpl for APTRepository { > product: &str, > suite: &str, > ) -> bool { > - let (package_type, handle_uris, component, _key) = handle.info(product); > + let (package_type, handle_uris, component, key) = handle.info(product); > > - let mut found_uri = false; > + let mut found_uri_or_signed = false; > > for uri in self.uris.iter() { > let uri = uri.trim_end_matches('/'); > > - found_uri = found_uri || handle_uris.iter().any(|handle_uri| handle_uri == uri); > + found_uri_or_signed = found_uri_or_signed > + || handle_uris.iter().any(|handle_uri| handle_uri == uri) > + || gpg_signed(uri, suite, key); > } > > self.types.contains(&package_type) > - && found_uri > + && found_uri_or_signed > // using contains would require a &String > && self.suites.iter().any(|self_suite| self_suite == suite) > && self.components.contains(&component) > @@ -389,8 +391,48 @@ fn write_stanza(repo: &APTRepository, w: &mut dyn Write) -> Result<(), Error> { > Ok(()) > } > > +fn gpg_signed(uri: &str, suite: &str, key: &str) -> bool { > + release_filename(Path::new("/var/lib/apt/lists"), uri, suite, false) > + .to_str() > + .is_some_and(|cached_file| { > + std::process::Command::new("gpgv") > + .args(["--keyring", key, cached_file]) > + .output() > + .is_ok_and(|output| output.status.success()) > + }) > +} > + > #[test] > fn test_uri_to_filename() { > let filename = uri_to_filename("https://some_host/some/path"); > assert_eq!(filename, "some%5fhost_some_path".to_string()); > } > + > +#[test] > +fn test_release_filename() { > + let data = [ > + // testcase for proxmox offline mirror (mounted) > + ( > + Path::new("/var/lib/apt/lists"), > + "file:///mnt/mirror/pve-no-subscription/2025-10-16T08:07:41Z", > + "trixie", > + false, > + // expected > + "/var/lib/apt/lists/_mnt_mirror_pve-no-subscription_2025-10-16T08:07:41Z_dists_trixie_InRelease" > + ), > + // testcase for proxmox offline mirror (local http server) > + ( > + Path::new("/var/lib/apt/lists"), > + "http://proxmox-offline-mirror.domain.example/pve-subscription/2025-10-16T08:07:41Z", > + "trixie", > + false, > + // expected > + "/var/lib/apt/lists/proxmox-offline-mirror.domain.example_pve-subscription_2025-10-16T08:07:41Z_dists_trixie_InRelease" > + ), > + ]; > + > + for d in data { > + let filename = release_filename(d.0, d.1, d.2, d.3).to_str(); > + assert_eq!(filename, Some(d.4)); > + } > +} _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel