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 6895C718D7; Fri, 11 Jun 2021 13:45:13 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id F0EBF10C68; Fri, 11 Jun 2021 13:44:37 +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)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 97213108FE; Fri, 11 Jun 2021 13:44:27 +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 3918D43F83; Fri, 11 Jun 2021 13:44:27 +0200 (CEST) From: Fabian Ebner To: pve-devel@lists.proxmox.com, pbs-devel@lists.proxmox.com Date: Fri, 11 Jun 2021 13:44:12 +0200 Message-Id: <20210611114418.28772-24-f.ebner@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210611114418.28772-1-f.ebner@proxmox.com> References: <20210611114418.28772-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.865 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [repositories.rs] Subject: [pve-devel] [PATCH v6 pve-rs 3/4] apt: add upgrade_repositories call 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, 11 Jun 2021 11:45:13 -0000 Signed-off-by: Fabian Ebner --- Changes from v5: * Add doc comment. * Make digest an Option<&str>. * use new/renamed release_upgrade function. * Require that all files can be parsed. src/apt/repositories.rs | 42 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/src/apt/repositories.rs b/src/apt/repositories.rs index 1643a23..c8a06a6 100644 --- a/src/apt/repositories.rs +++ b/src/apt/repositories.rs @@ -66,4 +66,46 @@ mod export { to_value(&no_subscription_enabled)?, )) } + + /// Upgrade the repository configuration to the next major release. + /// + /// If `digest` is specified and doesn't match the current one, the operation is aborted. + #[export] + fn upgrade_repositories(digest: Option<&str>) -> Result<(), Error> { + let (mut files, errors) = proxmox_apt::repositories::repositories()?; + + if files.is_empty() { + bail!("no APT repository files could be parsed!"); + } + + if !errors.is_empty() { + let message = errors + .iter() + .fold("Problem parsing file(s):".to_string(), |message, error| { + format!("{}\n{}", message, error) + }); + bail!(message); + } + + if let Some(digest) = digest { + let expected_digest = proxmox::tools::hex_to_digest(digest)?; + let current_digest = proxmox_apt::repositories::common_digest(&files); + if current_digest != expected_digest { + bail!("detected modified configuration - file changed by other user? Try again."); + } + } + + proxmox_apt::repositories::release_upgrade(&mut files)?; + + if let Err(errors) = proxmox_apt::repositories::write_repositories(&files) { + let message = errors + .iter() + .fold("Problem writing file(s):".to_string(), |message, error| { + format!("{}\n{}", message, error) + }); + bail!(message); + } + + Ok(()) + } } -- 2.20.1