saltyming/vaultwarden
1
0
Fork 0
mirror of https://github.com/dani-garcia/vaultwarden.git synced 2025-08-02 00:59:08 +00:00
Code Activity

fix(groups): renaming and optimizations

Browse source
This commit is contained in:
matlink 2024-01-01 20:26:12 +01:00 • committed by Matlink
commit 704d9bde1e
2 changed files with 14 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/api/core/organizations.rs
View file

@ -322,7 +322,13 @@ async fn get_org_collections_details(org_id: &str, headers: ManagerHeadersLoose,
let coll_users = CollectionUser::find_by_organization(org_id, &mut conn).await;
// uuids of users in groups having access to all collections
let all_access_group_uuids = GroupUser::get_all_access_group_users_uuid(org_id, &mut conn).await;
let has_full_access_via_group = if CONFIG.org_groups_enabled() {
GroupUser::get_members_of_full_access_groups(org_id, &mut conn).await
} else {
vec![]
};
let has_full_access = user_org.access_all || has_full_access_via_group.contains(&user_org.uuid);
for col in Collection::find_by_organization(org_id, &mut conn).await {
let groups: Vec<Value> = if CONFIG.org_groups_enabled() {
@ -340,9 +346,9 @@ async fn get_org_collections_details(org_id: &str, headers: ManagerHeadersLoose,
};
// uuids of users belonging to a group of this collection
let group_users = GroupUser::get_collection_group_users_uuid(&col.uuid, &mut conn).await;
let has_collection_access_via_group = GroupUser::get_group_members_for_collection(&col.uuid, &mut conn).await;
let mut assigned = false;
let mut assigned = has_full_access;
let users: Vec<Value> = coll_users
.iter()
.filter(|collection_user| collection_user.collection_uuid == col.uuid)
@ -359,12 +365,7 @@ async fn get_org_collections_details(org_id: &str, headers: ManagerHeadersLoose,
// if current user is in any collection-assigned group
// or in a group having access to all collections
// or itself has access to all collections
if group_users.contains(&user_org.uuid)
|| all_access_group_uuids.contains(&user_org.uuid)
|| user_org.access_all
{
assigned = true;
}
assigned = !assigned && has_collection_access_via_group.contains(&user_org.uuid);
let mut json_object = col.to_json();
json_object["Assigned"] = json!(assigned);

8
src/db/models/group.rs
View file

@ -1,5 +1,3 @@
use std::collections::HashSet;
use chrono::{NaiveDateTime, Utc};
use serde_json::Value;
@ -488,7 +486,7 @@ impl GroupUser {
}}
}
pub async fn get_collection_group_users_uuid(collection_uuid: &str, conn: &mut DbConn) -> HashSet<String> {
pub async fn get_group_members_for_collection(collection_uuid: &str, conn: &mut DbConn) -> Vec<String> {
db_run! { conn: {
groups_users::table
.inner_join(collections_groups::table.on(
@ -496,6 +494,7 @@ impl GroupUser {
))
.filter(collections_groups::collections_uuid.eq(collection_uuid))
.select(groups_users::users_organizations_uuid)
.distinct()
.load::<String>(conn)
.expect("Error loading group users for collection")
}}
@ -503,7 +502,7 @@ impl GroupUser {
.collect()
}
pub async fn get_all_access_group_users_uuid(org_uuid: &str, conn: &mut DbConn) -> HashSet<String> {
pub async fn get_members_of_full_access_groups(org_uuid: &str, conn: &mut DbConn) -> Vec<String> {
db_run! { conn: {
groups_users::table
.inner_join(groups::table.on(
@ -512,6 +511,7 @@ impl GroupUser {
.filter(groups::organizations_uuid.eq(org_uuid))
.filter(groups::access_all.eq(true))
.select(groups_users::users_organizations_uuid)
.distinct()
.load::<String>(conn)
.expect("Error loading all access group users for organization")
}}