From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <pve-devel-bounces@lists.proxmox.com>
Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9])
by lore.proxmox.com (Postfix) with ESMTPS id E8A2E1FF2CA
for <inbox@lore.proxmox.com>; Tue, 23 Jul 2024 16:31:35 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 076C65A8D;
Tue, 23 Jul 2024 16:32:09 +0200 (CEST)
Message-ID: <f78a5f8b-9f70-44e9-996f-fe1567b9b56b@proxmox.com>
Date: Tue, 23 Jul 2024 16:31:35 +0200
MIME-Version: 1.0
User-Agent: Mozilla Thunderbird
Content-Language: en-US
To: Proxmox VE development discussion <pve-devel@lists.proxmox.com>,
Christoph Heiss <c.heiss@proxmox.com>
References: <20240718134905.1177775-1-c.heiss@proxmox.com>
<20240718134905.1177775-7-c.heiss@proxmox.com>
From: Aaron Lauterer <a.lauterer@proxmox.com>
In-Reply-To: <20240718134905.1177775-7-c.heiss@proxmox.com>
X-SPAM-LEVEL: Spam detection results: 0
AWL -0.038 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
URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See
http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more
information. [setup.rs, runenv.pm]
Subject: Re: [pve-devel] [PATCH installer v2 06/17] common: setup:
deserialize `secure_boot` property from runtime env
X-BeenThere: pve-devel@lists.proxmox.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Proxmox VE development discussion <pve-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/>
List-Post: <mailto:pve-devel@lists.proxmox.com>
List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=subscribe>
Reply-To: Proxmox VE development discussion <pve-devel@lists.proxmox.com>
Content-Transfer-Encoding: 7bit
Content-Type: text/plain; charset="us-ascii"; Format="flowed"
Errors-To: pve-devel-bounces@lists.proxmox.com
Sender: "pve-devel" <pve-devel-bounces@lists.proxmox.com>
In my tests, with secure boot disabled, it failed to parse the
run-env-info.json because the Perl code wrote it this way:
"secure_boot":""
And it currently cannot parse a string. Setting it manually to:
"secure_boot":0
helped. The question is, if we want the parser to be more flexible or
fix the Perl code that dumps that info.
On 2024-07-18 15:48, Christoph Heiss wrote:
> Needed for the post-hook functionality, which sends this information as
> part of its information set.
>
> Signed-off-by: Christoph Heiss <c.heiss@proxmox.com>
> ---
> Changes v1 -> v2:
> * new patch
> ---
> Proxmox/Install/RunEnv.pm | 1 +
> proxmox-installer-common/src/setup.rs | 12 ++++++++++++
> 2 files changed, 13 insertions(+)
>
> diff --git a/Proxmox/Install/RunEnv.pm b/Proxmox/Install/RunEnv.pm
> index 7eaf96a..bb60080 100644
> --- a/Proxmox/Install/RunEnv.pm
> +++ b/Proxmox/Install/RunEnv.pm
> @@ -236,6 +236,7 @@ my sub detect_country_tracing_to : prototype($$) {
> # kernel_cmdline = <contents of /proc/cmdline>,
> # total_memory = <memory size in MiB>,
> # hvm_supported = <1 if the CPU supports hardware-accelerated virtualization>,
> +# secure_boot = <1 if SecureBoot is enabled>,
> # boot_type = <either 'efi' or 'bios'>,
> # disks => <see Proxmox::Sys::Block::hd_list()>,
> # network => {
> diff --git a/proxmox-installer-common/src/setup.rs b/proxmox-installer-common/src/setup.rs
> index ee3d0c9..2ca9641 100644
> --- a/proxmox-installer-common/src/setup.rs
> +++ b/proxmox-installer-common/src/setup.rs
> @@ -236,6 +236,14 @@ where
> Ok(val != 0)
> }
>
> +fn deserialize_bool_from_int_maybe<'de, D>(deserializer: D) -> Result<Option<bool>, D::Error>
> +where
> + D: Deserializer<'de>,
> +{
> + let val: Option<u32> = Deserialize::deserialize(deserializer)?;
> + Ok(val.map(|v| v != 0))
> +}
> +
> fn deserialize_cczones_map<'de, D>(
> deserializer: D,
> ) -> Result<HashMap<String, Vec<String>>, D::Error>
> @@ -333,6 +341,10 @@ pub struct RuntimeInfo {
> /// Whether the CPU supports hardware-accelerated virtualization
> #[serde(deserialize_with = "deserialize_bool_from_int")]
> pub hvm_supported: bool,
> +
> + /// Whether the system was booted with SecureBoot enabled
> + #[serde(default, deserialize_with = "deserialize_bool_from_int_maybe")]
> + pub secure_boot: Option<bool>,
> }
>
> #[derive(Copy, Clone, Eq, Deserialize, PartialEq)]
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel