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 2DE5C1FF179 for ; Wed, 29 Oct 2025 15:48:50 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id CB710E63F; Wed, 29 Oct 2025 15:49:21 +0100 (CET) From: Lukas Wagner To: pdm-devel@lists.proxmox.com Date: Wed, 29 Oct 2025 15:49:00 +0100 Message-ID: <20251029144902.446852-12-l.wagner@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20251029144902.446852-1-l.wagner@proxmox.com> References: <20251029144902.446852-1-l.wagner@proxmox.com> MIME-Version: 1.0 X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1761749338988 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.028 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 datacenter-manager 11/13] api: remote-tasks: add support for view-filter parameter 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" A view filter allows one to get filtered subset of all resources, based on filter rules defined in a config file. View filters integrate with the permission system - if a user has permissions on /view/{view-filter-id}, then these privileges are transitively applied to all resources which are matched by the rules. All other permission checks are replaced if requesting data through a view filter. Signed-off-by: Lukas Wagner --- server/src/api/remote_tasks.rs | 36 +++++++++++++++++++++++++++---- server/src/remote_tasks/mod.rs | 39 +++++++++++++++++++++++----------- 2 files changed, 59 insertions(+), 16 deletions(-) diff --git a/server/src/api/remote_tasks.rs b/server/src/api/remote_tasks.rs index 7b97b9cd..4a68c5d9 100644 --- a/server/src/api/remote_tasks.rs +++ b/server/src/api/remote_tasks.rs @@ -4,9 +4,10 @@ use anyhow::Error; use pdm_api_types::{ remotes::REMOTE_ID_SCHEMA, RemoteUpid, TaskCount, TaskFilters, TaskListItem, TaskStateType, - TaskStatistics, + TaskStatistics, PRIV_RESOURCE_AUDIT, VIEW_FILTER_ID_SCHEMA, }; -use proxmox_router::{list_subdirs_api_method, Permission, Router, SubdirMap}; +use proxmox_access_control::CachedUserInfo; +use proxmox_router::{list_subdirs_api_method, Permission, Router, RpcEnvironment, SubdirMap}; use proxmox_schema::api; use proxmox_sortable_macro::sortable; @@ -41,6 +42,11 @@ const SUBDIRS: SubdirMap = &sorted!([ schema: REMOTE_ID_SCHEMA, optional: true, }, + "view-filter": { + schema: VIEW_FILTER_ID_SCHEMA, + optional: true, + }, + }, }, )] @@ -48,8 +54,17 @@ const SUBDIRS: SubdirMap = &sorted!([ async fn list_tasks( filters: TaskFilters, remote: Option, + view_filter: Option, + rpcenv: &mut dyn RpcEnvironment, ) -> Result, Error> { - let tasks = remote_tasks::get_tasks(filters, remote).await?; + let auth_id = rpcenv.get_auth_id().unwrap().parse()?; + let user_info = CachedUserInfo::new()?; + + if let Some(view_filter) = &view_filter { + user_info.check_privs(&auth_id, &["view", view_filter], PRIV_RESOURCE_AUDIT, false)?; + } + + let tasks = remote_tasks::get_tasks(filters, remote, view_filter).await?; Ok(tasks) } @@ -70,6 +85,10 @@ async fn list_tasks( schema: REMOTE_ID_SCHEMA, optional: true, }, + "view-filter": { + schema: VIEW_FILTER_ID_SCHEMA, + optional: true, + }, }, }, )] @@ -77,8 +96,17 @@ async fn list_tasks( async fn task_statistics( filters: TaskFilters, remote: Option, + view_filter: Option, + rpcenv: &mut dyn RpcEnvironment, ) -> Result { - let tasks = remote_tasks::get_tasks(filters, remote).await?; + let auth_id = rpcenv.get_auth_id().unwrap().parse()?; + let user_info = CachedUserInfo::new()?; + + if let Some(view_filter) = &view_filter { + user_info.check_privs(&auth_id, &["view", view_filter], PRIV_RESOURCE_AUDIT, false)?; + } + + let tasks = remote_tasks::get_tasks(filters, remote, view_filter).await?; let mut by_type: HashMap = HashMap::new(); let mut by_remote: HashMap = HashMap::new(); diff --git a/server/src/remote_tasks/mod.rs b/server/src/remote_tasks/mod.rs index c4939742..4d93d9b8 100644 --- a/server/src/remote_tasks/mod.rs +++ b/server/src/remote_tasks/mod.rs @@ -9,6 +9,8 @@ pub mod task_cache; use task_cache::{GetTasks, TaskCache, TaskCacheItem}; +use crate::views; + /// Base directory for the remote task cache. pub const REMOTE_TASKS_DIR: &str = concat!(pdm_buildcfg::PDM_CACHE_DIR_M!(), "/remote-tasks"); @@ -29,7 +31,12 @@ const NUMBER_OF_UNCOMPRESSED_FILES: u32 = 2; pub async fn get_tasks( filters: TaskFilters, remote_filter: Option, + view_filter: Option, ) -> Result, Error> { + let view_filter = view_filter + .map(|filter_name| views::view_filter::get_view_filter(&filter_name)) + .transpose()?; + tokio::task::spawn_blocking(move || { let cache = get_cache()?.read()?; @@ -52,21 +59,29 @@ pub async fn get_tasks( return None; } } + // TODO: Handle PBS tasks let pve_upid: Result = task.upid.upid.parse(); match pve_upid { - Ok(pve_upid) => Some(TaskListItem { - upid: task.upid.to_string(), - node: pve_upid.node, - pid: pve_upid.pid as i64, - pstart: pve_upid.pstart, - starttime: pve_upid.starttime, - worker_type: pve_upid.worker_type, - worker_id: None, - user: pve_upid.auth_id, - endtime: task.endtime, - status: task.status, - }), + Ok(pve_upid) => { + if let Some(view_filter) = &view_filter { + if !view_filter.is_node_included(task.upid.remote(), &pve_upid.node) { + return None; + } + } + Some(TaskListItem { + upid: task.upid.to_string(), + node: pve_upid.node, + pid: pve_upid.pid as i64, + pstart: pve_upid.pstart, + starttime: pve_upid.starttime, + worker_type: pve_upid.worker_type, + worker_id: None, + user: pve_upid.auth_id, + endtime: task.endtime, + status: task.status, + }) + } Err(err) => { log::error!("could not parse UPID: {err:#}"); None -- 2.47.3 _______________________________________________ pdm-devel mailing list pdm-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pdm-devel