mirrored/vaultwarden
1
0
Fork 1
Spiegel von https://github.com/dani-garcia/vaultwarden.git synchronisiert 2024-11-22 05:10:29 +01:00
Code Issues Releases Aktivität

Merge pull request #3108 from farodin91/allow-editing/unhiding-by-group

Quellcode durchsuchen 
allow editing/unhiding by group
Dieser Commit ist enthalten in:
Daniel García 2023-02-12 18:47:02 +01:00 committet von GitHub
Commit 6f6d9dee83
Es konnte kein GPG-Schlüssel zu dieser Signatur gefunden werden
GPG-Schlüssel-ID: 4AEE18F83AFDEB23
1 geänderte Dateien mit 86 neuen und 38 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Diff-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

124
src/db/models/collection.rs
Datei anzeigen

@ -287,47 +287,95 @@ impl Collection {
} }
pub async fn is_writable_by_user(&self, user_uuid: &str, conn: &mut DbConn) -> bool { pub async fn is_writable_by_user(&self, user_uuid: &str, conn: &mut DbConn) -> bool {
match UserOrganization::find_by_user_and_org(user_uuid, &self.org_uuid, conn).await { let user_uuid = user_uuid.to_string();
None => false, // Not in Org db_run! { conn: {
Some(user_org) => { collections::table
if user_org.has_full_access() { .left_join(users_collections::table.on(
return true; users_collections::collection_uuid.eq(collections::uuid).and(
} users_collections::user_uuid.eq(user_uuid.clone())
)
db_run! { conn: { ))
users_collections::table .left_join(users_organizations::table.on(
.filter(users_collections::collection_uuid.eq(&self.uuid)) collections::org_uuid.eq(users_organizations::org_uuid).and(
.filter(users_collections::user_uuid.eq(user_uuid)) users_organizations::user_uuid.eq(user_uuid)
.filter(users_collections::read_only.eq(false)) )
.count() ))
.first::<i64>(conn) .left_join(groups_users::table.on(
.ok() groups_users::users_organizations_uuid.eq(users_organizations::uuid)
.unwrap_or(0) != 0 ))
}} .left_join(groups::table.on(
} groups::uuid.eq(groups_users::groups_uuid)
} ))
.left_join(collections_groups::table.on(
collections_groups::groups_uuid.eq(groups_users::groups_uuid).and(
collections_groups::collections_uuid.eq(collections::uuid)
)
))
.filter(collections::uuid.eq(&self.uuid))
.filter(
users_collections::collection_uuid.eq(&self.uuid).and(users_collections::read_only.eq(false)).or(// Directly accessed collection
users_organizations::access_all.eq(true).or( // access_all in Organization
users_organizations::atype.le(UserOrgType::Admin as i32) // Org admin or owner
)).or(
groups::access_all.eq(true) // access_all in groups
).or( // access via groups
groups_users::users_organizations_uuid.eq(users_organizations::uuid).and(
collections_groups::collections_uuid.is_not_null().and(
collections_groups::read_only.eq(false))
)
)
)
.count()
.first::<i64>(conn)
.ok()
.unwrap_or(0) != 0
}}
} }
pub async fn hide_passwords_for_user(&self, user_uuid: &str, conn: &mut DbConn) -> bool { pub async fn hide_passwords_for_user(&self, user_uuid: &str, conn: &mut DbConn) -> bool {
match UserOrganization::find_by_user_and_org(user_uuid, &self.org_uuid, conn).await { let user_uuid = user_uuid.to_string();
None => true, // Not in Org db_run! { conn: {
Some(user_org) => { collections::table
if user_org.has_full_access() { .left_join(users_collections::table.on(
return false; users_collections::collection_uuid.eq(collections::uuid).and(
} users_collections::user_uuid.eq(user_uuid.clone())
)
db_run! { conn: { ))
users_collections::table .left_join(users_organizations::table.on(
.filter(users_collections::collection_uuid.eq(&self.uuid)) collections::org_uuid.eq(users_organizations::org_uuid).and(
.filter(users_collections::user_uuid.eq(user_uuid)) users_organizations::user_uuid.eq(user_uuid)
.filter(users_collections::hide_passwords.eq(true)) )
.count() ))
.first::<i64>(conn) .left_join(groups_users::table.on(
.ok() groups_users::users_organizations_uuid.eq(users_organizations::uuid)
.unwrap_or(0) != 0 ))
}} .left_join(groups::table.on(
} groups::uuid.eq(groups_users::groups_uuid)
} ))
.left_join(collections_groups::table.on(
collections_groups::groups_uuid.eq(groups_users::groups_uuid).and(
collections_groups::collections_uuid.eq(collections::uuid)
)
))
.filter(collections::uuid.eq(&self.uuid))
.filter(
users_collections::collection_uuid.eq(&self.uuid).and(users_collections::hide_passwords.eq(true)).or(// Directly accessed collection
users_organizations::access_all.eq(true).or( // access_all in Organization
users_organizations::atype.le(UserOrgType::Admin as i32) // Org admin or owner
)).or(
groups::access_all.eq(true) // access_all in groups
).or( // access via groups
groups_users::users_organizations_uuid.eq(users_organizations::uuid).and(
collections_groups::collections_uuid.is_not_null().and(
collections_groups::hide_passwords.eq(true))
)
)
)
.count()
.first::<i64>(conn)
.ok()
.unwrap_or(0) != 0
}}
} }
} }