From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id C5CFB1FF13E for ; Fri, 20 Mar 2026 14:19:44 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 8FB4B17E3B; Fri, 20 Mar 2026 14:19:58 +0100 (CET) From: Gabriel Goller To: pve-devel@lists.proxmox.com Subject: [PATCH proxmox] schema: api_string_type: add from_str method to validate before allocating Date: Fri, 20 Mar 2026 14:19:07 +0100 Message-ID: <20260320131920.131477-1-g.goller@proxmox.com> X-Mailer: git-send-email 2.47.3 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1774012720179 X-SPAM-LEVEL: Spam detection results: 0 AWL -1.042 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 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.408 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.819 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.903 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Message-ID-Hash: RNUJCPDJE2TOTC3RPY5IY3D6KHP2EMXL X-Message-ID-Hash: RNUJCPDJE2TOTC3RPY5IY3D6KHP2EMXL X-MailFrom: g.goller@proxmox.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: Wolfgang Bumiller X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox VE development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: The existing from_string takes ownership of a String, meaning callers with a &str had to heap-allocate first and discard the allocation on validation failure. The new from_str validates the &str against the schema's check_constraints before calling to_string(), so no allocation happens on the error path. Suggested-by: Wolfgang Bumiller Signed-off-by: Gabriel Goller --- Motivation: This is used quite a lot in proxmox-ve-rs, where we often do e.g. NetAfi::from_str(afi.to_string()), where from_str is the implementation provided by the api_string_type macro. proxmox-schema/src/api_type_macros.rs | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/proxmox-schema/src/api_type_macros.rs b/proxmox-schema/src/api_type_macros.rs index f3740d14fd35..dd83f684baba 100644 --- a/proxmox-schema/src/api_type_macros.rs +++ b/proxmox-schema/src/api_type_macros.rs @@ -27,6 +27,8 @@ /// * `fn as_str(&self) -> &str` /// * `fn from_string(inner: String) -> Result` using /// `StringSchema::check_constraints`. +/// * `fn from_str(inner: &str) -> Result` using +/// `StringSchema::check_constraints`. /// * `unsafe fn from_string_unchecked(inner: String) -> Self` #[macro_export] macro_rules! api_string_type { @@ -101,6 +103,21 @@ macro_rules! api_string_type { } Ok(Self(inner)) } + + /// Create an instance from a `&str`, validating it using the API schema's + /// [`check_constraints`](::proxmox_schema::StringSchema::check_constraints()) + /// method. + /// + /// Validates the string *before* allocating, so no heap allocation occurs on + /// failure. Only allocates when the value is guaranteed to be valid. + pub fn from_str(inner: &str) -> Result { + use $crate::ApiType; + match &Self::API_SCHEMA { + $crate::Schema::String(s) => s.check_constraints(inner)?, + _ => unreachable!(), + } + Ok(Self(inner.to_string())) + } } impl ::std::fmt::Display for $name { -- 2.47.3