From 58986bc1e60850394e9949d6699f8c198e03f2f1 Mon Sep 17 00:00:00 2001 From: Nikhil Sinha Date: Mon, 16 Nov 2026 20:16:38 +0530 Subject: [PATCH 1/2] fix: usergroup create/update with system roles fix the behaviour - usergroup cannot be created or updated when attaching system roles `__global_ingestor__` or `__global_querier__` to it --- src/handlers/http/rbac.rs | 10 ++-------- src/rbac/map.rs | 15 ++++----------- src/rbac/mod.rs | 39 +++++++++++++++++++++++++++++++++++++-- src/rbac/user.rs | 17 ++++------------- src/rbac/utils.rs | 9 +-------- 5 files changed, 48 insertions(+), 42 deletions(-) diff --git a/src/handlers/http/rbac.rs b/src/handlers/http/rbac.rs index a1117d792..ed9d1c074 100644 --- a/src/handlers/http/rbac.rs +++ b/src/handlers/http/rbac.rs @@ -22,7 +22,7 @@ use crate::{ parseable::DEFAULT_TENANT, rbac::{ self, Users, - map::{read_user_groups, roles, users}, + map::{read_user_groups, users}, role::model::Role, user::{self, UpdateUser, UserType}, utils::to_prism_user, @@ -307,13 +307,7 @@ pub fn get_role_internal( .roles .iter() .filter_map(|role_name| { - if let Some(roles) = roles().get(tenant) - && let Some(role) = roles.get(role_name) - { - Some((role_name.to_owned(), role.clone())) - } else { - None - } + rbac::role_for(tenant, role_name).map(|role| (role_name.to_owned(), role)) }) .collect(); group_roles.insert(group.name.clone(), ug_roles); diff --git a/src/rbac/map.rs b/src/rbac/map.rs index d295fe689..d166b2f76 100644 --- a/src/rbac/map.rs +++ b/src/rbac/map.rs @@ -25,7 +25,7 @@ use crate::{parseable::PARSEABLE, storage::StorageMetadata}; use std::collections::HashMap; use std::collections::HashSet; -use super::Response; +use super::{Response, role_for}; use super::{ role::{Action, Permission, RoleBuilder, model::DefaultPrivilege}, user, @@ -522,19 +522,12 @@ fn aggregate_group_permissions(username: &str, tenant_id: &String) -> HashSet Option { } pub fn is_system_role(name: &str) -> bool { - matches!(name, GLOBAL_INGESTOR_ROLE | GLOBAL_QUERIER_ROLE) + system_role(name).is_some() } pub fn role_for(tenant_id: &str, name: &str) -> Option { @@ -83,6 +83,16 @@ pub fn role_exists(tenant_id: &str, name: &str) -> bool { .is_some_and(|roles| roles.contains_key(name)) } +/// Whether a role can be assigned to a user group. System roles are +/// assignable, while other server-internal roles remain protected. +pub fn role_assignable_to_group(tenant_id: &str, name: &str) -> bool { + is_system_role(name) + || roles() + .get(tenant_id) + .and_then(|roles| roles.get(name)) + .is_some_and(|role| role.role_type().eq(&RoleType::User)) +} + #[derive(PartialEq, Debug)] pub enum Response { Authorized, @@ -483,3 +493,28 @@ pub fn roles_to_permission(roles: Vec, tenant_id: &str) -> Vec UsersPrism { .roles .iter() .filter_map(|role_name| { - roles() - .get(tenant_id) - .filter(|roles| roles.get(role_name).is_some()) - .map(|roles| { - let role = roles.get(role_name).unwrap(); - (role_name.to_owned(), RoleUI(role.clone())) - }) + role_for(tenant_id, role_name).map(|role| (role_name.to_owned(), RoleUI(role))) }) .collect(); group_roles.insert(group.name.clone(), ug_roles); From b3bfe0837e65faa65bcd5e54ac48e5bf88873496 Mon Sep 17 00:00:00 2001 From: Nikhil Sinha Date: Mon, 16 Nov 2026 20:26:37 +0530 Subject: [PATCH 2/2] fix for get permissions --- src/rbac/mod.rs | 55 +++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 49 insertions(+), 6 deletions(-) diff --git a/src/rbac/mod.rs b/src/rbac/mod.rs index 7487045ac..8a78a2964 100644 --- a/src/rbac/mod.rs +++ b/src/rbac/mod.rs @@ -270,12 +270,10 @@ impl Users { && let Some(group) = groups.get(&group) { let group_roles = &group.roles; - for role in group_roles { - if let Some(roles) = roles().get(&tenant_id) - && let Some(privilege_list) = roles.get(role) - { - for privelege in privilege_list.privileges() { - permissions.extend(RoleBuilder::from(privelege).build()); + for role_name in group_roles { + if let Some(role) = role_for(&tenant_id, role_name) { + for privilege in role.privileges() { + permissions.extend(RoleBuilder::from(privilege).build()); } } } @@ -517,4 +515,49 @@ mod system_role_tests { Some(ParseableResourceType::Stream("*".to_string())), ))); } + + #[test] + fn group_only_global_querier_is_included_in_get_permissions() { + let tenant = "group-only-system-role-test".to_string(); + let group_name = "global-query-group".to_string(); + let (mut user, _) = + User::new_basic("group-query-user".to_string(), Some(tenant.clone()), false); + user.user_groups.insert(group_name.clone()); + + map::ROLES + .set(parking_lot::RwLock::new(HashMap::from([( + tenant.clone(), + HashMap::new(), + )]))) + .expect("roles map should be uninitialized"); + map::USERS + .set(parking_lot::RwLock::new(map::Users::from(vec![ + user.clone(), + ]))) + .expect("users map should be uninitialized"); + map::SESSIONS + .set(parking_lot::RwLock::new(map::Sessions::default())) + .expect("sessions map should be uninitialized"); + map::USER_GROUPS + .set(parking_lot::RwLock::new(map::UserGroups::default())) + .expect("user groups map should be uninitialized"); + + map::write_user_groups().insert( + user::UserGroup::new( + group_name, + HashSet::from([GLOBAL_QUERIER_ROLE.to_string()]), + HashSet::new(), + ), + &tenant, + ); + + let session = SessionKey::SessionId(ulid::Ulid::new()); + Users.new_session(&user, session.clone(), TimeDelta::hours(1)); + + let permissions = Users.get_permissions(&session); + assert!(permissions.contains(&Permission::Resource( + Action::Query, + Some(ParseableResourceType::Stream("*".to_string())), + ))); + } }