From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gate001.proxmox.com (gate001.proxmox.com [45.144.208.40]) by lore.proxmox.com (Postfix) with ESMTPS id 47FA21FF0C2 for ; Thu, 22 Oct 2026 14:17:52 +0200 (CEST) Received: from gate001.proxmox.com (localhost.localdomain [127.0.0.1]) by gate001.proxmox.com (Proxmox) with ESMTP id 683CD214CA; Thu, 22 Oct 2026 14:17:21 +0200 (CEST) From: Lukas Wagner To: pbs-devel@lists.proxmox.com, pve-devel@lists.proxmox.com Subject: [PATCH proxmox v5 20/42] notify: matcher: expression: reject ambiguous field matchers Date: Thu, 22 Oct 2026 14:15:45 +0200 Message-ID: <20261022121608.271515-21-l.wagner@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20261022121608.271515-1-l.wagner@proxmox.com> References: <20261022121608.271515-1-l.wagner@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1792671372906 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.271 Adjusted score from AWL reputation of From: address DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment (newer systems) RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust 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: WZFIAZPQDTOVTF7R3EJ4X3KSCZC2OBRX X-Message-ID-Hash: WZFIAZPQDTOVTF7R3EJ4X3KSCZC2OBRX X-MailFrom: l.wagner@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 Backup Server development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Otherwise, API users could create field matchers that set both, the 'values' and the 'regex' field, with one field being ignored when serialized/evaluated. Suggested-by: Michael Köppl Signed-off-by: Lukas Wagner --- Notes: New in v5. proxmox-notify/src/matcher/expression.rs | 15 +++++++++++++++ proxmox-notify/src/matcher/field.rs | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/proxmox-notify/src/matcher/expression.rs b/proxmox-notify/src/matcher/expression.rs index 55c71cc4..df9fe439 100644 --- a/proxmox-notify/src/matcher/expression.rs +++ b/proxmox-notify/src/matcher/expression.rs @@ -94,4 +94,19 @@ mod test { let _: Expression = serde_json::from_str(e).unwrap(); } + + #[test] + fn test_field_matcher_ambigious_variant() { + let e = r#" + { + "match": { + "type": "field", + "field": "something", + "regex": "^abc$", + "values": ["a", "b"] + } + }"#; + + assert!(serde_json::from_str::>(e).is_err()); + } } diff --git a/proxmox-notify/src/matcher/field.rs b/proxmox-notify/src/matcher/field.rs index ac7da37d..3a02b530 100644 --- a/proxmox-notify/src/matcher/field.rs +++ b/proxmox-notify/src/matcher/field.rs @@ -10,7 +10,7 @@ use super::MatchDirective; /// Check if the notification metadata fields match #[derive(Clone, Debug, Serialize, Deserialize)] -#[serde(rename_all = "kebab-case", untagged)] +#[serde(rename_all = "kebab-case", untagged, deny_unknown_fields)] pub enum FieldMatcher { Exact { field: String, -- 2.47.3