Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 2 additions & 8 deletions src/handlers/http/rbac.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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);
Expand Down
15 changes: 4 additions & 11 deletions src/rbac/map.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -522,19 +522,12 @@ fn aggregate_group_permissions(username: &str, tenant_id: &String) -> HashSet<Pe
&& let Some(group) = groups.get(group_name)
{
for role_name in group.roles.iter() {
let roles = if let Some(tenant_roles) = roles().get(tenant_id)
&& let Some(role) = tenant_roles.get(role_name)
{
role.clone()
} else {
let Some(role) = role_for(tenant_id, role_name) else {
Comment thread
greptile-apps[bot] marked this conversation as resolved.
Resolved
continue;
};
// let Some(privileges) = roles().get(role_name).cloned() else {
// continue;
// };

for role in roles.privileges() {
group_perms.extend(RoleBuilder::from(role).build());
for privilege in role.privileges() {
group_perms.extend(RoleBuilder::from(privilege).build());
}
}
} else {
Expand Down
94 changes: 86 additions & 8 deletions src/rbac/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ use crate::handlers::http::rbac::RBACError;
use crate::parseable::DEFAULT_TENANT;
use crate::rbac::map::{mut_sessions, mut_users, read_user_groups, roles, sessions, users};
use crate::rbac::role::Action;
use crate::rbac::role::model::{Role, RoleUI};
use crate::rbac::role::model::{Role, RoleType, RoleUI};
use crate::rbac::user::User;
use crate::utils::get_tenant_id_from_key;

Expand Down Expand Up @@ -65,7 +65,7 @@ pub fn system_role(name: &str) -> Option<Role> {
}

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<Role> {
Expand All @@ -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,
Expand Down Expand Up @@ -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());
}
}
}
Expand Down Expand Up @@ -483,3 +491,73 @@ pub fn roles_to_permission(roles: Vec<String>, tenant_id: &str) -> Vec<Permissio
}
perms.into_iter().collect()
}

#[cfg(test)]
mod system_role_tests {
use super::*;

#[test]
fn system_roles_are_assignable_to_groups() {
for role in [GLOBAL_INGESTOR_ROLE, GLOBAL_QUERIER_ROLE] {
assert!(role_assignable_to_group("tenant-without-a-role-map", role));
}
}

#[test]
fn global_querier_grants_query_access_to_all_streams() {
let permissions = roles_to_permission(
vec![GLOBAL_QUERIER_ROLE.to_string()],
"tenant-without-a-role-map",
);

assert!(permissions.contains(&Permission::Resource(
Action::Query,
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())),
)));
}
}
17 changes: 4 additions & 13 deletions src/rbac/user.rs
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ use crate::{
Users,
map::{mut_sessions, read_user_groups, roles, users},
role::model::RoleType,
roles_to_permission,
role_assignable_to_group, roles_to_permission,
},
};

Expand Down Expand Up @@ -505,19 +505,10 @@ impl UserGroup {
}
let mut non_existent_roles = Vec::new();
if !self.roles.is_empty() {
// validate that the roles exist
// can't add internal roles to a group
if let Some(tenant_roles) = roles().get(tenant) {
for role in &self.roles {
if let Some(role) = tenant_roles.get(role)
&& role.role_type().eq(&RoleType::User)
{
} else {
non_existent_roles.push(role.clone());
}
for role_name in &self.roles {
if !role_assignable_to_group(tenant, role_name) {
non_existent_roles.push(role_name.clone());
}
} else {
non_existent_roles.extend(self.roles.iter().cloned());
}
}
let mut non_existent_users = Vec::new();
Expand Down
9 changes: 1 addition & 8 deletions src/rbac/utils.rs
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ use crate::{

use super::{
Users, UsersPrism,
map::roles,
user::{User, UserType},
};

Expand Down Expand Up @@ -78,13 +77,7 @@ pub fn to_prism_user(user: &User) -> 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);
Expand Down
Loading