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, @@ -260,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()); } } } @@ -483,3 +491,73 @@ 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);