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 7D2FF68BD9 for ; Thu, 22 Jul 2021 16:36:05 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 701CE1300E for ; Thu, 22 Jul 2021 16:35:35 +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 71BD213002 for ; Thu, 22 Jul 2021 16:35:34 +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 4539542587 for ; Thu, 22 Jul 2021 16:35:34 +0200 (CEST) From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= To: pbs-devel@lists.proxmox.com Date: Thu, 22 Jul 2021 16:35:07 +0200 Message-Id: <20210722143510.238967-5-f.gruenbichler@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210722143510.238967-1-f.gruenbichler@proxmox.com> References: <20210722143510.238967-1-f.gruenbichler@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.455 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 Subject: [pbs-devel] [PATCH proxmox-backup 4/7] remote: add backup group scanning 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, 22 Jul 2021 14:36:05 -0000 Signed-off-by: Fabian Grünbichler --- src/api2/config/remote.rs | 69 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 67 insertions(+), 2 deletions(-) diff --git a/src/api2/config/remote.rs b/src/api2/config/remote.rs index 24ef8702..9397afee 100644 --- a/src/api2/config/remote.rs +++ b/src/api2/config/remote.rs @@ -3,7 +3,8 @@ use serde_json::Value; use ::serde::{Deserialize, Serialize}; use proxmox::api::{api, ApiMethod, Router, RpcEnvironment, Permission}; -use proxmox::http_err; +use proxmox::api::router::SubdirMap; +use proxmox::{http_err, list_subdirs_api_method, sortable}; use pbs_client::{HttpClient, HttpClientOptions}; @@ -374,8 +375,72 @@ pub async fn scan_remote_datastores(name: String) -> Result Result, Error> { + let (remote_config, _digest) = remote::config()?; + let remote: remote::Remote = remote_config.lookup("remote", &name)?; + + let map_remote_err = |api_err| { + http_err!(INTERNAL_SERVER_ERROR, + "failed to scan remote '{}' - {}", + &name, + api_err) + }; + + let client = remote_client(remote) + .await + .map_err(map_remote_err)?; + let api_res = client + .get(&format!("api2/json/admin/datastore/{}/groups", store), None) + .await + .map_err(map_remote_err)?; + let parse_res = match api_res.get("data") { + Some(data) => serde_json::from_value::>(data.to_owned()), + None => bail!("remote {} did not return any group list data", &name), + }; + + match parse_res { + Ok(parsed) => Ok(parsed), + Err(_) => bail!("Failed to parse remote scan api result."), + } +} + +#[sortable] +const DATASTORE_SCAN_SUBDIRS: SubdirMap = &[ + ( + "groups", + &Router::new() + .get(&API_METHOD_SCAN_REMOTE_GROUPS) + ), +]; + +const DATASTORE_SCAN_ROUTER: Router = Router::new() + .get(&list_subdirs_api_method!(DATASTORE_SCAN_SUBDIRS)) + .subdirs(DATASTORE_SCAN_SUBDIRS); + const SCAN_ROUTER: Router = Router::new() - .get(&API_METHOD_SCAN_REMOTE_DATASTORES); + .get(&API_METHOD_SCAN_REMOTE_DATASTORES) + .match_all("store", &DATASTORE_SCAN_ROUTER); const ITEM_ROUTER: Router = Router::new() .get(&API_METHOD_READ_REMOTE) -- 2.30.2