starred/openobserve
1
0
Fork 0
mirror of https://github.com/openobserve/openobserve.git synced 2026-11-06 08:09:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: same role and group name in rbac with diff org conflicts (#3359)

Browse Source 
Co-authored-by: oasisk <ashish.j.kolhe@gmail.com>
This commit is contained in:
Subhra264
2024-04-29 11:31:43 +05:30
committed by GitHub
co-authored by oasisk
parent 902d185a0c
commit f9e200f82b
2 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/handler/http/auth/jwt.rs
+6 -1
View File
@@ -441,7 +441,12 @@ async fn map_group_to_custom_role(user_email: &str, name: &str, custom_roles: Ve
for existing_role in &existing_roles {
if !custom_roles.contains(existing_role) {
// delete role
get_user_crole_removal_tuples(user_email, existing_role, &mut remove_tuples);
get_user_crole_removal_tuples(
&O2_CONFIG.dex.default_org,
user_email,
existing_role,
&mut remove_tuples,
);
}
}
src/handler/http/request/authz/fga.rs
+16 -4
View File
@@ -101,6 +101,10 @@ pub async fn get_roles(org_id: web::Path<String>, req: HttpRequest) -> Result<Ht
if value.starts_with(prefix) {
*value = value.strip_prefix(prefix).unwrap().to_string();
}
let role_prefix = format!("{org_id}/");
if value.starts_with(&role_prefix) {
*value = value.strip_prefix(&role_prefix).unwrap().to_string()
}
}
permitted = Some(local_permitted);
}
@@ -128,10 +132,11 @@ pub async fn update_role(
path: web::Path<(String, String)>,
update_role: web::Json<RoleRequest>,
) -> Result<HttpResponse, Error> {
let (_org_id, role_id) = path.into_inner();
let (org_id, role_id) = path.into_inner();
let update_role = update_role.into_inner();
match o2_enterprise::enterprise::openfga::authorizer::roles::update_role(
&org_id,
&role_id,
update_role.add,
update_role.remove,
@@ -295,6 +300,10 @@ pub async fn get_groups(path: web::Path<String>, req: HttpRequest) -> Result<Htt
if value.starts_with(prefix) {
*value = value.strip_prefix(prefix).unwrap().to_string();
}
let group_prefix = format!("{org_id}/");
if value.starts_with(&group_prefix) {
*value = value.strip_prefix(&group_prefix).unwrap().to_string()
}
}
permitted = Some(local_permitted);
}
@@ -316,10 +325,13 @@ pub async fn get_groups(_path: web::Path<String>) -> Result<HttpResponse, Error>
#[cfg(feature = "enterprise")]
#[get("/{org_id}/groups/{group_name}")]
pub async fn get_group_details(path: web::Path<(String, String)>) -> Result<HttpResponse, Error> {
let (_org_id, group_name) = path.into_inner();
let (org_id, group_name) = path.into_inner();
match o2_enterprise::enterprise::openfga::authorizer::groups::get_group_details(&group_name)
.await
match o2_enterprise::enterprise::openfga::authorizer::groups::get_group_details(
&org_id,
&group_name,
)
.await
{
Ok(res) => Ok(HttpResponse::Ok().json(res)),
Err(err) => Ok(HttpResponse::InternalServerError().body(err.to_string())),