From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gate001.proxmox.com (gate001.proxmox.com [IPv6:2a0f:8001:1:32::40]) by lore.proxmox.com (Postfix) with ESMTPS id 0ADD81FF0B0 for ; Fri, 09 Oct 2026 14:59:17 +0200 (CEST) Received: from gate001.proxmox.com (localhost.localdomain [127.0.0.1]) by gate001.proxmox.com (Proxmox) with ESMTP id 180AD2185A; Fri, 09 Oct 2026 14:57:41 +0200 (CEST) From: Lukas Wagner To: pbs-devel@lists.proxmox.com, pve-devel@lists.proxmox.com Subject: [PATCH proxmox v3 18/39] notify: matcher: re-serialize expression on create/update Date: Fri, 9 Oct 2026 14:56:25 +0200 Message-ID: <20261009125646.284673-19-l.wagner@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20261009125646.284673-1-l.wagner@proxmox.com> References: <20261009125646.284673-1-l.wagner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1791550611661 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.338 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: SLPRHZH6JQTLOYG75EOCE45S6ASHWEFH X-Message-ID-Hash: SLPRHZH6JQTLOYG75EOCE45S6ASHWEFH 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: This ensures that it is properly minified and does not contain any control characters. Signed-off-by: Lukas Wagner --- Notes: New in v3. proxmox-notify/src/api/matcher.rs | 5 ++++- proxmox-notify/src/matcher/mod.rs | 12 +++++++++--- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/proxmox-notify/src/api/matcher.rs b/proxmox-notify/src/api/matcher.rs index 77b2e1ce..c3177f47 100644 --- a/proxmox-notify/src/api/matcher.rs +++ b/proxmox-notify/src/api/matcher.rs @@ -68,7 +68,10 @@ pub fn get_matcher_as_expression(config: &Config, name: &str) -> Result Result<(), HttpError> { +pub fn add_matcher( + config: &mut Config, + mut matcher_config: MatcherConfig, +) -> Result<(), HttpError> { super::ensure_unique(config, &matcher_config.name)?; super::ensure_endpoints_exist(config, &matcher_config.target)?; diff --git a/proxmox-notify/src/matcher/mod.rs b/proxmox-notify/src/matcher/mod.rs index f4c11c37..a3b97952 100644 --- a/proxmox-notify/src/matcher/mod.rs +++ b/proxmox-notify/src/matcher/mod.rs @@ -263,7 +263,7 @@ impl MatcherConfig { } /// Ensure the validity of this matcher. - pub(crate) fn ensure_valid(&self) -> Result<(), Error> { + pub(crate) fn ensure_valid(&mut self) -> Result<(), Error> { #[cfg(feature = "legacy-matchers")] self.ensure_no_ignored_properties()?; self.ensure_valid_expression()?; @@ -287,11 +287,17 @@ impl MatcherConfig { Ok(()) } - fn ensure_valid_expression(&self) -> Result<(), Error> { + fn ensure_valid_expression(&mut self) -> Result<(), Error> { if let Some(expression) = &self.expression { match serde_json::from_str::>(expression) { Ok(expr) => { Self::verify_match_expression_constraints(&expr)?; + + // Storing the *serialized* expression makes sure that + // we have a minified, single-line JSON string + self.expression = Some(serde_json::to_string(&expr).map_err(|err| { + Error::Generic(format!("could not serialize expression: {err:#}")) + })?); } Err(err) => { return Err(Error::Generic(format!( @@ -519,7 +525,7 @@ mod tests { empty_field_matcher, empty_severity_matcher, ] { - let config = MatcherConfig { + let mut config = MatcherConfig { name: "matcher".to_string(), expression: Some(expr.into()), ..Default::default() -- 2.47.3