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 17A4674401 for ; Thu, 8 Jul 2021 16:14:37 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 09C391954B for ; Thu, 8 Jul 2021 16:14:37 +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 2EDA919527 for ; Thu, 8 Jul 2021 16:14:35 +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 05A0640F1F for ; Thu, 8 Jul 2021 16:14:35 +0200 (CEST) From: Fabian Ebner To: pbs-devel@lists.proxmox.com Date: Thu, 8 Jul 2021 16:14:27 +0200 Message-Id: <20210708141429.190218-3-f.ebner@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210708141429.190218-1-f.ebner@proxmox.com> References: <20210708141429.190218-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.544 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 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 proxmox-backup 2/4] 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: Thu, 08 Jul 2021 14:14:37 -0000 Signed-off-by: Fabian Ebner --- src/api2/node/apt.rs | 70 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 69 insertions(+), 1 deletion(-) diff --git a/src/api2/node/apt.rs b/src/api2/node/apt.rs index 054c8813..4551b151 100644 --- a/src/api2/node/apt.rs +++ b/src/api2/node/apt.rs @@ -7,6 +7,9 @@ use proxmox::api::{api, RpcEnvironment, RpcEnvironmentType, Permission}; use proxmox::api::router::{Router, SubdirMap}; use proxmox::tools::fs::{replace_file, CreateOptions}; +use proxmox_apt::repositories::{ + APTRepositoryFile, APTRepositoryFileError, APTRepositoryInfo, APTStandardRepository, +}; use proxmox_http::ProxyConfig; use crate::config::node; @@ -17,7 +20,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 +392,73 @@ 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, + }, + infos: { + description: "List of additional information/warnings about the repositories.", + items: { + type: APTRepositoryInfo, + }, + }, + "standard-repos": { + description: "List of standard repositories and their configuration status.", + items: { + type: APTStandardRepository, + }, + }, + }, + }, + access: { + permission: &Permission::Privilege(&[], PRIV_SYS_AUDIT, false), + }, +)] +/// Get APT repository information. +pub fn get_repositories() -> Result { + let (files, errors, digest) = proxmox_apt::repositories::repositories()?; + let digest = proxmox::tools::digest_to_hex(&digest); + + let infos = proxmox_apt::repositories::check_repositories(&files)?; + let standard_repos = proxmox_apt::repositories::standard_repositories("pbs", &files); + + Ok(json!({ + "files": files, + "errors": errors, + "digest": digest, + "infos": infos, + "standard-repos": standard_repos, + })) +} + 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.30.2