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 D871C739EB; Fri, 28 May 2021 16:30:56 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 6A7D7AF91; Fri, 28 May 2021 16:30:21 +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 66EB7AC5C; Fri, 28 May 2021 16:30:10 +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 3BDC84179F; Fri, 28 May 2021 16:30:10 +0200 (CEST) From: Fabian Ebner To: pve-devel@lists.proxmox.com, pbs-devel@lists.proxmox.com Date: Fri, 28 May 2021 16:29:52 +0200 Message-Id: <20210528143002.16190-14-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.003 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 13/23] add check_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:56 -0000 Signed-off-by: Fabian Ebner --- Changes from v4: * use common_digest function now living in the library * use 'infos' in the return value description to match the actual return value key src/api2/node/apt.rs | 68 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 67 insertions(+), 1 deletion(-) diff --git a/src/api2/node/apt.rs b/src/api2/node/apt.rs index 0fcdce9c..deb481a7 100644 --- a/src/api2/node/apt.rs +++ b/src/api2/node/apt.rs @@ -7,7 +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_apt::types::{APTRepositoryFile, APTRepositoryFileError, APTRepositoryInfo}; use proxmox_http::ProxyConfig; use crate::config::node; @@ -390,6 +390,71 @@ pub fn get_versions() -> Result, Error> { Ok(packages) } +#[api( + input: { + properties: { + node: { + schema: NODE_SCHEMA, + }, + digest: { + schema: PROXMOX_CONFIG_DIGEST_SCHEMA, + optional: true, + }, + }, + }, + returns: { + type: Object, + description: "Additional sanity checks for the configured APT repositories.", + properties: { + infos: { + description: "Additional information/warnings for APT repositories.", + type: Array, + items: { + type: APTRepositoryInfo, + }, + }, + enterprise: { + description: "Whether the enterprise repository is enabled or not.", + type: Boolean, + }, + nosubscription: { + description: "Whether the no-subscription repository is enabled or not.", + type: Boolean, + }, + }, + }, + access: { + permission: &Permission::Privilege(&[], PRIV_SYS_AUDIT, false), + }, +)] +/// Additional sanity checks for the configured APT repositories. +pub fn check_repositories(digest: Option) -> Result { + let (files, _) = proxmox_apt::repositories::repositories()?; + + if files.len() == 0 { + bail!("no APT repository files could be parsed!"); + } + + if let Some(digest) = digest { + let expected_digest = proxmox::tools::hex_to_digest(&digest)?; + let current_digest = proxmox_apt::repositories::common_digest(&files); + crate::tools::detect_modified_configuration_file(¤t_digest, &expected_digest)?; + } + + let infos = proxmox_apt::repositories::check_repositories(&files); + + let enterprise_enabled = + proxmox_apt::repositories::enterprise_repository_enabled(&files, "pbs"); + let no_subscription_enabled = + proxmox_apt::repositories::no_subscription_repository_enabled(&files, "pbs"); + + Ok(json!({ + "infos": infos, + "enterprise": enterprise_enabled, + "nosubscription": no_subscription_enabled + })) +} + #[api( input: { properties: { @@ -446,6 +511,7 @@ pub fn get_repositories() -> Result { const SUBDIRS: SubdirMap = &[ ("changelog", &Router::new().get(&API_METHOD_APT_GET_CHANGELOG)), + ("checkrepositories", &Router::new().get(&API_METHOD_CHECK_REPOSITORIES)), ("repositories", &Router::new().get(&API_METHOD_GET_REPOSITORIES)), ("update", &Router::new() .get(&API_METHOD_APT_UPDATE_AVAILABLE) -- 2.20.1