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 C3593737D7; Fri, 28 May 2021 16:30:12 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id C12CAACE4; Fri, 28 May 2021 16:30:12 +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 8B984AC42; Fri, 28 May 2021 16:30:09 +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 62F73466D8; Fri, 28 May 2021 16:30:09 +0200 (CEST) From: Fabian Ebner To: pve-devel@lists.proxmox.com, pbs-devel@lists.proxmox.com Date: Fri, 28 May 2021 16:29:50 +0200 Message-Id: <20210528143002.16190-12-f.ebner@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210528143002.16190-1-f.ebner@proxmox.com> References: <20210528143002.16190-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.002 Adjusted score from AWL reputation of From: address 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. [apt.rs] Subject: [pve-devel] [PATCH v5 proxmox-backup 11/23] api: apt: add 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, 28 May 2021 14:30:12 -0000 Signed-off-by: Fabian Ebner --- Changes from v4: * moved common_digest helper to proxmox-apt library src/api2/node/apt.rs | 58 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 57 insertions(+), 1 deletion(-) diff --git a/src/api2/node/apt.rs b/src/api2/node/apt.rs index 35c9a79a..0fcdce9c 100644 --- a/src/api2/node/apt.rs +++ b/src/api2/node/apt.rs @@ -7,6 +7,7 @@ use proxmox::api::{api, RpcEnvironment, RpcEnvironmentType, Permission}; use proxmox::api::router::{Router, SubdirMap}; use proxmox::tools::fs::{replace_file, CreateOptions}; +use proxmox_apt::types::{APTRepositoryFile, APTRepositoryFileError}; use proxmox_http::ProxyConfig; use crate::config::node; @@ -17,7 +18,7 @@ use crate::tools::{ 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: { @@ -389,8 +390,63 @@ pub fn get_versions() -> Result, Error> { Ok(packages) } +#[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 = proxmox_apt::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