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 86A5C1FF13B for ; Wed, 25 Mar 2026 16:35:48 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id D05BA1F002; Wed, 25 Mar 2026 16:36:08 +0100 (CET) From: Shan Shaji To: pdm-devel@lists.proxmox.com Subject: [RFC PATCH datacenter-manager 3/3] ui: acl: list granular level permission paths for resources Date: Wed, 25 Mar 2026 16:35:35 +0100 Message-ID: <20260325153535.286380-4-s.shaji@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260325153535.286380-1-s.shaji@proxmox.com> References: <20260325153535.286380-1-s.shaji@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1774452917265 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.025 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 POISEN_SPAM_PILL 0.1 Meta: its spam POISEN_SPAM_PILL_1 0.1 random spam to be learned in bayes POISEN_SPAM_PILL_3 0.1 random spam to be learned in bayes 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: R32OIDLOYVQ267BQXRQITUOGOTQRNPUI X-Message-ID-Hash: R32OIDLOYVQ267BQXRQITUOGOTQRNPUI X-MailFrom: s.shaji@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 Datacenter Manager development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: previously, users were not able to assign permissions to specific resources. Resolved this by listing the resources Ids and extending the permission paths to include specific resource paths. Signed-off-by: Shan Shaji --- lib/pdm-api-types/src/acl.rs | 3 +- .../configuration/permission_path_selector.rs | 47 ++++++++++++++++++- 2 files changed, 48 insertions(+), 2 deletions(-) diff --git a/lib/pdm-api-types/src/acl.rs b/lib/pdm-api-types/src/acl.rs index 405982a..825fd6b 100644 --- a/lib/pdm-api-types/src/acl.rs +++ b/lib/pdm-api-types/src/acl.rs @@ -280,9 +280,10 @@ impl proxmox_access_control::init::AccessControlConfig for AccessControlConfig { if components_len <= 2 { return Ok(()); } + // `/resource/{remote-id}/{resource-type=guest,storage}/{resource-id}` match components[2] { - "guest" | "storage" => { + "guest" | "storage" | "datastore" | "node" => { // /resource/{remote-id}/{resource-type} // /resource/{remote-id}/{resource-type}/{resource-id} if components_len <= 4 { diff --git a/ui/src/configuration/permission_path_selector.rs b/ui/src/configuration/permission_path_selector.rs index a0fec86..899fa05 100644 --- a/ui/src/configuration/permission_path_selector.rs +++ b/ui/src/configuration/permission_path_selector.rs @@ -9,6 +9,7 @@ use pwt::{prelude::*, AsyncPool}; use pwt_macros::{builder, widget}; use crate::pdm_client; +use pdm_api_types::resource::ResourceType; static PREDEFINED_PATHS: &[&str] = &[ "/", @@ -67,8 +68,52 @@ impl PdmPermissionPathSelector { Ok(paths) } + async fn get_resource_paths() -> Result, Error> { + let resources = pdm_client().resources(None, None).await?; + let resource_paths: Vec = resources + .into_iter() + .flat_map(|remote| { + let remote_name = remote.remote; + + let mut base_paths = vec![remote_name.clone(), format!("{remote_name}/node")]; + let is_pve = remote.resources.iter().any(|r| { + matches!( + r.resource_type(), + ResourceType::PveQemu | ResourceType::PveLxc + ) + }); + + if is_pve { + base_paths.push(format!("{remote_name}/guest")); + } + + let resource_ids = + remote.resources.into_iter().filter_map(|resource| { + match resource.resource_type() { + ResourceType::PveLxc + | ResourceType::PveQemu + | ResourceType::Node + | ResourceType::PbsDatastore => resource + .global_id() + .strip_prefix("remote/") + .map(str::to_owned), + _ => None, + } + }); + + base_paths.into_iter().chain(resource_ids) + }) + .map(|v| format!("{}{v}", "/resource/")) + .collect(); + Ok(resource_paths) + } + async fn get_paths() -> Result, Error> { - let paths = Self::get_view_paths().await?; + let mut paths = Self::get_view_paths().await?; + let mut resource_paths = Self::get_resource_paths().await?; + + paths.append(&mut resource_paths); + Ok(paths) } } -- 2.47.3