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 3538BC26C5 for ; Tue, 23 Jan 2024 18:01:07 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id A80E1AF4E for ; Tue, 23 Jan 2024 18:01:04 +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 ; Tue, 23 Jan 2024 18:00:59 +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 CCBA24926C for ; Tue, 23 Jan 2024 18:00:58 +0100 (CET) From: Aaron Lauterer To: pve-devel@lists.proxmox.com Date: Tue, 23 Jan 2024 18:00:49 +0100 Message-Id: <20240123170053.490250-15-a.lauterer@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240123170053.490250-1-a.lauterer@proxmox.com> References: <20240123170053.490250-1-a.lauterer@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.068 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 v1 installer 14/18] 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: Tue, 23 Jan 2024 17:01:07 -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 --- Makefile | 1 + .../src/bin/proxmox-fetch-answer.rs | 73 +++++++++++++ .../src/fetch_plugins/mod.rs | 1 + .../src/fetch_plugins/partition.rs | 102 ++++++++++++++++++ proxmox-auto-installer/src/lib.rs | 1 + 5 files changed, 178 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 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..baf2bd2 --- /dev/null +++ b/proxmox-auto-installer/src/bin/proxmox-fetch-answer.rs @@ -0,0 +1,73 @@ +use anyhow::{anyhow, bail, Result}; +use log::{error, info, LevelFilter}; +use proxmox_auto_installer::fetch_plugins::partition::FetchFromPartition; +use proxmox_auto_installer::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 { + info!("Checking for partition"); + 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, ... + + bail!("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("/usr/bin/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..44399e6 --- /dev/null +++ b/proxmox-auto-installer/src/fetch_plugins/mod.rs @@ -0,0 +1 @@ +pub mod partition; 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..0552ddd --- /dev/null +++ b/proxmox-auto-installer/src/fetch_plugins/partition.rs @@ -0,0 +1,102 @@ +use anyhow::{bail, Result}; +use log::{info, warn}; +use std::fs::read_to_string; +use std::path::{Path, PathBuf}; +use std::process::Command; + +static ANSWER_FILE: &str = "answer.toml"; +static ANSWER_MP: &str = "/mnt/answer"; +static PARTLABEL: &str = "proxmoxinst"; +static SEARCH_PATH: &str = "/dev/disk/by-label"; + +pub struct FetchFromPartition; + +impl FetchFromPartition { + /// Returns the contents of the answer file + pub fn get_answer() -> Result { + let part_path = Self::scan_partlabels()?; + Self::mount_part(part_path)?; + Self::get_answer_file() + } + + /// Searches for upper and lower case existence of the PARTLABEL in the SEARCH_PATH + fn scan_partlabels() -> Result { + let partlabel = PARTLABEL.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.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 + ); + } + + /// Will mount source path to ANSWER_MP + /// + /// # Arguments + /// + /// * `source` - `PathBuf` of the source location + fn mount_part(source: PathBuf) -> Result<()> { + info!("Mounting partition at {ANSWER_MP}"); + // create dir for mountpoint + match Command::new("/usr/bin/mkdir") + .arg(ANSWER_MP) + .arg("-p") + .output() + { + Ok(output) => { + if !output.status.success() { + warn!( + "Error creating mount path: {}", + String::from_utf8(output.stderr)? + ) + } + } + Err(err) => bail!("Error creating mount path: {}", err), + } + match Command::new("/usr/bin/mount") + .arg(source) + .arg(ANSWER_MP) + .output() + { + Ok(output) => { + if output.status.success() { + Ok(()) + } else { + warn!("Error mounting: {}", String::from_utf8(output.stderr)?); + Ok(()) + } + } + Err(err) => bail!("Error mounting: {}", err), + } + } + + /// Searches for answer file and returns contents if found + fn get_answer_file() -> Result { + let answer_path = Path::new(ANSWER_MP).join(ANSWER_FILE); + match answer_path.try_exists() { + Ok(true) => Ok(read_to_string(answer_path)?), + _ => bail!( + "could not find answer file expected at: {}", + answer_path.display() + ), + } + } +} 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