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 C3FF99E34D for ; Mon, 27 Nov 2023 11:52:44 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id A95CF57D4 for ; Mon, 27 Nov 2023 11:52:44 +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 ; Mon, 27 Nov 2023 11:52:44 +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 CE95344BCB for ; Mon, 27 Nov 2023 11:52:43 +0100 (CET) From: Gabriel Goller To: pbs-devel@lists.proxmox.com Date: Mon, 27 Nov 2023 11:52:37 +0100 Message-Id: <20231127105238.99947-3-g.goller@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231127105238.99947-1-g.goller@proxmox.com> References: <20231127105238.99947-1-g.goller@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.205 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: [pbs-devel] [PATCH v4 proxmox-backup 2/3] 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: Mon, 27 Nov 2023 10:52:44 -0000 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 | 29 +++++++++++++++++++++++++++-- src/api2/node/status.rs | 28 ++++++++++++++++++++++++++-- www/panel/NodeInfo.js | 15 +++++++++++++++ 3 files changed, 68 insertions(+), 4 deletions(-) diff --git a/pbs-api-types/src/node.rs b/pbs-api-types/src/node.rs index 704215bb..8bcf8fd6 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,30 @@ pub struct NodeInformation { pub fingerprint: String, } + +#[api] +#[derive(Serialize, Deserialize, Default)] +#[serde(rename_all = "kebab-case")] +/// The possible BootModes +pub enum BootMode { + /// The BootMode is EFI/UEFI + Efi, + /// The BootMode is Legacy BIOS + #[default] + LegacyBios, +} + +#[api] +#[derive(Serialize, Deserialize, Default)] +#[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")] @@ -97,4 +120,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..21f1bc2c 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,25 @@ fn procfs_to_node_cpu_info(info: procfs::ProcFsCPUInfo) -> NodeCpuInformation { } } +fn boot_mode_to_info(bm: boot_mode::BootModeInformation) -> BootModeInformation { + match bm { + boot_mode::BootModeInformation::Efi(secureboot) => match secureboot { + boot_mode::SecureBoot::Enabled => BootModeInformation { + mode: pbs_api_types::BootMode::Efi, + secureboot: true, + }, + boot_mode::SecureBoot::Disabled => BootModeInformation { + mode: pbs_api_types::BootMode::Efi, + secureboot: false, + }, + }, + boot_mode::BootModeInformation::Bios => BootModeInformation { + mode: pbs_api_types::BootMode::LegacyBios, + secureboot: false, + }, + } +} + #[api( input: { properties: { @@ -79,6 +100,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::boot_mode()); + Ok(NodeStatus { memory, swap, @@ -96,6 +119,7 @@ async fn get_status( info: NodeInformation { fingerprint: crate::cert_info()?.fingerprint()?, }, + boot_info, }) } diff --git a/www/panel/NodeInfo.js b/www/panel/NodeInfo.js index 2551c9a5..cba6d2a1 100644 --- a/www/panel/NodeInfo.js +++ b/www/panel/NodeInfo.js @@ -147,6 +147,21 @@ Ext.define('PBS.NodeInfoPanel', { textField: 'kversion', value: '', }, + { + colspan: 2, + title: gettext('Boot Mode'), + printBar: false, + textField: 'boot-info', + renderer: boot => { + if (boot.mode === 'legacy-bios') { + return 'Legacy BIOS'; + } else if (boot.mode === 'efi') { + return `EFI${boot.secureboot ? ' (Secure Boot)' : ''}`; + } + return Proxmox.Utils.unknownText; + }, + value: '', + }, { xtype: 'pmxNodeInfoRepoStatus', itemId: 'repositoryStatus', -- 2.39.2