From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <pdm-devel-bounces@lists.proxmox.com> Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 7F2601FF15C for <inbox@lore.proxmox.com>; Fri, 16 May 2025 15:36:25 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 2E7BADC0A; Fri, 16 May 2025 15:36:50 +0200 (CEST) From: Dominik Csapak <d.csapak@proxmox.com> To: pdm-devel@lists.proxmox.com Date: Fri, 16 May 2025 15:36:08 +0200 Message-Id: <20250516133611.3499075-19-d.csapak@proxmox.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250516133611.3499075-1-d.csapak@proxmox.com> References: <20250516133611.3499075-1-d.csapak@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.022 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 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 18/21] ui: pve wizard: connect: factor out normalize_hostname X-BeenThere: pdm-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Datacenter Manager development discussion <pdm-devel.lists.proxmox.com> List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pdm-devel>, <mailto:pdm-devel-request@lists.proxmox.com?subject=unsubscribe> List-Archive: <http://lists.proxmox.com/pipermail/pdm-devel/> List-Post: <mailto:pdm-devel@lists.proxmox.com> List-Help: <mailto:pdm-devel-request@lists.proxmox.com?subject=help> List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pdm-devel>, <mailto:pdm-devel-request@lists.proxmox.com?subject=subscribe> Reply-To: Proxmox Datacenter Manager development discussion <pdm-devel@lists.proxmox.com> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pdm-devel-bounces@lists.proxmox.com Sender: "pdm-devel" <pdm-devel-bounces@lists.proxmox.com> we'll use this later again Signed-off-by: Dominik Csapak <d.csapak@proxmox.com> --- ui/src/remotes/wizard_page_connect.rs | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/ui/src/remotes/wizard_page_connect.rs b/ui/src/remotes/wizard_page_connect.rs index f6013f2..bdc6b7f 100644 --- a/ui/src/remotes/wizard_page_connect.rs +++ b/ui/src/remotes/wizard_page_connect.rs @@ -65,15 +65,7 @@ pub struct ConnectParams { async fn connect(form_ctx: FormContext, remote_type: RemoteType) -> Result<ConnectParams, Error> { let data = form_ctx.get_submit_data(); let mut data: ConnectParams = serde_json::from_value(data.clone())?; - if let Some(hostname) = data.hostname.strip_prefix("http://") { - data.hostname = hostname.to_string(); - } - if let Some(hostname) = data.hostname.strip_prefix("https://") { - data.hostname = hostname.to_string(); - } - if let Some(hostname) = data.hostname.strip_suffix("/") { - data.hostname = hostname.to_string(); - } + data.hostname = normalize_hostname(data.hostname); let realms = match remote_type { RemoteType::Pve => list_realms(data.hostname.clone(), data.fingerprint.clone()).await?, @@ -234,6 +226,20 @@ impl Component for PdmWizardPageConnect { } } +fn normalize_hostname(hostname: String) -> String { + let mut result = hostname; + if let Some(hostname) = result.strip_prefix("http://") { + result = hostname.to_string(); + } + if let Some(hostname) = result.strip_prefix("https://") { + result = hostname.to_string(); + } + if let Some(hostname) = result.strip_suffix("/") { + result = hostname.to_string(); + } + result +} + impl Into<VNode> for WizardPageConnect { fn into(self) -> VNode { let comp = VComp::new::<PdmWizardPageConnect>(Rc::new(self), None); -- 2.39.5 _______________________________________________ pdm-devel mailing list pdm-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pdm-devel