all lists on lists.proxmox.com
 help / color / mirror / Atom feed
From: Fabian Ebner <f.ebner@proxmox.com>
To: pve-devel@lists.proxmox.com, pbs-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH v5 proxmox-apt 05/23] add common_digest helper
Date: Fri, 28 May 2021 16:29:44 +0200	[thread overview]
Message-ID: <20210528143002.16190-6-f.ebner@proxmox.com> (raw)
In-Reply-To: <20210528143002.16190-1-f.ebner@proxmox.com>

which allows library users to detect whether they're still dealing with the same
repository configuration or not.

Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
---

New in v5.

 src/repositories/mod.rs | 24 ++++++++++++++++++++++
 tests/repositories.rs   | 44 +++++++++++++++++++++++++++++++++++++++--
 2 files changed, 66 insertions(+), 2 deletions(-)

diff --git a/src/repositories/mod.rs b/src/repositories/mod.rs
index c2bbc06..2c01011 100644
--- a/src/repositories/mod.rs
+++ b/src/repositories/mod.rs
@@ -1,3 +1,4 @@
+use std::collections::BTreeMap;
 use std::path::PathBuf;
 
 use anyhow::{bail, format_err, Error};
@@ -165,6 +166,29 @@ pub fn check_repositories(files: &[APTRepositoryFile]) -> Vec<APTRepositoryInfo>
     infos
 }
 
+/// Calculates a common digest for successfully parsed repository files.
+///
+/// The digest is invariant with respect to file order.
+///
+/// Files without a digest are ignored.
+pub fn common_digest(files: &[APTRepositoryFile]) -> [u8; 32] {
+    let mut digests = BTreeMap::new();
+
+    for file in files.iter() {
+        digests.insert(file.path.clone(), &file.digest);
+    }
+
+    let mut common_raw = Vec::<u8>::with_capacity(digests.len() * 32);
+    for digest in digests.values() {
+        match digest {
+            Some(digest) => common_raw.extend_from_slice(&digest[..]),
+            None => (),
+        }
+    }
+
+    openssl::sha::sha256(&common_raw[..])
+}
+
 /// Checks if the enterprise repository for the specified Proxmox product is
 /// configured and enabled.
 pub fn enterprise_repository_enabled(files: &[APTRepositoryFile], product: &str) -> bool {
diff --git a/tests/repositories.rs b/tests/repositories.rs
index 9b0cd56..3919077 100644
--- a/tests/repositories.rs
+++ b/tests/repositories.rs
@@ -3,8 +3,8 @@ use std::path::PathBuf;
 use anyhow::{bail, format_err, Error};
 
 use proxmox_apt::repositories::{
-    check_repositories, enterprise_repository_enabled, no_subscription_repository_enabled,
-    write_repositories,
+    check_repositories, common_digest, enterprise_repository_enabled,
+    no_subscription_repository_enabled, write_repositories,
 };
 use proxmox_apt::types::{APTRepositoryFile, APTRepositoryInfo};
 
@@ -252,3 +252,43 @@ fn test_check_repositories() -> Result<(), Error> {
 
     Ok(())
 }
+
+#[test]
+fn test_common_digest() -> Result<(), Error> {
+    let test_dir = std::env::current_dir()?.join("tests");
+    let read_dir = test_dir.join("sources.list.d");
+
+    let pve_list = read_dir.join("pve.list");
+    let mut pve_file = APTRepositoryFile::new(&pve_list)?.unwrap();
+    pve_file.parse()?;
+
+    let standard_sources = read_dir.join("standard.sources");
+    let mut standard_file = APTRepositoryFile::new(&standard_sources)?.unwrap();
+    standard_file.parse()?;
+
+    let expected_digest = [
+        187, 82, 67, 137, 156, 156, 49, 84, 1, 221, 240, 24, 193, 201, 247, 252, 6, 128, 137, 241,
+        169, 176, 78, 193, 4, 190, 117, 136, 96, 28, 46, 78,
+    ];
+
+    let mut files = vec![pve_file, standard_file];
+
+    let digest = common_digest(&files);
+    assert_eq!(digest, expected_digest);
+
+    // order should be irrelevant
+    files.reverse();
+    let digest = common_digest(&files);
+    assert_eq!(digest, expected_digest);
+
+    let digest = common_digest(&files[0..=0]);
+    assert_ne!(digest, expected_digest);
+
+    let mut file = files.first_mut().unwrap();
+    file.digest = Some(expected_digest);
+
+    let digest = common_digest(&files);
+    assert_ne!(digest, expected_digest);
+
+    Ok(())
+}
-- 
2.20.1





WARNING: multiple messages have this Message-ID
From: Fabian Ebner <f.ebner@proxmox.com>
To: pve-devel@lists.proxmox.com, pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [PATCH v5 proxmox-apt 05/23] add common_digest helper
Date: Fri, 28 May 2021 16:29:44 +0200	[thread overview]
Message-ID: <20210528143002.16190-6-f.ebner@proxmox.com> (raw)
In-Reply-To: <20210528143002.16190-1-f.ebner@proxmox.com>

which allows library users to detect whether they're still dealing with the same
repository configuration or not.

Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
---

New in v5.

 src/repositories/mod.rs | 24 ++++++++++++++++++++++
 tests/repositories.rs   | 44 +++++++++++++++++++++++++++++++++++++++--
 2 files changed, 66 insertions(+), 2 deletions(-)

diff --git a/src/repositories/mod.rs b/src/repositories/mod.rs
index c2bbc06..2c01011 100644
--- a/src/repositories/mod.rs
+++ b/src/repositories/mod.rs
@@ -1,3 +1,4 @@
+use std::collections::BTreeMap;
 use std::path::PathBuf;
 
 use anyhow::{bail, format_err, Error};
@@ -165,6 +166,29 @@ pub fn check_repositories(files: &[APTRepositoryFile]) -> Vec<APTRepositoryInfo>
     infos
 }
 
