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 32ABA1FF16E for ; Mon, 9 Dec 2024 13:46:52 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id D67EA1D4A; Mon, 9 Dec 2024 13:46:41 +0100 (CET) From: Christoph Heiss To: pve-devel@lists.proxmox.com Date: Mon, 9 Dec 2024 13:45:58 +0100 Message-ID: <20241209124601.1272122-6-c.heiss@proxmox.com> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241209124601.1272122-1-c.heiss@proxmox.com> References: <20241209124601.1272122-1-c.heiss@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.028 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 5/6] fix #5889: assistant: validate answer email & root password settings 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" These checks are basically "free" and can be re-used from the auto-installer 1:1. Signed-off-by: Christoph Heiss --- proxmox-auto-install-assistant/src/main.rs | 9 +++++---- proxmox-auto-installer/src/utils.rs | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/proxmox-auto-install-assistant/src/main.rs b/proxmox-auto-install-assistant/src/main.rs index c837cba..6796c06 100644 --- a/proxmox-auto-install-assistant/src/main.rs +++ b/proxmox-auto-install-assistant/src/main.rs @@ -11,11 +11,11 @@ use std::{ }; use proxmox_auto_installer::{ - answer::Answer, - answer::FilterMatch, + answer::{Answer, FilterMatch}, sysinfo::SysInfo, utils::{ - get_matched_udev_indexes, get_nic_list, get_single_udev_index, AutoInstSettings, + get_matched_udev_indexes, get_nic_list, get_single_udev_index, + verify_email_and_root_password_settings, AutoInstSettings, FetchAnswerFrom, HttpOptions, }, }; @@ -591,7 +591,8 @@ fn parse_answer(path: impl AsRef + fmt::Debug) -> Result { } match toml::from_str(&contents) { Ok(answer) => { - println!("The file was parsed successfully, no syntax errors found!"); + verify_email_and_root_password_settings(&answer)?; + println!("The answer file was parsed successfully, no errors found!"); Ok(answer) } Err(err) => bail!("Error parsing answer file: {err}"), diff --git a/proxmox-auto-installer/src/utils.rs b/proxmox-auto-installer/src/utils.rs index 27bbc3b..c26b33c 100644 --- a/proxmox-auto-installer/src/utils.rs +++ b/proxmox-auto-installer/src/utils.rs @@ -320,7 +320,7 @@ fn verify_locale_settings(answer: &Answer, locales: &LocaleInfo) -> Result<()> { Ok(()) } -fn verify_email_and_root_password_settings(answer: &Answer) -> Result<()> { +pub 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())?; -- 2.47.0 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel