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 02F4DB3938 for ; Wed, 29 Nov 2023 11:18:42 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id D03FE3B9A for ; Wed, 29 Nov 2023 11:18:11 +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, 29 Nov 2023 11:18: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 D80B341B3A for ; Wed, 29 Nov 2023 11:18:10 +0100 (CET) Date: Wed, 29 Nov 2023 11:18:09 +0100 From: Wolfgang Bumiller To: Gabriel Goller Cc: pbs-devel@lists.proxmox.com Message-ID: References: <20231129090746.38798-1-g.goller@proxmox.com> <20231129090746.38798-3-g.goller@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20231129090746.38798-3-g.goller@proxmox.com> X-SPAM-LEVEL: Spam detection results: 0 AWL 0.097 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: Re: [pbs-devel] [PATCH v4 proxmox-backup 2/5] node: status: added bootmode X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 29 Nov 2023 10:18:42 -0000 On Wed, Nov 29, 2023 at 10:07:43AM +0100, Gabriel Goller wrote: > Added field that shows the bootmode of the node. The bootmode is either > Legacy Bios, EFI, or EFI (Secure Boot). To detect the mode we use the > exact same method as in pve: We check if the `/sys/firmware/efi` folder > exists, then check if the `SecureBoot-xx...` file in the `efivars` > directory has the SecureBoot flag enabled. > > Signed-off-by: Gabriel Goller > --- > pbs-api-types/src/node.rs | 30 +++++++++++++++++++++++++++--- > src/api2/node/status.rs | 29 +++++++++++++++++++++++++++-- > 2 files changed, 54 insertions(+), 5 deletions(-) > > diff --git a/pbs-api-types/src/node.rs b/pbs-api-types/src/node.rs > index 704215bb..ab626157 100644 > --- a/pbs-api-types/src/node.rs > +++ b/pbs-api-types/src/node.rs > @@ -1,9 +1,8 @@ > -use serde::{Deserialize, Serialize}; > use proxmox_schema::*; > +use serde::{Deserialize, Serialize}; > > use crate::StorageStatus; > > - > #[api] > #[derive(Serialize, Deserialize, Default)] > #[serde(rename_all = "kebab-case")] > @@ -39,6 +38,29 @@ pub struct NodeInformation { > pub fingerprint: String, > } > > + > +#[api] > +#[derive(Serialize, Deserialize, Copy, Clone)] > +#[serde(rename_all = "kebab-case")] > +/// The possible BootModes > +pub enum BootMode { > + /// The BootMode is EFI/UEFI > + Efi, > + /// The BootMode is Legacy BIOS > + LegacyBios, > +} ^ Should be able to have a From here. > + > +#[api] > +#[derive(Serialize, Deserialize, Clone)] > +#[serde(rename_all = "lowercase")] > +/// Holds the Bootmodes > +pub struct BootModeInformation { > + /// The BootMode, either Efi or Bios > + pub mode: BootMode, > + /// SecureBoot status > + pub secureboot: bool, > +} > + > #[api] > #[derive(Serialize, Deserialize, Default)] > #[serde(rename_all = "kebab-case")] > @@ -78,7 +100,7 @@ pub struct NodeCpuInformation { > } > }, > )] > -#[derive(Serialize, Deserialize, Default)] > +#[derive(Serialize, Deserialize)] > #[serde(rename_all = "kebab-case")] > /// The Node status > pub struct NodeStatus { > @@ -97,4 +119,6 @@ pub struct NodeStatus { > pub wait: f64, > pub cpuinfo: NodeCpuInformation, > pub info: NodeInformation, > + /// Current boot mode > + pub boot_info: BootModeInformation, > } > diff --git a/src/api2/node/status.rs b/src/api2/node/status.rs > index 639d7211..17b9aff3 100644 > --- a/src/api2/node/status.rs > +++ b/src/api2/node/status.rs > @@ -1,16 +1,18 @@ > -use std::os::unix::prelude::OsStrExt; > +use std::os::unix::ffi::OsStrExt; > use std::process::Command; > > use anyhow::{bail, format_err, Error}; > use serde_json::Value; > > +use proxmox_sys::boot_mode; > use proxmox_sys::linux::procfs; > > use proxmox_router::{ApiMethod, Permission, Router, RpcEnvironment}; > use proxmox_schema::api; > > use pbs_api_types::{ > - NodePowerCommand, StorageStatus, NODE_SCHEMA, PRIV_SYS_AUDIT, PRIV_SYS_POWER_MANAGEMENT, > + BootModeInformation, NodePowerCommand, StorageStatus, NODE_SCHEMA, PRIV_SYS_AUDIT, > + PRIV_SYS_POWER_MANAGEMENT, > }; > > use pbs_api_types::{ > @@ -25,6 +27,26 @@ fn procfs_to_node_cpu_info(info: procfs::ProcFsCPUInfo) -> NodeCpuInformation { > } > } > > +fn boot_mode_to_info(bm: boot_mode::BootMode, sb: boot_mode::SecureBoot) -> BootModeInformation { > + use boot_mode::BootMode; > + use boot_mode::SecureBoot; > + > + match (bm, sb) { Since the info we get isn't nested anymore, we could just move the match inside the struct building. BootModeInformation { mode: bm.into(), sb: sb.into() or sb == SecureBoot::Enabled with the added Eq } > + secureboot: true, > + }, > + (BootMode::Efi, SecureBoot::Enabled) => BootModeInformation { > + mode: pbs_api_types::BootMode::Efi, > + secureboot: true, > + }, > + (BootMode::Efi, SecureBoot::Disabled) => BootModeInformation { > + mode: pbs_api_types::BootMode::Efi, > + secureboot: false, > + }, > + (BootMode::Bios, _) => BootModeInformation { > + mode: pbs_api_types::BootMode::LegacyBios, > + secureboot: false, > + }, > + } > +} > + > #[api( > input: { > properties: { > @@ -79,6 +101,8 @@ async fn get_status( > > let disk = crate::tools::fs::fs_info_static(proxmox_lang::c_str!("/")).await?; > > + let boot_info = boot_mode_to_info(boot_mode::BootMode::query(), boot_mode::SecureBoot::query()); Btw. I'm not even sure we should have the above function if we query it all at this point anyway, this could also just be BootModeInformation::query(), or the function above could just take no parameters. > + > Ok(NodeStatus { > memory, > swap, > @@ -96,6 +120,7 @@ async fn get_status( > info: NodeInformation { > fingerprint: crate::cert_info()?.fingerprint()?, > }, > + boot_info, > }) > } > > -- > 2.39.2