+/// Calculates a common digest for successfully parsed repository files.
+///
+/// The digest is invariant with respect to file order.
+///
+/// Files without a digest are ignored.
+pub fn common_digest(files: &[APTRepositoryFile]) -> [u8; 32] {
+    let mut digests = BTreeMap::new();
+
+    for file in files.iter() {
+        digests.insert(file.path.clone(), &file.digest);
+    }
+
+    let mut common_raw = Vec::<u8>::with_capacity(digests.len() * 32);
+    for digest in digests.values() {
+        match digest {
+            Some(digest) => common_raw.extend_from_slice(&digest[..]),
+            None => (),
+        }
+    }
+
+    openssl::sha::sha256(&common_raw[..])
+}
+
 /// Checks if the enterprise repository for the specified Proxmox product is
 /// configured and enabled.
 pub fn enterprise_repository_enabled(files: &[APTRepositoryFile], product: &str) -> bool {
diff --git a/tests/repositories.rs b/tests/repositories.rs
index 9b0cd56..3919077 100644
--- a/tests/repositories.rs
+++ b/tests/repositories.rs
@@ -3,8 +3,8 @@ use std::path::PathBuf;
 use anyhow::{bail, format_err, Error};
 
 use proxmox_apt::repositories::{
-    check_repositories, enterprise_repository_enabled, no_subscription_repository_enabled,
-    write_repositories,
+    check_repositories, common_digest, enterprise_repository_enabled,
+    no_subscription_repository_enabled, write_repositories,
 };
 use proxmox_apt::types::{APTRepositoryFile, APTRepositoryInfo};
 
@@ -252,3 +252,43 @@ fn test_check_repositories() -> Result<(), Error> {
 
     Ok(())
 }
+
+#[test]
+fn test_common_digest() -> Result<(), Error> {
+    let test_dir = std::env::current_dir()?.join("tests");
+    let read_dir = test_dir.join("sources.list.d");
+
+    let pve_list = read_dir.join("pve.list");
+    let mut pve_file = APTRepositoryFile::new(&pve_list)?.unwrap();
+    pve_file.parse()?;
+
+    let standard_sources = read_dir.join("standard.sources");
+    let mut standard_file = APTRepositoryFile::new(&standard_sources)?.unwrap();
+    standard_file.parse()?;
+
+    let expected_digest = [
+        187, 82, 67, 137, 156, 156, 49, 84, 1, 221, 240, 24, 193, 201, 247, 252, 6, 128, 137, 241,
+        169, 176, 78, 193, 4, 190, 117, 136, 96, 28, 46, 78,
+    ];
+
+    let mut files = vec![pve_file, standard_file];
+
+    let digest = common_digest(&files);
+    assert_eq!(digest, expected_digest);
+
+    // order should be irrelevant
+    files.reverse();
+    let digest = common_digest(&files);
+    assert_eq!(digest, expected_digest);
+
+    let digest = common_digest(&files[0..=0]);
+    assert_ne!(digest, expected_digest);
+
+    let mut file = files.first_mut().unwrap();
+    file.digest = Some(expected_digest);
+
+    let digest = common_digest(&files);
+    assert_ne!(digest, expected_digest);
+
+    Ok(())
+}
-- 
2.20.1





  parent reply	other threads:[~2021-05-28 14:30 UTC|newest]

Thread overview: 60+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-05-28 14:29 [pve-devel] [PATCH-SERIES v5] APT repositories API/UI Fabian Ebner
2021-05-28 14:29 ` [pbs-devel] " Fabian Ebner
2021-05-28 14:29 ` [pve-devel] [PATCH v5 proxmox-apt 01/23] initial commit Fabian Ebner
2021-05-28 14:29   ` [pbs-devel] " Fabian Ebner
2021-05-28 14:29 ` [pve-devel] [PATCH v5 proxmox-apt 02/23] add files for Debian packaging Fabian Ebner
2021-05-28 14:29   ` [pbs-devel] " Fabian Ebner
2021-05-28 14:29 ` [pve-devel] [PATCH v5 proxmox-apt 03/23] add functions to check for Proxmox repositories Fabian Ebner
2021-05-28 14:29   ` [pbs-devel] " Fabian Ebner
2021-05-28 14:29 ` [pve-devel] [PATCH v5 proxmox-apt 04/23] add check_repositories function Fabian Ebner
2021-05-28 14:29   ` [pbs-devel] " Fabian Ebner
2021-05-28 14:29 ` Fabian Ebner [this message]
2021-05-28 14:29   ` [pbs-devel] [PATCH v5 proxmox-apt 05/23] add common_digest helper Fabian Ebner
2021-05-28 14:29 ` [pve-devel] [PATCH v5 proxmox-apt 06/23] add replace_suite function and constants for the current/next stable suites Fabian Ebner
2021-05-28 14:29   ` [pbs-devel] " Fabian Ebner
2021-05-31 13:06   ` [pve-devel] " Fabian Ebner
2021-05-31 13:06     ` Fabian Ebner
2021-05-28 14:29 ` [pve-devel] [PATCH v5 proxmox-widget-toolkit 07/23] add UI for APT repositories Fabian Ebner
2021-05-28 14:29   ` [pbs-devel] " Fabian Ebner
2021-05-28 14:29 ` [pve-devel] [PATCH v5 proxmox-widget-toolkit 08/23] APT repositories: add warnings Fabian Ebner
2021-05-28 14:29   ` [pbs-devel] " Fabian Ebner
2021-05-28 14:29 ` [pve-devel] [PATCH v5 proxmox-widget-toolkit 09/23] add upgrade button Fabian Ebner
2021-05-28 14:29   ` [pbs-devel] " Fabian Ebner
2021-05-28 14:29 ` [pve-devel] [PATCH v5 proxmox-backup 10/23] depend on new proxmox-apt crate Fabian Ebner
2021-05-28 14:29   ` [pbs-devel] " Fabian Ebner
2021-05-28 14:29 ` [pve-devel] [PATCH v5 proxmox-backup 11/23] api: apt: add repositories call Fabian Ebner
2021-05-28 14:29   ` [pbs-devel] " Fabian Ebner
2021-05-28 14:29 ` [pve-devel] [PATCH v5 proxmox-backup 12/23] ui: add APT repositories Fabian Ebner
2021-05-28 14:29   ` [pbs-devel] " Fabian Ebner
2021-05-28 14:29 ` [pve-devel] [PATCH v5 proxmox-backup 13/23] add check_repositories_call Fabian Ebner
2021-05-28 14:29   ` [pbs-devel] " Fabian Ebner
2021-05-28 14:29 ` [pve-devel] [RFC v5 proxmox-backup 14/23] RFC: add upgrade_repositories call Fabian Ebner
2021-05-28 14:29   ` [pbs-devel] " Fabian Ebner
2021-05-28 14:29 ` [pve-devel] [RFC v5 pve-rs 15/23] add cargo config Fabian Ebner
2021-05-28 14:29   ` [pbs-devel] " Fabian Ebner
2021-05-31 12:53   ` [pve-devel] " Wolfgang Bumiller
2021-05-31 12:53     ` Wolfgang Bumiller
2021-05-31 13:12     ` [pve-devel] " Fabian Ebner
2021-05-31 13:12       ` Fabian Ebner
2021-05-28 14:29 ` [pve-devel] [RFC v5 pve-rs 16/23] add perlmod crate with initial APT module Fabian Ebner
2021-05-28 14:29   ` [pbs-devel] " Fabian Ebner
2021-05-31 12:55   ` [pve-devel] " Wolfgang Bumiller
2021-05-31 12:55     ` Wolfgang Bumiller
2021-05-31 13:17     ` [pve-devel] " Fabian Ebner
2021-05-31 13:17       ` Fabian Ebner
2021-05-31 13:07   ` [pve-devel] " Wolfgang Bumiller
2021-05-31 13:07     ` Wolfgang Bumiller
2021-05-28 14:29 ` [pve-devel] [RFC v5 pve-rs 17/23] add files for Debian packaging Fabian Ebner
2021-05-28 14:29   ` [pbs-devel] " Fabian Ebner
2021-05-28 14:29 ` [pve-devel] [RFC v5 pve-rs 18/23] update .gitignore Fabian Ebner
2021-05-28 14:29   ` [pbs-devel] " Fabian Ebner
2021-05-28 14:29 ` [pve-devel] [RFC v5 pve-rs 19/23] RFC: add upgrade_repositories wrapper Fabian Ebner
2021-05-28 14:29   ` [pbs-devel] " Fabian Ebner
2021-05-28 14:29 ` [pve-devel] [RFC v5 pve-manager 20/23] api: apt: add call to list repositories Fabian Ebner
2021-05-28 14:29   ` [pbs-devel] " Fabian Ebner
2021-05-28 14:30 ` [pve-devel] [RFC v5 pve-manager 21/23] ui: add panel for listing APT repositories Fabian Ebner
2021-05-28 14:30   ` [pbs-devel] " Fabian Ebner
2021-05-28 14:30 ` [pve-devel] [RFC v5 pve-manager 22/23] api: apt: add call for repository check Fabian Ebner
2021-05-28 14:30   ` [pbs-devel] " Fabian Ebner
2021-05-28 14:30 ` [pve-devel] [RFC v5 pve-manager 23/23] api: apt: add upgrade repos call Fabian Ebner
2021-05-28 14:30   ` [pbs-devel] " Fabian Ebner

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210528143002.16190-6-f.ebner@proxmox.com \
    --to=f.ebner@proxmox.com \
    --cc=pbs-devel@lists.proxmox.com \
    --cc=pve-devel@lists.proxmox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal