From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id EE8961FF187 for ; Mon, 22 Sep 2025 13:10:18 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id A675E18B52; Mon, 22 Sep 2025 13:10:47 +0200 (CEST) From: Christian Ebner To: pdm-devel@lists.proxmox.com Date: Mon, 22 Sep 2025 13:09:54 +0200 Message-ID: <20250922110958.369653-3-c.ebner@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20250922110958.369653-1-c.ebner@proxmox.com> References: <20250922110958.369653-1-c.ebner@proxmox.com> MIME-Version: 1.0 X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1758539402532 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.041 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pdm-devel] [PATCH datacenter-manager 2/6] pdm-client: add method to probe TLS connection for PBS remotes X-BeenThere: pdm-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Datacenter Manager development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox Datacenter Manager development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pdm-devel-bounces@lists.proxmox.com Sender: "pdm-devel" Adds the PDM client method to perform API calls to the servers TLS probe endpoint for PBS, analogous to the PVE implementation. Since this is mostly the same for both remote types, common code is factored into a generic private helper method. Signed-off-by: Christian Ebner --- lib/pdm-client/src/lib.rs | 41 ++++++++++++++++++++++++++------------- 1 file changed, 28 insertions(+), 13 deletions(-) diff --git a/lib/pdm-client/src/lib.rs b/lib/pdm-client/src/lib.rs index f2ff4d4..e8a4ee5 100644 --- a/lib/pdm-client/src/lib.rs +++ b/lib/pdm-client/src/lib.rs @@ -3,7 +3,7 @@ use std::collections::HashMap; use std::time::Duration; -use pdm_api_types::remotes::TlsProbeOutcome; +use pdm_api_types::remotes::{RemoteType, TlsProbeOutcome}; use pdm_api_types::resource::{PveResource, RemoteResources, ResourceType, TopEntities}; use pdm_api_types::rrddata::{ LxcDataPoint, NodeDataPoint, PbsDatastoreDataPoint, PbsNodeDataPoint, PveStorageDataPoint, @@ -976,18 +976,7 @@ impl PdmClient { hostname: &str, fingerprint: Option<&str>, ) -> Result { - let mut params = json!({ - "hostname": hostname, - }); - if let Some(fp) = fingerprint { - params["fingerprint"] = fp.into(); - } - Ok(self - .0 - .post("/api2/extjs/pve/probe-tls", ¶ms) - .await? - .expect_json()? - .data) + self.probe_tls(hostname, fingerprint, RemoteType::Pve).await } /// Uses /pve/scan to scan the remote cluster for node/fingerprint information @@ -1068,6 +1057,32 @@ impl PdmClient { Ok(self.0.post(path, ¶ms).await?.expect_json()?.data) } + + /// uses /pbs/probe-tls to probe the tls connection to the given host + pub async fn pbs_probe_tls( + &self, + hostname: &str, + fingerprint: Option<&str>, + ) -> Result { + self.probe_tls(hostname, fingerprint, RemoteType::Pbs).await + } + + /// uses /{remote-type}/probe-tls to probe the tls connection to the given host + async fn probe_tls( + &self, + hostname: &str, + fingerprint: Option<&str>, + remote_type: RemoteType, + ) -> Result { + let path = format!("/api2/extjs/{remote_type}/probe-tls"); + let mut params = json!({ + "hostname": hostname, + }); + if let Some(fp) = fingerprint { + params["fingerprint"] = fp.into(); + } + Ok(self.0.post(&path, ¶ms).await?.expect_json()?.data) + } } /// Builder for migration parameters. -- 2.47.3 _______________________________________________ pdm-devel mailing list pdm-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pdm-devel