From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id D57C61FF13A for ; Wed, 27 May 2026 15:06:45 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 2658C1CA12; Wed, 27 May 2026 15:06:45 +0200 (CEST) From: Dominik Csapak To: pdm-devel@lists.proxmox.com Subject: [PATCH datacenter-manager 3/3] ui: auto-installer: use email validation from installer-types Date: Wed, 27 May 2026 15:05:59 +0200 Message-ID: <20260527130611.2995147-4-d.csapak@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260527130611.2995147-1-d.csapak@proxmox.com> References: <20260527130611.2995147-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.049 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 Message-ID-Hash: DPECYLOHKFQWA46BJS5MUNML2S4M5S4O X-Message-ID-Hash: DPECYLOHKFQWA46BJS5MUNML2S4M5S4O X-MailFrom: d.csapak@proxmox.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox Datacenter Manager development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: so we have the same check for the installer here in the ui. this way it can't happen that the user enters an email address which the installer itself rejects. Signed-off-by: Dominik Csapak --- .../remotes/auto_installer/prepared_answer_form.rs | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/ui/src/remotes/auto_installer/prepared_answer_form.rs b/ui/src/remotes/auto_installer/prepared_answer_form.rs index 477a71f7..6d5c796b 100644 --- a/ui/src/remotes/auto_installer/prepared_answer_form.rs +++ b/ui/src/remotes/auto_installer/prepared_answer_form.rs @@ -15,9 +15,9 @@ use pdm_api_types::{ }; use proxmox_installer_types::{ answer::{ - BtrfsCompressOption, BtrfsOptions, FilesystemOptions, FilesystemType, FilterMatch, - KeyboardLayout, LvmOptions, RebootMode, ZfsChecksumOption, ZfsCompressOption, ZfsOptions, - BTRFS_COMPRESS_OPTIONS, FILESYSTEM_TYPE_OPTIONS, ROOT_PASSWORD_SCHEMA, + email_validate, BtrfsCompressOption, BtrfsOptions, FilesystemOptions, FilesystemType, + FilterMatch, KeyboardLayout, LvmOptions, RebootMode, ZfsChecksumOption, ZfsCompressOption, + ZfsOptions, BTRFS_COMPRESS_OPTIONS, FILESYSTEM_TYPE_OPTIONS, ROOT_PASSWORD_SCHEMA, SUBSCRIPTION_KEY_SCHEMA, ZFS_CHECKSUM_OPTIONS, ZFS_COMPRESS_OPTIONS, }, EMAIL_DEFAULT_PLACEHOLDER, @@ -260,13 +260,7 @@ pub fn render_global_options_form( .input_type(InputType::Email) .value(config.mailto.clone()) .schema(&EMAIL_SCHEMA) - .validate(|s: &String| { - if s.ends_with(".invalid") { - bail!(tr!("Invalid (default) email address")) - } else { - Ok(()) - } - }) + .validate(|email: &String| email_validate(email)) .required(true), ) .with_field( -- 2.47.3