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 [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id C36FA1FF164 for <inbox@lore.proxmox.com>; Fri, 28 Mar 2025 18:16:56 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id C152F8F72; Fri, 28 Mar 2025 18:14:18 +0100 (CET) From: Gabriel Goller <g.goller@proxmox.com> To: pve-devel@lists.proxmox.com Date: Fri, 28 Mar 2025 18:12:49 +0100 Message-Id: <20250328171340.885413-2-g.goller@proxmox.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250328171340.885413-1-g.goller@proxmox.com> References: <20250328171340.885413-1-g.goller@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.026 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 Subject: [pve-devel] [PATCH proxmox 1/1] serde: add string_as_bool module for boolean string parsing 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-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" <pve-devel-bounces@lists.proxmox.com> Add new module to proxmox-serde that parses boolean values from various string formats. Provides parse_bool function supporting common representations (0/1, true/false, on/off, yes/no) along with serializer/deserializer for these formats. Note: this was copied over from proxmox-ve-config/firewall. Signed-off-by: Gabriel Goller <g.goller@proxmox.com> Co-authored-by: Stefan Hanreich <s.hanreich@proxmox.com> --- proxmox-serde/src/lib.rs | 84 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 84 insertions(+) diff --git a/proxmox-serde/src/lib.rs b/proxmox-serde/src/lib.rs index c162834905c2..705ad430c953 100644 --- a/proxmox-serde/src/lib.rs +++ b/proxmox-serde/src/lib.rs @@ -260,3 +260,87 @@ pub mod string_as_base64url_nopad { String::from_utf8(bytes).map_err(|err| Error::custom(err.to_string())) } } + +/// Parse a bool from a string +pub mod string_as_bool { + use std::fmt; + + use serde::{ + de::{Deserializer, Error, Visitor}, + ser::Serializer, + }; + + /// Parse a boolean. + /// + /// values that parse as [`false`]: 0, false, off, no + /// values that parse as [`true`]: 1, true, on, yes + /// + /// # Examples + /// ```ignore + /// assert_eq!(parse_bool("false"), Ok(false)); + /// assert_eq!(parse_bool("on"), Ok(true)); + /// assert!(parse_bool("proxmox").is_err()); + /// ``` + pub fn parse_bool(value: &str) -> Result<bool, anyhow::Error> { + Ok( + if value == "0" + || value.eq_ignore_ascii_case("false") + || value.eq_ignore_ascii_case("off") + || value.eq_ignore_ascii_case("no") + { + false + } else if value == "1" + || value.eq_ignore_ascii_case("true") + || value.eq_ignore_ascii_case("on") + || value.eq_ignore_ascii_case("yes") + { + true + } else { + anyhow::bail!("not a boolean: {value:?}"); + }, + ) + } + + pub fn deserialize<'de, D: Deserializer<'de>>( + deserializer: D, + ) -> Result<Option<bool>, D::Error> { + struct V; + + impl<'de> Visitor<'de> for V { + type Value = Option<bool>; + + fn expecting(&self, f: &mut fmt::Formatter) -> fmt::Result { + f.write_str("a boolean-like value") + } + + fn visit_bool<E: Error>(self, v: bool) -> Result<Self::Value, E> { + Ok(Some(v)) + } + + fn visit_str<E: Error>(self, v: &str) -> Result<Self::Value, E> { + parse_bool(v).map_err(E::custom).map(Some) + } + + fn visit_none<E: Error>(self) -> Result<Self::Value, E> { + Ok(None) + } + + fn visit_some<D>(self, deserializer: D) -> Result<Self::Value, D::Error> + where + D: Deserializer<'de>, + { + deserializer.deserialize_any(self) + } + } + + deserializer.deserialize_any(V) + } + + pub fn serialize<S: Serializer>(from: &Option<bool>, serializer: S) -> Result<S::Ok, S::Error> { + if *from == Some(true) { + serializer.serialize_str("1") + } else { + serializer.serialize_str("0") + } + } +} -- 2.39.5 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel