mirror of
https://github.com/dani-garcia/vaultwarden.wiki.git
synced 2026-10-26 12:06:49 +02:00
Require confirmed membership for user access checks, not for admin views (#7763)
This commit is contained in:
1 parent
d2660324e6
commit
32098ca7d1
6 files changed
+68
-76
No files matched your search
@@ -2180,8 +2180,15 @@ impl CipherSyncData {
|
||||
}
|
||||
}
|
||||
|
||||
// Generate a HashMap with the Organization UUID as key and the Membership record
|
||||
let members: HashMap<OrganizationId, Membership> = Membership::find_confirmed_by_user(user_id, conn)
|
||||
.await
|
||||
.into_iter()
|
||||
.map(|m| (m.org_uuid.clone(), m))
|
||||
.collect();
|
||||
|
||||
// Generate a list of Cipher UUID's containing a Vec with one or more Attachment records
|
||||
let orgs = Membership::get_orgs_by_user(user_id, conn).await;
|
||||
let orgs: Vec<OrganizationId> = members.keys().cloned().collect();
|
||||
let attachments = Attachment::find_all_by_user_and_orgs(user_id, &orgs, conn).await;
|
||||
let mut cipher_attachments: HashMap<CipherId, Vec<Attachment>> = HashMap::with_capacity(attachments.len());
|
||||
for attachment in attachments {
|
||||
@@ -2196,13 +2203,6 @@ impl CipherSyncData {
|
||||
cipher_collections.entry(cipher).or_default().push(collection);
|
||||
}
|
||||
|
||||
// Generate a HashMap with the Organization UUID as key and the Membership record
|
||||
let members: HashMap<OrganizationId, Membership> = Membership::find_confirmed_by_user(user_id, conn)
|
||||
.await
|
||||
.into_iter()
|
||||
.map(|m| (m.org_uuid.clone(), m))
|
||||
.collect();
|
||||
|
||||
// Generate a HashMap with the User_Collections UUID as key and the CollectionUser record
|
||||
let user_collections: HashMap<CollectionId, CollectionUser> = CollectionUser::find_by_user(user_id, conn)
|
||||
.await
|
||||
|
||||
Reference in new issue
Block a user