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 5ACB393D4C for ; Wed, 21 Feb 2024 12:08:18 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 81B87157AB for ; Wed, 21 Feb 2024 12:08:16 +0100 (CET) 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)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Wed, 21 Feb 2024 12:08:11 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 1816F44428 for ; Wed, 21 Feb 2024 12:08:11 +0100 (CET) From: Aaron Lauterer To: pve-devel@lists.proxmox.com Date: Wed, 21 Feb 2024 12:07:56 +0100 Message-Id: <20240221110805.931925-14-a.lauterer@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240221110805.931925-1-a.lauterer@proxmox.com> References: <20240221110805.931925-1-a.lauterer@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.063 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 v2 13/22] auto-installer: add fetch answer binary 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: Wed, 21 Feb 2024 11:08:18 -0000 it is supposed to be run first and fetch an answer file. The initial implementation searches for a partition/filesystem called 'proxmoxinst' or 'PROXMOXINST' with an 'answer.toml' file in the root directory. Once it has an answer file, it will call the 'proxmox-auto-installer' and pipe in the contents via stdin. Signed-off-by: Aaron Lauterer --- changes since v1: * removed hard coded paths to binaries * create mount dir with fs::create_dir_all Makefile | 1 + .../src/bin/proxmox-fetch-answer.rs | 71 +++++++++++++++ .../src/fetch_plugins/mod.rs | 2 + .../src/fetch_plugins/partition.rs | 32 +++++++ .../src/fetch_plugins/utils.rs | 90 +++++++++++++++++++ proxmox-auto-installer/src/lib.rs | 1 + 6 files changed, 197 insertions(+) create mode 100644 proxmox-auto-installer/src/bin/proxmox-fetch-answer.rs create mode 100644 proxmox-auto-installer/src/fetch_plugins/mod.rs create mode 100644 proxmox-auto-installer/src/fetch_plugins/partition.rs create mode 100644 proxmox-auto-installer/src/fetch_plugins/utils.rs diff --git a/Makefile b/Makefile index 9c933d9..b724789 100644 --- a/Makefile +++ b/Makefile @@ -20,6 +20,7 @@ PREFIX = /usr BINDIR = $(PREFIX)/bin USR_BIN := \ proxmox-tui-installer\ + proxmox-fetch-answer\ proxmox-auto-installer COMPILED_BINS := \ diff --git a/proxmox-auto-installer/src/bin/proxmox-fetch-answer.rs b/proxmox-auto-installer/src/bin/proxmox-fetch-answer.rs new file mode 100644 index 0000000..9e89a3c --- /dev/null +++ b/proxmox-auto-installer/src/bin/proxmox-fetch-answer.rs @@ -0,0 +1,71 @@ +use anyhow::{anyhow, Error, Result}; +use log::{error, info, LevelFilter}; +use proxmox_auto_installer::{fetch_plugins::partition::FetchFromPartition, log::AutoInstLogger}; +use std::io::Write; +use std::process::{Command, ExitCode, Stdio}; + +static LOGGER: AutoInstLogger = AutoInstLogger; + +pub fn init_log() -> Result<()> { + AutoInstLogger::init("/tmp/fetch_answer.log")?; + log::set_logger(&LOGGER) + .map(|()| log::set_max_level(LevelFilter::Info)) + .map_err(|err| anyhow!(err)) +} + +fn fetch_answer() -> Result { + match FetchFromPartition::get_answer() { + Ok(answer) => return Ok(answer), + Err(err) => info!("Fetching answer file from partition failed: {err}"), + } + // TODO: add more options to get an answer file, e.g. download from url where url could be + // fetched via txt records on predefined subdomain, kernel param, dhcp option, ... + + Err(Error::msg("Could not find any answer file!")) +} + +fn main() -> ExitCode { + if let Err(err) = init_log() { + panic!("could not initilize logging: {err}"); + } + + info!("Fetching answer file"); + let answer = match fetch_answer() { + Ok(answer) => answer, + Err(err) => { + error!("Aborting: {}", err); + return ExitCode::FAILURE; + } + }; + + let mut child = match Command::new("proxmox-auto-installer") + .stdout(Stdio::inherit()) + .stdin(Stdio::piped()) + .stderr(Stdio::null()) + .spawn() + { + Ok(child) => child, + Err(err) => panic!("Failed to start automatic installation: {}", err), + }; + + let mut stdin = child.stdin.take().expect("Failed to open stdin"); + std::thread::spawn(move || { + stdin + .write_all(answer.as_bytes()) + .expect("Failed to write to stdin"); + }); + + match child.wait() { + Ok(status) => { + if status.success() { + ExitCode::SUCCESS + } else { + ExitCode::FAILURE // Will be trapped + } + } + Err(err) => { + error!("Auto installer exited: {err}"); + ExitCode::FAILURE + } + } +} diff --git a/proxmox-auto-installer/src/fetch_plugins/mod.rs b/proxmox-auto-installer/src/fetch_plugins/mod.rs new file mode 100644 index 0000000..11d6937 --- /dev/null +++ b/proxmox-auto-installer/src/fetch_plugins/mod.rs @@ -0,0 +1,2 @@ +pub mod partition; +mod utils; diff --git a/proxmox-auto-installer/src/fetch_plugins/partition.rs b/proxmox-auto-installer/src/fetch_plugins/partition.rs new file mode 100644 index 0000000..0c47a62 --- /dev/null +++ b/proxmox-auto-installer/src/fetch_plugins/partition.rs @@ -0,0 +1,32 @@ +use anyhow::{Error, Result}; +use std::{fs::read_to_string, path::Path}; +use log::info; + +use crate::fetch_plugins::utils::mount_proxmoxinst_part; + +static ANSWER_FILE: &str = "answer.toml"; + +pub struct FetchFromPartition; + +impl FetchFromPartition { + /// Returns the contents of the answer file + pub fn get_answer() -> Result { + info!("Checking for answer file on partition."); + let mount_path = mount_proxmoxinst_part()?; + let answer = Self::get_answer_file(&mount_path)?; + info!("Found answer file on partition."); + Ok(answer) + } + + /// Searches for answer file and returns contents if found + fn get_answer_file(mount_path: &str) -> Result { + let answer_path = Path::new(mount_path).join(ANSWER_FILE); + match answer_path.try_exists() { + Ok(true) => Ok(read_to_string(answer_path)?), + _ => Err(Error::msg(format!( + "could not find answer file expected at: {}", + answer_path.display() + ))), + } + } +} diff --git a/proxmox-auto-installer/src/fetch_plugins/utils.rs b/proxmox-auto-installer/src/fetch_plugins/utils.rs new file mode 100644 index 0000000..82cd3e0 --- /dev/null +++ b/proxmox-auto-installer/src/fetch_plugins/utils.rs @@ -0,0 +1,90 @@ +use anyhow::{bail, Result}; +use log::{info, warn}; +use std::{ + fs::create_dir_all, + path::{Path, PathBuf}, + process::Command, +}; + +/// Searches for upper and lower case existence of the partlabel in the search_path +/// +/// # Arguemnts +/// * `partlabel_lower` - Partition Label in lower case +/// * `search_path` - Path where to search for the partiiton label +/// search_path: String +pub fn scan_partlabels(partlabel_lower: &str, search_path: &str) -> Result { + let partlabel = partlabel_lower.to_uppercase(); + let path = Path::new(search_path).join(partlabel.clone()); + match path.try_exists() { + Ok(true) => { + info!("Found partition with label '{}'", partlabel); + return Ok(path); + } + Ok(false) => info!("Did not detect partition with label '{}'", partlabel), + Err(err) => info!("Encountered issue, accessing '{}': {}", path.display(), err), + } + + let partlabel = partlabel_lower.to_lowercase(); + let path = Path::new(search_path).join(partlabel.clone()); + match path.try_exists() { + Ok(true) => { + info!("Found partition with label '{}'", partlabel); + return Ok(path); + } + Ok(false) => info!("Did not detect partition with label '{}'", partlabel), + Err(err) => info!("Encountered issue, accessing '{}': {}", path.display(), err), + } + bail!( + "Could not detect upper or lower case labels for '{}'", + partlabel_lower + ); +} + +/// Will mount source path to target_path +/// +/// # Arguments +/// * `source` - `PathBuf` of the source location +/// * `target_path` - Location where to mount, will be created +pub fn mount_part(source: PathBuf, target_path: &str) -> Result<()> { + info!("Mounting partition at {target_path}"); + // create dir for mountpoint + create_dir_all(target_path)?; + match Command::new("mount") + .args(["-o", "ro"]) + .arg(source) + .arg(target_path) + .output() + { + Ok(output) => { + if output.status.success() { + Ok(()) + } else { + warn!("Error mounting: {}", String::from_utf8(output.stderr)?); + Ok(()) + } + } + Err(err) => bail!("Error mounting: {}", err), + } +} + +/// Tries to unmount the specified path. Will warn on errors, but not fail. +/// +/// # Arguemnts +/// * `target_path` - path to unmount +pub fn umount_part(target_path: &str) -> Result<()> { + info!("Unmounting partitiona at {target_path}"); + match Command::new("umount").arg(target_path).output() { + Ok(output) => { + if output.status.success() { + Ok(()) + } else { + warn!("Error unmounting: {}", String::from_utf8(output.stderr)?); + Ok(()) + } + } + Err(err) => { + warn!("Error unmounting: {}", err); + Ok(()) + } + } +} diff --git a/proxmox-auto-installer/src/lib.rs b/proxmox-auto-installer/src/lib.rs index 6636cc7..0a153b2 100644 --- a/proxmox-auto-installer/src/lib.rs +++ b/proxmox-auto-installer/src/lib.rs @@ -1,4 +1,5 @@ pub mod answer; +pub mod fetch_plugins; pub mod log; pub mod udevinfo; pub mod utils; -- 2.39.2