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 919C772237 for ; Thu, 1 Jul 2021 09:54:36 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 875B221CD9 for ; Thu, 1 Jul 2021 09:54:06 +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 D9F8821CCE for ; Thu, 1 Jul 2021 09:54:05 +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 A47334285E for ; Thu, 1 Jul 2021 09:54:05 +0200 (CEST) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Thu, 1 Jul 2021 09:54:00 +0200 Message-Id: <20210701075400.34326-3-f.ebner@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210701075400.34326-1-f.ebner@proxmox.com> References: <20210701075400.34326-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.608 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: [pve-devel] [PATCH pve-rs 1/1] apt: avoid overwriting files that could not be parsed 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: Thu, 01 Jul 2021 07:54:36 -0000 The enable/disable case should not be reachable via UI as the digest check comes first, but it's still good to fix it too. Reported-by: Dominik Csapak Signed-off-by: Fabian Ebner --- src/apt/repositories.rs | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/src/apt/repositories.rs b/src/apt/repositories.rs index 3a421f0..26af67c 100644 --- a/src/apt/repositories.rs +++ b/src/apt/repositories.rs @@ -60,7 +60,7 @@ mod export { /// The `digest` parameter asserts that the configuration has not been modified. #[export] pub fn add_repository(handle: &str, digest: Option<&str>) -> Result<(), Error> { - let (mut files, _errors, current_digest) = proxmox_apt::repositories::repositories()?; + let (mut files, errors, current_digest) = proxmox_apt::repositories::repositories()?; if let Some(digest) = digest { let expected_digest = proxmox::tools::hex_to_digest(digest)?; @@ -72,6 +72,14 @@ mod export { let (repo, path) = proxmox_apt::repositories::get_standard_repository(handle.try_into()?, "pve")?; + if let Some(error) = errors.iter().find(|error| error.path == path) { + bail!( + "unable to parse existing file {} - {}", + error.path, + error.error, + ); + } + if let Some(file) = files.iter_mut().find(|file| file.path == path) { file.repositories.push(repo); @@ -100,7 +108,7 @@ mod export { options: ChangeProperties, digest: Option<&str>, ) -> Result<(), Error> { - let (mut files, _errors, current_digest) = proxmox_apt::repositories::repositories()?; + let (mut files, errors, current_digest) = proxmox_apt::repositories::repositories()?; if let Some(digest) = digest { let expected_digest = proxmox::tools::hex_to_digest(digest)?; @@ -109,6 +117,10 @@ mod export { } } + if let Some(error) = errors.iter().find(|error| error.path == path) { + bail!("unable to parse file {} - {}", error.path, error.error); + } + if let Some(file) = files.iter_mut().find(|file| file.path == path) { if let Some(repo) = file.repositories.get_mut(index) { if let Some(enabled) = options.enabled { -- 2.30.2