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 DB6ED69388 for ; Mon, 22 Mar 2021 12:59:58 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 7694F23292 for ; Mon, 22 Mar 2021 12:59:58 +0100 (CET) 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 2731523223 for ; Mon, 22 Mar 2021 12:59:56 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id E5F8B4283F for ; Mon, 22 Mar 2021 12:59:55 +0100 (CET) From: Fabian Ebner To: pbs-devel@lists.proxmox.com Date: Mon, 22 Mar 2021 12:59:43 +0100 Message-Id: <20210322115945.1362-9-f.ebner@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210322115945.1362-1-f.ebner@proxmox.com> References: <20210322115945.1362-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.005 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 Subject: [pbs-devel] [PATCH v3 proxmox-backup 08/10] add check_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: Mon, 22 Mar 2021 11:59:58 -0000 Signed-off-by: Fabian Ebner --- No changes from v2. src/api2/node/apt.rs | 53 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 52 insertions(+), 1 deletion(-) diff --git a/src/api2/node/apt.rs b/src/api2/node/apt.rs index 4dad2e73..22e43340 100644 --- a/src/api2/node/apt.rs +++ b/src/api2/node/apt.rs @@ -6,7 +6,7 @@ use proxmox::list_subdirs_api_method; use proxmox::api::{api, RpcEnvironment, RpcEnvironmentType, Permission}; use proxmox::api::router::{Router, SubdirMap}; -use proxmox_apt::types::APTRepository; +use proxmox_apt::types::{APTRepository, APTRepositoryWarning}; use crate::server::WorkerTask; use crate::tools::{apt, http, subscription}; @@ -352,6 +352,56 @@ pub fn get_versions() -> Result, Error> { Ok(packages) } +#[api( + input: { + properties: { + node: { + schema: NODE_SCHEMA, + }, + }, + }, + returns: { + description: "Warnings for APT repositories and status of Proxmox repositories.", + properties: { + warnings: { + description: "Warnings for APT repositories.", + type: Array, + items: { + type: APTRepositoryWarning, + }, + }, + enterprise: { + description: "Whether the enterprise repository is enabled.", + type: Boolean, + }, + nosubscription: { + description: "Whether the no-subscription repository is enabled.", + type: Boolean, + }, + }, + }, + access: { + permission: &Permission::Privilege(&[], PRIV_SYS_AUDIT, false), + }, +)] +/// Check APT repository configuration. +pub fn check_repositories() -> Result { + let repos = proxmox_apt::repositories::repositories()?; + + let warnings = proxmox_apt::repositories::check_repositories(&repos); + + let enterprise_enabled = + proxmox_apt::repositories::enterprise_repository_enabled(&repos, "pbs"); + let no_subscription_enabled = + proxmox_apt::repositories::no_subscription_repository_enabled(&repos, "pbs"); + + Ok(json!({ + "warnings": warnings, + "enterprise": enterprise_enabled, + "nosubscription": no_subscription_enabled + })) +} + #[api( input: { properties: { @@ -378,6 +428,7 @@ pub fn get_repositories() -> Result, Error> { 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