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 F27EB8A22 for ; Thu, 22 Jun 2023 13:06:21 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id CBDFB28104 for ; Thu, 22 Jun 2023 13:05:51 +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) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Thu, 22 Jun 2023 13:05:50 +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 9AE9242985 for ; Thu, 22 Jun 2023 13:05:50 +0200 (CEST) From: Christoph Heiss To: pve-devel@lists.proxmox.com Date: Thu, 22 Jun 2023 13:05:39 +0200 Message-Id: <20230622110539.905687-1-c.heiss@proxmox.com> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.076 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 T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pve-devel] [PATCH installer] tui: fix FQDN validation 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: Thu, 22 Jun 2023 11:06:22 -0000 Add checks to ensure that: * It actually has a hostname, not just a domain name * Properly check if the hostname is purely numeric, by verifying each FQDN part Signed-off-by: Christoph Heiss --- proxmox-tui-installer/src/main.rs | 8 ++++++-- proxmox-tui-installer/src/utils.rs | 12 +++++++++++- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/proxmox-tui-installer/src/main.rs b/proxmox-tui-installer/src/main.rs index d2a5fcf..b49f2be 100644 --- a/proxmox-tui-installer/src/main.rs +++ b/proxmox-tui-installer/src/main.rs @@ -587,10 +587,14 @@ fn network_dialog(siv: &mut Cursive) -> InstallerView { Err("host and gateway IP address version must not differ".to_owned()) } else if address.addr().is_ipv4() != dns_server.is_ipv4() { Err("host and DNS IP address version must not differ".to_owned()) - } else if fqdn.to_string().chars().all(|c| c.is_ascii_digit()) { + } else if fqdn + .parts() + .iter() + .any(|p| p.chars().all(|c| c.is_ascii_digit() || c == '.')) + { // Not supported/allowed on Debian Err("hostname cannot be purely numeric".to_owned()) - } else if fqdn.to_string().ends_with(".invalid") { + } else if !fqdn.is_valid() || fqdn.to_string().ends_with(".invalid") { Err("hostname does not look valid".to_owned()) } else { Ok(NetworkOptions { diff --git a/proxmox-tui-installer/src/utils.rs b/proxmox-tui-installer/src/utils.rs index 3245fac..08521f3 100644 --- a/proxmox-tui-installer/src/utils.rs +++ b/proxmox-tui-installer/src/utils.rs @@ -122,7 +122,7 @@ impl Fqdn { .map(ToOwned::to_owned) .collect::>(); - if !parts.iter().all(&Self::validate_single) { + if parts.is_empty() || !parts.iter().all(&Self::validate_single) { Err(()) } else { Ok(Self { parts }) @@ -143,6 +143,16 @@ impl Fqdn { parts.join(".") } + pub fn parts(&self) -> &[String] { + &self.parts + } + + pub fn is_valid(&self) -> bool { + // It's a valid FQDN if it has at least a hostname and a TLD name, the + // latter is ensured by the constructor. + self.has_host() + } + fn has_host(&self) -> bool { self.parts.len() > 1 } -- 2.40.1