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 E3ACD1FF15C for ; Fri, 14 Nov 2025 15:43:02 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 1554415E5C; Fri, 14 Nov 2025 15:43:59 +0100 (CET) From: Shannon Sterz To: pdm-devel@lists.proxmox.com Date: Fri, 14 Nov 2025 15:43:13 +0100 Message-ID: <20251114144318.317322-6-s.sterz@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20251114144318.317322-1-s.sterz@proxmox.com> References: <20251114144318.317322-1-s.sterz@proxmox.com> MIME-Version: 1.0 X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1763131375414 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.062 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 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 proxmox v4 5/5] access-control: allow reading all acls of the current authid 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" adds a parameter to the `API_METHOD_READ_ACL` endpoint to allow listing all ACL entries of the currently authenticated Authid. allowing a user to see their own ACLs does not really expose any additional confidential information. however, being able to query this information allows us, for example, to adapt ui components to a users capabilities. this uses `AclTreeNode::extract_roles` for the extraction. `extract_roles` already respects the so far incomplete groups feature. the part that is still missing here, is looking up what groups a user belongs to. by using `extract_roles` so we should avoid accidentally breaking the ui once groups are added. Signed-off-by: Shannon Sterz Reviewed-by: Lukas Wagner Tested-by: Lukas Wagner --- proxmox-access-control/src/api/acl.rs | 101 ++++++++++++++++++-------- 1 file changed, 71 insertions(+), 30 deletions(-) diff --git a/proxmox-access-control/src/api/acl.rs b/proxmox-access-control/src/api/acl.rs index 4326215c..1700f6e8 100644 --- a/proxmox-access-control/src/api/acl.rs +++ b/proxmox-access-control/src/api/acl.rs @@ -23,6 +23,12 @@ use crate::CachedUserInfo; optional: true, default: false, }, + "all-for-authid": { + description: "Whether to return all ACL entries for the exact current authid only.", + type: bool, + optional: true, + default: false, + } }, }, returns: { @@ -34,13 +40,17 @@ use crate::CachedUserInfo; }, access: { permission: &Permission::Anybody, - description: "Returns all ACLs if user has sufficient privileges on this endpoint, otherwise it is limited to the user's API tokens.", + description: "Returns all ACLs if a user has sufficient privileges on this endpoint. \ + Otherwise it is limited to the user's API tokens. However, if `all-for-authid` is \ + specified, all ACLs of the current Authid will be returned, whether the Authid has \ + privileges to list other ACLs here or not.", }, )] /// Get ACL entries, can be filter by path. pub fn read_acl( path: Option, exact: bool, + all_for_authid: bool, rpcenv: &mut dyn RpcEnvironment, ) -> Result, Error> { let auth_id = rpcenv @@ -58,7 +68,11 @@ pub fn read_acl( ) .is_err(); - let filter = if filter_entries { Some(auth_id) } else { None }; + let filter = if filter_entries || all_for_authid { + Some(auth_id) + } else { + None + }; let (mut tree, digest) = crate::acl::config()?; @@ -74,7 +88,13 @@ pub fn read_acl( rpcenv["digest"] = hex::encode(digest).into(); - Ok(extract_acl_node_data(node, path.as_deref(), exact, &filter)) + Ok(extract_acl_node_data( + node, + path.as_deref(), + all_for_authid, + exact, + &filter, + )) } #[api( @@ -241,6 +261,7 @@ pub fn update_acl( fn extract_acl_node_data( node: &AclTreeNode, path: Option<&str>, + all_for_authid: bool, exact: bool, auth_id_filter: &Option, ) -> Vec { @@ -257,37 +278,57 @@ fn extract_acl_node_data( while let Some((path, node)) = nodes.pop() { let path_str = if path.is_empty() { "/" } else { &path }; - for (user, roles) in &node.users { - if let Some(auth_id_filter) = auth_id_filter { - if !user.is_token() || user.user() != auth_id_filter.user() { - continue; + if all_for_authid { + if let Some(auth_id) = auth_id_filter { + // this will extract all roles for `auth_id_filer` from the node. group acls will + // be handled according to the acl trees implementation. we mask them here as user + // ACLs to avoid disclosing more information than necessary. + // + // by setting `leaf` to true we always get all roles for this `auth_id` on the + // current node. + for (role, propagate) in node.extract_roles(auth_id, true) { + to_return.push(AclListItem { + path: path_str.to_owned(), + propagate, + ugid_type: AclUgidType::User, + ugid: auth_id.to_string(), + roleid: role.to_string(), + }) + } + } + } else { + for (user, roles) in &node.users { + if let Some(auth_id_filter) = auth_id_filter { + if !user.is_token() || user.user() != auth_id_filter.user() { + continue; + } + } + + for (role, propagate) in roles { + to_return.push(AclListItem { + path: path_str.to_owned(), + propagate: *propagate, + ugid_type: AclUgidType::User, + ugid: user.to_string(), + roleid: role.to_string(), + }); } } - for (role, propagate) in roles { - to_return.push(AclListItem { - path: path_str.to_owned(), - propagate: *propagate, - ugid_type: AclUgidType::User, - ugid: user.to_string(), - roleid: role.to_string(), - }); - } - } + for (group, roles) in &node.groups { + if auth_id_filter.is_some() { + continue; + } - for (group, roles) in &node.groups { - if auth_id_filter.is_some() { - continue; - } - - for (role, propagate) in roles { - to_return.push(AclListItem { - path: path_str.to_owned(), - propagate: *propagate, - ugid_type: AclUgidType::Group, - ugid: group.to_string(), - roleid: role.to_string(), - }); + for (role, propagate) in roles { + to_return.push(AclListItem { + path: path_str.to_owned(), + propagate: *propagate, + ugid_type: AclUgidType::Group, + ugid: group.to_string(), + roleid: role.to_string(), + }); + } } } -- 2.47.3 _______________________________________________ pdm-devel mailing list pdm-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pdm-devel