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 6837170451 for ; Fri, 2 Apr 2021 13:21:30 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 57CB6E297 for ; Fri, 2 Apr 2021 13:21:00 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (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 8BFBBE23E for ; Fri, 2 Apr 2021 13:20:57 +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 5603145C22 for ; Fri, 2 Apr 2021 13:20:57 +0200 (CEST) From: Fabian Ebner To: pbs-devel@lists.proxmox.com Date: Fri, 2 Apr 2021 13:20:47 +0200 Message-Id: <20210402112051.14628-7-f.ebner@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210402112051.14628-1-f.ebner@proxmox.com> References: <20210402112051.14628-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.007 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust 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. [apt.rs] Subject: [pbs-devel] [PATCH v4 proxmox-backup 06/10] api: apt: add repositories call X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 02 Apr 2021 11:21:30 -0000 Signed-off-by: Fabian Ebner --- Changes from v3: * adapt to new library behavior * add helper to calculate common digest * return successfully parsed files and errors separately src/api2/node/apt.rs | 83 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 82 insertions(+), 1 deletion(-) diff --git a/src/api2/node/apt.rs b/src/api2/node/apt.rs index e77b89fa..c91d03e1 100644 --- a/src/api2/node/apt.rs +++ b/src/api2/node/apt.rs @@ -1,16 +1,19 @@ use anyhow::{Error, bail, format_err}; use serde_json::{json, Value}; +use std::collections::BTreeMap; use std::collections::HashMap; use proxmox::list_subdirs_api_method; use proxmox::api::{api, RpcEnvironment, RpcEnvironmentType, Permission}; use proxmox::api::router::{Router, SubdirMap}; +use proxmox_apt::types::{APTRepositoryFile, APTRepositoryFileError}; + use crate::server::WorkerTask; use crate::tools::{apt, http, subscription}; use crate::config::acl::{PRIV_SYS_AUDIT, PRIV_SYS_MODIFY}; -use crate::api2::types::{Authid, APTUpdateInfo, NODE_SCHEMA, UPID_SCHEMA}; +use crate::api2::types::{Authid, APTUpdateInfo, NODE_SCHEMA, PROXMOX_CONFIG_DIGEST_SCHEMA, UPID_SCHEMA}; #[api( input: { @@ -350,8 +353,86 @@ pub fn get_versions() -> Result, Error> { Ok(packages) } +/// Calculates a common digest for successfully parsed repository files. +/// +/// The digest is invariant with respect to file order. +/// +/// Files without a digest are ignored. +fn repositories_common_digest(files: &Vec) -> [u8; 32] { + let mut digests = BTreeMap::new(); + + for file in files.iter() { + digests.insert(file.path.clone(), &file.digest); + } + + let mut common_raw = Vec::::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[..]) +} + +#[api( + input: { + properties: { + node: { + schema: NODE_SCHEMA, + }, + }, + }, + returns: { + type: Object, + description: "Result from parsing the APT repository files in /etc/apt/.", + properties: { + files: { + description: "List of parsed repository files.", + type: Array, + items: { + type: APTRepositoryFile, + } + }, + errors: { + description: "List of problematic files.", + type: Array, + items: { + type: APTRepositoryFileError, + } + }, + digest: { + schema: PROXMOX_CONFIG_DIGEST_SCHEMA, + }, + }, + }, + access: { + permission: &Permission::Privilege(&[], PRIV_SYS_AUDIT, false), + }, +)] +/// Get APT repository information +pub fn get_repositories() -> Result { + let (files, errors) = proxmox_apt::repositories::repositories()?; + + if files.len() == 0 { + bail!("no APT repository files could be parsed!"); + } + + let common_digest = repositories_common_digest(&files); + + let hex_digest = proxmox::tools::digest_to_hex(&common_digest); + + Ok(json!({ + "files": files, + "errors": errors, + "digest": hex_digest, + })) +} + const SUBDIRS: SubdirMap = &[ ("changelog", &Router::new().get(&API_METHOD_APT_GET_CHANGELOG)), + ("repositories", &Router::new().get(&API_METHOD_GET_REPOSITORIES)), ("update", &Router::new() .get(&API_METHOD_APT_UPDATE_AVAILABLE) .post(&API_METHOD_APT_UPDATE_DATABASE) -- 2.20.1