From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 63AC01FF17E for ; Thu, 13 Nov 2025 11:47:14 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id E60C017FC6; Thu, 13 Nov 2025 11:48:08 +0100 (CET) From: Lukas Wagner To: pdm-devel@lists.proxmox.com Date: Thu, 13 Nov 2025 11:47:27 +0100 Message-ID: <20251113104726.153549-2-l.wagner@proxmox.com> X-Mailer: git-send-email 2.47.3 MIME-Version: 1.0 X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1763030860012 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.030 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 Subject: [pdm-devel] [PATCH datacenter-manager] pdm-api-types: views: use regex to verify resource-id values X-BeenThere: pdm-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Datacenter Manager development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox Datacenter Manager development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pdm-devel-bounces@lists.proxmox.com Sender: "pdm-devel" Suggested-by: Dominik Csapak Signed-off-by: Lukas Wagner --- To be applied on top of v4 of my 'view filter' patch series lib/pdm-api-types/src/views.rs | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/lib/pdm-api-types/src/views.rs b/lib/pdm-api-types/src/views.rs index 2bed68f3..ef39cc62 100644 --- a/lib/pdm-api-types/src/views.rs +++ b/lib/pdm-api-types/src/views.rs @@ -1,15 +1,24 @@ use std::{fmt::Display, str::FromStr, sync::OnceLock}; use anyhow::bail; -use proxmox_section_config::{typed::ApiSectionDataEntry, SectionConfig, SectionConfigPlugin}; +use const_format::concatcp; use serde::{Deserialize, Serialize}; -use proxmox_schema::{api, ApiStringFormat, ApiType, ArraySchema, Schema, StringSchema, Updater}; +use proxmox_schema::{ + api, api_types::SAFE_ID_REGEX_STR, const_regex, ApiStringFormat, ApiType, ArraySchema, Schema, + StringSchema, Updater, +}; +use proxmox_section_config::{typed::ApiSectionDataEntry, SectionConfig, SectionConfigPlugin}; use crate::{ remotes::REMOTE_ID_SCHEMA, resource::ResourceType, PROXMOX_SAFE_ID_REGEX, VIEW_ID_SCHEMA, }; +const_regex! { + /// Regex for matching global resource IDs + pub GLOBAL_RESOURCE_ID_REGEX = concatcp!(r"^", SAFE_ID_REGEX_STR, r"(\/", SAFE_ID_REGEX_STR, r")+$"); +} + /// Schema for filter rules. pub const FILTER_RULE_SCHEMA: Schema = StringSchema::new("Filter rule for resources.") .format(&ApiStringFormat::VerifyFn(verify_filter_rule)) @@ -121,12 +130,10 @@ impl FromStr for FilterRule { FilterRule::ResourcePool(value.to_string()) } Some(("resource-id", value)) => { - // TODO: Define schema and use it for validation. Can't use PROXMOX_SAFE_ID_REGEX - // since it does not allow '/'. - - if value.is_empty() { - bail!("empty resource-id rule not allowed"); + if !GLOBAL_RESOURCE_ID_REGEX.is_match(value) { + bail!("invalid resource-id value: {value}"); } + FilterRule::ResourceId(value.to_string()) } Some(("tag", value)) => { @@ -192,6 +199,7 @@ mod test { assert!(parse_and_check_display("resource-id:").is_err()); assert!(parse_and_check_display("resource-id:remote/someremote/guest/100").unwrap()); + assert!(parse_and_check_display("resource-id:remote").is_err()); assert!(parse_and_check_display("tag:").is_err()); assert!(parse_and_check_display("tag:sometag").unwrap()); -- 2.47.3 _______________________________________________ pdm-devel mailing list pdm-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pdm-devel