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 04A751FF13F for ; Thu, 26 Mar 2026 17:56:24 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 6280E1AF87; Thu, 26 Mar 2026 17:56:44 +0100 (CET) From: Christoph Heiss To: pve-devel@lists.proxmox.com Subject: [PATCH proxmox] schema: ser: fix value serialization for maps Date: Thu, 26 Mar 2026 17:46:30 +0100 Message-ID: <20260326165515.2234618-1-c.heiss@proxmox.com> X-Mailer: git-send-email 2.53.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1774544148757 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.053 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.001 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.001 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.001 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: AXKBHKZUZT7K72EBPYHTRXZD554HSBQR X-Message-ID-Hash: AXKBHKZUZT7K72EBPYHTRXZD554HSBQR X-MailFrom: c.heiss@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 X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox VE development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: .. by actually serializing map values as values, not keys. Call the correct .do_value() instead of .do_key() in SerializeStruct::serialize_value(). Without, the included test case would produce "a=,1=" instead of the expected "a=1" Signed-off-by: Christoph Heiss --- proxmox-schema/src/property_string.rs | 17 +++++++++++++++++ proxmox-schema/src/ser/mod.rs | 2 +- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/proxmox-schema/src/property_string.rs b/proxmox-schema/src/property_string.rs index 6e4b3248..fc52c895 100644 --- a/proxmox-schema/src/property_string.rs +++ b/proxmox-schema/src/property_string.rs @@ -367,6 +367,7 @@ where #[cfg(test)] mod test { use serde::{Deserialize, Serialize}; + use std::collections::HashMap; use crate::schema::*; @@ -515,4 +516,20 @@ mod test { Ok(()) } + + #[test] + fn test_map_serialization() { + #[derive(Serialize, PartialEq)] + struct Outer(HashMap); + + impl ApiType for Outer { + const API_SCHEMA: Schema = ObjectSchema::new("Outer", &[]) + .additional_properties(true) + .schema(); + } + + let mut map = HashMap::with_capacity(2); + map.insert("a".to_owned(), 1); + assert_eq!(super::print(&Outer(map)).expect("property string"), "a=1"); + } } diff --git a/proxmox-schema/src/ser/mod.rs b/proxmox-schema/src/ser/mod.rs index e19209a8..0a91b13c 100644 --- a/proxmox-schema/src/ser/mod.rs +++ b/proxmox-schema/src/ser/mod.rs @@ -284,7 +284,7 @@ impl ser::SerializeMap for SerializeStruct { where V: Serialize + ?Sized, { - self.do_key(value) + self.do_value(value) } fn end(self) -> Result { -- 2.53.0