vw_small

Hardened fork of Vaultwarden (https://github.com/dani-garcia/vaultwarden) with fewer features.
git clone https://git.philomathiclife.com/repos/vw_small
Log | Files | Refs | README

commit 86b49856a7a95ae0bab2067b3a19cdca0651ba33
parent 54f54ee8450acec8b3eb1e10532eff101823ac32
Author: Miroslav Prasil <miroslav@prasil.info>
Date:   Mon,  1 Oct 2018 17:50:31 +0100

Handle return value from Collection::save()

Diffstat:
Msrc/api/core/organizations.rs | 27++++++++++++++++++++-------
1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/src/api/core/organizations.rs b/src/api/core/organizations.rs @@ -51,7 +51,9 @@ fn create_organization(headers: Headers, data: JsonUpcase<OrgData>, conn: DbConn org.save(&conn); user_org.save(&conn); - collection.save(&conn); + if collection.save(&conn).is_err() { + err!("Failed creating Collection"); + } Ok(Json(org.to_json())) } @@ -168,7 +170,9 @@ fn post_organization_collections(org_id: String, _headers: AdminHeaders, data: J let mut collection = Collection::new(org.uuid.clone(), data.Name); - collection.save(&conn); + if collection.save(&conn).is_err() { + err!("Failed saving Collection"); + } Ok(Json(collection.to_json())) } @@ -197,7 +201,9 @@ fn post_organization_collection_update(org_id: String, col_id: String, _headers: } collection.name = data.Name.clone(); - collection.save(&conn); + if collection.save(&conn).is_err() { + err!("Failed updating Collection"); + } Ok(Json(collection.to_json())) } @@ -618,8 +624,11 @@ fn post_org_import(query: OrgIdData, data: JsonUpcase<ImportData>, headers: Head // Read and create the collections let collections: Vec<_> = data.Collections.into_iter().map(|coll| { let mut collection = Collection::new(org_id.clone(), coll.Name); - collection.save(&conn); - collection + if collection.save(&conn).is_err() { + err!("Failed to create Collection"); + } + + Ok(collection) }).collect(); // Read the relations between collections and ciphers @@ -638,8 +647,12 @@ fn post_org_import(query: OrgIdData, data: JsonUpcase<ImportData>, headers: Head // Assign the collections for (cipher_index, coll_index) in relations { let cipher_id = &ciphers[cipher_index].uuid; - let coll_id = &collections[coll_index].uuid; - + let coll = &collections[coll_index]; + let coll_id = match coll { + Ok(coll) => coll.uuid.as_str(), + Err(_) => err!("Failed to assign to collection") + }; + CollectionCipher::save(cipher_id, coll_id, &conn); }