nickslowinski/vaultwarden-test
1
0
Fork 0
geforkt von mirrored/vaultwarden
Code Pull-Requests Aktivität

Clean up the share_collection handling

Quellcode durchsuchen
Dieser Commit ist enthalten in:
Miroslav Prasil 2018-10-01 15:59:10 +01:00
Ursprung 9eaa9c1a17
Commit fb4e6bab14
1 geänderte Dateien mit 3 neuen und 7 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Diff-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

10
src/api/core/ciphers.rs
Datei anzeigen

@ -430,16 +430,12 @@ fn share_cipher_by_uuid(uuid: &str, data: ShareCipherData, headers: &Headers, co
Some(organization_uuid) => { Some(organization_uuid) => {
let mut shared_to_collection = false; let mut shared_to_collection = false;
for uuid in &data.CollectionIds { for uuid in &data.CollectionIds {
match Collection::find_by_uuid(uuid, &conn) { match Collection::find_by_uuid_and_org(uuid, &organization_uuid, &conn) {
None => err!("Invalid collection ID provided"), None => err!("Invalid collection ID provided"),
Some(collection) => { Some(collection) => {
if collection.is_writable_by_user(&headers.user.uuid, &conn) { if collection.is_writable_by_user(&headers.user.uuid, &conn) {
if collection.org_uuid == organization_uuid { CollectionCipher::save(&cipher.uuid.clone(), &collection.uuid, &conn);
CollectionCipher::save(&cipher.uuid.clone(), &collection.uuid, &conn); shared_to_collection = true;
shared_to_collection = true;
} else {
err!("Collection does not belong to organization")
}
} else { } else {
err!("No rights to modify the collection") err!("No rights to modify the collection")
} }