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 11B841FF15C for ; Wed, 2 Oct 2024 14:29:44 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id CEFC8E883; Wed, 2 Oct 2024 14:29:47 +0200 (CEST) From: Christoph Heiss To: pve-devel@lists.proxmox.com Date: Wed, 2 Oct 2024 14:27:27 +0200 Message-ID: <20241002122933.628461-7-c.heiss@proxmox.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20241002122933.628461-1-c.heiss@proxmox.com> References: <20241002122933.628461-1-c.heiss@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.030 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: [pve-devel] [PATCH installer v2 6/7] auto-installer: validate `global.mailto` answer option 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: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" Signed-off-by: Christoph Heiss --- Changes v1 -> v2: * instead of re-using/-naming the `verify_locale_settings()` for the email validation, combine it the with root password validation proxmox-auto-installer/src/utils.rs | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/proxmox-auto-installer/src/utils.rs b/proxmox-auto-installer/src/utils.rs index cc483c9..afaad85 100644 --- a/proxmox-auto-installer/src/utils.rs +++ b/proxmox-auto-installer/src/utils.rs @@ -1,4 +1,4 @@ -use anyhow::{bail, Context as _, Result}; +use anyhow::{bail, Context, Result}; use clap::ValueEnum; use glob::Pattern; use log::info; @@ -9,7 +9,7 @@ use crate::{ udevinfo::UdevInfo, }; use proxmox_installer_common::{ - options::{FsType, NetworkOptions, ZfsChecksumOption, ZfsCompressOption}, + options::{email_validate, FsType, NetworkOptions, ZfsChecksumOption, ZfsCompressOption}, setup::{ InstallConfig, InstallRootPassword, InstallZfsOption, LocaleInfo, RuntimeInfo, SetupInfo, }, @@ -303,7 +303,11 @@ fn verify_locale_settings(answer: &Answer, locales: &LocaleInfo) -> Result<()> { Ok(()) } -fn verify_root_password_settings(answer: &Answer) -> Result<()> { +fn verify_email_and_root_password_settings(answer: &Answer) -> Result<()> { + info!("Verifying email and root password settings"); + + email_validate(&answer.global.mailto).with_context(|| answer.global.mailto.clone())?; + if answer.global.root_password.is_some() && answer.global.root_password_hashed.is_some() { bail!("`global.root_password` and `global.root_password_hashed` cannot be set at the same time"); } else if answer.global.root_password.is_none() && answer.global.root_password_hashed.is_none() @@ -329,7 +333,7 @@ pub fn parse_answer( let network_settings = get_network_settings(answer, udev_info, runtime_info, setup_info)?; verify_locale_settings(answer, locales)?; - verify_root_password_settings(answer)?; + verify_email_and_root_password_settings(answer)?; let mut config = InstallConfig { autoreboot: 1_usize, -- 2.46.0 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel