From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id D01871FF17E for ; Thu, 30 Oct 2025 12:21:12 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 258241F45E; Thu, 30 Oct 2025 12:21:46 +0100 (CET) Date: Thu, 30 Oct 2025 12:21:12 +0100 From: Wolfgang Bumiller To: Lukas Wagner Message-ID: References: <20251029144902.446852-1-l.wagner@proxmox.com> <20251029144902.446852-8-l.wagner@proxmox.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20251029144902.446852-8-l.wagner@proxmox.com> X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1761823258602 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.077 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_MSPIKE_H2 0.001 Average reputation (+2) 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [resources.rs, proxmox.com] Subject: Re: [pdm-devel] [PATCH datacenter-manager 07/13] api: resources: list: 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 Cc: pdm-devel@lists.proxmox.com Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pdm-devel-bounces@lists.proxmox.com Sender: "pdm-devel" tiny nit inline On Wed, Oct 29, 2025 at 03:48:56PM +0100, Lukas Wagner wrote: > 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/resources.rs | 48 ++++++++++++++++++++++++++++++------ > server/src/resource_cache.rs | 3 ++- > 2 files changed, 43 insertions(+), 8 deletions(-) > > diff --git a/server/src/api/resources.rs b/server/src/api/resources.rs > index dfadcbb1..c7f208aa 100644 > --- a/server/src/api/resources.rs > +++ b/server/src/api/resources.rs > @@ -18,7 +18,7 @@ use pdm_api_types::resource::{ > use pdm_api_types::subscription::{ > NodeSubscriptionInfo, RemoteSubscriptionState, RemoteSubscriptions, SubscriptionLevel, > }; > -use pdm_api_types::{Authid, PRIV_RESOURCE_AUDIT}; > +use pdm_api_types::{Authid, PRIV_RESOURCE_AUDIT, VIEW_FILTER_ID_SCHEMA}; > use pdm_search::{Search, SearchTerm}; > use proxmox_access_control::CachedUserInfo; > use proxmox_router::{ > @@ -30,8 +30,8 @@ use proxmox_sortable_macro::sortable; > use proxmox_subscription::SubscriptionStatus; > use pve_api_types::{ClusterResource, ClusterResourceType}; > > -use crate::connection; > use crate::metric_collection::top_entities; > +use crate::{connection, views}; > > pub const ROUTER: Router = Router::new() > .get(&list_subdirs_api_method!(SUBDIRS)) > @@ -221,6 +221,10 @@ impl Into for RemoteWithResources { > type: ResourceType, > optional: true, > }, > + "view-filter": { > + schema: VIEW_FILTER_ID_SCHEMA, > + optional: true, > + }, > } > }, > returns: { > @@ -236,10 +240,11 @@ pub async fn get_resources( > max_age: u64, > resource_type: Option, > search: Option, > + view_filter: Option, > rpcenv: &mut dyn RpcEnvironment, > ) -> Result, Error> { > let remotes_with_resources = > - get_resources_impl(max_age, search, resource_type, Some(rpcenv)).await?; > + get_resources_impl(max_age, search, resource_type, view_filter, Some(rpcenv)).await?; > let resources = remotes_with_resources.into_iter().map(Into::into).collect(); > Ok(resources) > } > @@ -276,6 +281,7 @@ pub(crate) async fn get_resources_impl( > max_age: u64, > search: Option, > resource_type: Option, > + view_filter: Option, `search` is a `String` to avoid the clone when converting it to a `Search`, but `view_filter` can just be `&str`, which IMO makes more sense from an api perspective. The callers would have to use `.as_deref()`. > rpcenv: Option<&mut dyn RpcEnvironment>, > ) -> Result, Error> { > let user_info = CachedUserInfo::new()?; > @@ -285,9 +291,15 @@ pub(crate) async fn get_resources_impl( > .get_auth_id() > .ok_or_else(|| format_err!("no authid available"))? > .parse()?; > - if !user_info.any_privs_below(&auth_id, &["resource"], PRIV_RESOURCE_AUDIT)? { > + > + // NOTE: Assumption is that the regular permission check is completely replaced by a check > + // on the view ACL object *if* a view parameter is passed. > + if let Some(view_filter) = &view_filter { > + user_info.check_privs(&auth_id, &["view", view_filter], PRIV_RESOURCE_AUDIT, false)?; > + } else if !user_info.any_privs_below(&auth_id, &["resource"], PRIV_RESOURCE_AUDIT)? { > http_bail!(UNAUTHORIZED, "user has no access to resources"); > } > + > opt_auth_id = Some(auth_id); > } > > @@ -296,12 +308,24 @@ pub(crate) async fn get_resources_impl( > > let filters = search.map(Search::from).unwrap_or_default(); > > + let view_filter = view_filter > + .map(|filter_name| views::view_filter::get_view_filter(&filter_name)) > + .transpose()?; > + > let remotes_only = is_remotes_only(&filters); > > for (remote_name, remote) in remotes_config { > if let Some(ref auth_id) = opt_auth_id { > - let remote_privs = user_info.lookup_privs(auth_id, &["resource", &remote_name]); > - if remote_privs & PRIV_RESOURCE_AUDIT == 0 { > + if view_filter.is_none() { > + let remote_privs = user_info.lookup_privs(auth_id, &["resource", &remote_name]); > + if remote_privs & PRIV_RESOURCE_AUDIT == 0 { > + continue; > + } > + } > + } > + > + if let Some(view_filter) = &view_filter { > + if view_filter.can_skip_remote(&remote_name) { > continue; > } > } > @@ -374,6 +398,15 @@ pub(crate) async fn get_resources_impl( > } > } > > + if let Some(filter) = &view_filter { > + remote_resources.retain_mut(|r| { > + r.resources > + .retain(|resource| filter.resource_matches(&r.remote_name, resource)); > + > + !r.resources.is_empty() > + }); > + } > + > Ok(remote_resources) > } > > @@ -405,7 +438,8 @@ pub async fn get_status( > max_age: u64, > rpcenv: &mut dyn RpcEnvironment, > ) -> Result { > - let remotes_with_resources = get_resources_impl(max_age, None, None, Some(rpcenv)).await?; > + let remotes_with_resources = > + get_resources_impl(max_age, None, None, None, Some(rpcenv)).await?; > let mut counts = ResourcesStatus::default(); > for remote_with_resources in remotes_with_resources { > if let Some(err) = remote_with_resources.error { > diff --git a/server/src/resource_cache.rs b/server/src/resource_cache.rs > index aa20c54e..dc3cbeaf 100644 > --- a/server/src/resource_cache.rs > +++ b/server/src/resource_cache.rs > @@ -21,7 +21,8 @@ pub fn start_task() { > async fn resource_caching_task() -> Result<(), Error> { > loop { > if let Err(err) = > - crate::api::resources::get_resources_impl(METRIC_POLL_INTERVALL, None, None, None).await > + crate::api::resources::get_resources_impl(METRIC_POLL_INTERVALL, None, None, None, None) > + .await > { > log::error!("could not update resource cache: {err}"); > } > -- > 2.47.3 > > > > _______________________________________________ > pdm-devel mailing list > pdm-devel@lists.proxmox.com > https://lists.proxmox.com/cgi-bin/mailman/listinfo/pdm-devel > > _______________________________________________ pdm-devel mailing list pdm-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pdm-devel