From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <f.ebner@proxmox.com>
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 D9ACC69FEC
for <pve-devel@lists.proxmox.com>; Thu, 29 Jul 2021 14:26:59 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 433D52EE2B
for <pve-devel@lists.proxmox.com>; Thu, 29 Jul 2021 14:26: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))
(No client certificate requested)
by firstgate.proxmox.com (Proxmox) with ESMTPS id E5DC92EE5C
for <pve-devel@lists.proxmox.com>; Thu, 29 Jul 2021 14:25:58 +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 BF74142C5D
for <pve-devel@lists.proxmox.com>; Thu, 29 Jul 2021 14:25:58 +0200 (CEST)
From: Fabian Ebner <f.ebner@proxmox.com>
To: pve-devel@lists.proxmox.com
Date: Thu, 29 Jul 2021 14:25:48 +0200
Message-Id: <20210729122554.148980-2-f.ebner@proxmox.com>
X-Mailer: git-send-email 2.30.2
In-Reply-To: <20210729122554.148980-1-f.ebner@proxmox.com>
References: <20210729122554.148980-1-f.ebner@proxmox.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-SPAM-LEVEL: Spam detection results: 0
AWL 0.457 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 proxmox-apt 1/5] standard repos: add suite
parameter for stricter detection
X-BeenThere: pve-devel@lists.proxmox.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Proxmox VE development discussion <pve-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/>
List-Post: <mailto:pve-devel@lists.proxmox.com>
List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=subscribe>
X-List-Received-Date: Thu, 29 Jul 2021 12:26:59 -0000
Require that the suite matches too when detecting standard
repositories, since no or invalid updates will be obtained when the
suite is wrong. Thus, it should not be considered to be the same
repository.
Add the parameter for get_standard_repository too, so that the two
related calls have more similar parameters, and the detection of the
current release code name can be done once in the caller once.
This also will fix an issue with the front-end, where adding a
standard repository would end up just enabling an already present
repository with the wrong suite.
Reported-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
---
src/repositories/mod.rs | 20 ++++++++++----------
src/repositories/repository.rs | 13 +++++++++++--
tests/repositories.rs | 21 +++++++++++++++------
3 files changed, 36 insertions(+), 18 deletions(-)
diff --git a/src/repositories/mod.rs b/src/repositories/mod.rs
index 7bac333..8637851 100644
--- a/src/repositories/mod.rs
+++ b/src/repositories/mod.rs
@@ -12,7 +12,7 @@ mod file;
pub use file::{APTRepositoryFile, APTRepositoryFileError, APTRepositoryInfo};
mod release;
-use release::get_current_release_codename;
+pub use release::get_current_release_codename;
mod standard;
pub use standard::{APTRepositoryHandle, APTStandardRepository};
@@ -60,24 +60,24 @@ pub fn check_repositories(files: &[APTRepositoryFile]) -> Result<Vec<APTReposito
Ok(infos)
}
-/// Get the repository associated to the handle and the path where its usually configured.
+/// Get the repository associated to the handle and the path where it is usually configured.
pub fn get_standard_repository(
handle: APTRepositoryHandle,
product: &str,
-) -> Result<(APTRepository, String), Error> {
- let suite = get_current_release_codename()?;
-
+ suite: &str,
+) -> (APTRepository, String) {
let repo = handle.to_repository(product, &suite);
let path = handle.path(product);
- Ok((repo, path))
+ (repo, path)
}
-/// Return handles for standard Proxmox repositories and whether their status, where
-/// None means not configured, and Some(bool) indicates enabled or disabled
+/// Return handles for standard Proxmox repositories and their status, where
+/// `None` means not configured, and `Some(bool)` indicates enabled or disabled.
pub fn standard_repositories(
- product: &str,
files: &[APTRepositoryFile],
+ product: &str,
+ suite: &str,
) -> Vec<APTStandardRepository> {
let mut result = vec![
APTStandardRepository::from(APTRepositoryHandle::Enterprise),
@@ -101,7 +101,7 @@ pub fn standard_repositories(
continue;
}
- if repo.is_referenced_repository(entry.handle, product) {
+ if repo.is_referenced_repository(entry.handle, product, suite) {
entry.status = Some(repo.enabled);
}
}
diff --git a/src/repositories/repository.rs b/src/repositories/repository.rs
index b56ec47..fc16327 100644
--- a/src/repositories/repository.rs
+++ b/src/repositories/repository.rs
@@ -270,7 +270,12 @@ impl APTRepository {
}
/// Checks if the repository is the one referenced by the handle.
- pub fn is_referenced_repository(&self, handle: APTRepositoryHandle, product: &str) -> bool {
+ pub fn is_referenced_repository(
+ &self,
+ handle: APTRepositoryHandle,
+ product: &str,
+ suite: &str,
+ ) -> bool {
let (package_type, handle_uris, component) = handle.info(product);
let mut found_uri = false;
@@ -281,7 +286,11 @@ impl APTRepository {
found_uri = found_uri || handle_uris.iter().any(|handle_uri| handle_uri == uri);
}
- self.types.contains(&package_type) && found_uri && self.components.contains(&component)
+ self.types.contains(&package_type)
+ && found_uri
+ // using contains would require a &String
+ && self.suites.iter().any(|self_suite| self_suite == suite)
+ && self.components.contains(&component)
}
/// Check if a variant of the given suite is configured in this repository
diff --git a/tests/repositories.rs b/tests/repositories.rs
index 6435671..4cbde60 100644
--- a/tests/repositories.rs
+++ b/tests/repositories.rs
@@ -5,8 +5,8 @@ use anyhow::{bail, format_err, Error};
use proxmox_apt::config::APTConfig;
use proxmox_apt::repositories::{
- check_repositories, standard_repositories, APTRepositoryFile, APTRepositoryHandle,
- APTRepositoryInfo, APTStandardRepository,
+ check_repositories, get_current_release_codename, standard_repositories, APTRepositoryFile,
+ APTRepositoryHandle, APTRepositoryInfo, APTStandardRepository,
};
#[test]
@@ -337,7 +337,7 @@ fn test_standard_repositories() -> Result<(), Error> {
let mut file = APTRepositoryFile::new(&absolute_suite_list)?.unwrap();
file.parse()?;
- let std_repos = standard_repositories("pve", &vec![file]);
+ let std_repos = standard_repositories(&vec![file], "pve", "bullseye");
assert_eq!(std_repos, expected);
@@ -347,14 +347,14 @@ fn test_standard_repositories() -> Result<(), Error> {
let file_vec = vec![file];
- let std_repos = standard_repositories("pbs", &file_vec);
+ let std_repos = standard_repositories(&file_vec, "pbs", "bullseye");
assert_eq!(&std_repos, &expected[0..=2]);
expected[0].status = Some(false);
expected[1].status = Some(true);
- let std_repos = standard_repositories("pve", &file_vec);
+ let std_repos = standard_repositories(&file_vec, "pve", "bullseye");
assert_eq!(std_repos, expected);
@@ -368,9 +368,18 @@ fn test_standard_repositories() -> Result<(), Error> {
expected[1].status = Some(true);
expected[2].status = Some(false);
- let std_repos = standard_repositories("pve", &file_vec);
+ let std_repos = standard_repositories(&file_vec, "pve", "bullseye");
assert_eq!(std_repos, expected);
Ok(())
}
+
+#[test]
+fn test_get_current_release_codename() -> Result<(), Error> {
+ let codename = get_current_release_codename()?;
+
+ assert_eq!(&codename, "bullseye");
+
+ Ok(())
+}
--
2.30.2