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 9273c38b69fd36f4b166532624c108b6120e64f0
parent e2a065cb09e00e69e6bb91c4981636b68fc56e0f
Author: Daniel GarcĂ­a <dani-garcia@users.noreply.github.com>
Date:   Sat, 19 May 2018 21:58:10 +0200

Merge pull request #22 from mprasil/delete_collection

Implement deleting collections
Diffstat:
Msrc/api/core/mod.rs | 1+
Msrc/api/core/organizations.rs | 39++++++++++++++++++++++++++++++++++-----
Msrc/db/models/collection.rs | 32+++++++++++++++++++++++---------
Msrc/db/models/mod.rs | 2+-
Msrc/db/models/organization.rs | 4++--
5 files changed, 61 insertions(+), 17 deletions(-)

diff --git a/src/api/core/mod.rs b/src/api/core/mod.rs @@ -68,6 +68,7 @@ pub fn routes() -> Vec<Route> { post_organization, post_organization_collections, post_organization_collection_update, + post_organization_collection_delete, post_collections_admin, get_org_details, get_org_users, diff --git a/src/api/core/organizations.rs b/src/api/core/organizations.rs @@ -150,7 +150,7 @@ fn post_organization_collections(org_id: String, headers: Headers, data: Json<Ne collection.save(&conn); if !org_user.access_all { - CollectionUsers::save(&headers.user.uuid, &collection.uuid, false, &conn); + CollectionUser::save(&headers.user.uuid, &collection.uuid, false, &conn); } Ok(Json(collection.to_json())) @@ -183,6 +183,35 @@ fn post_organization_collection_update(org_id: String, col_id: String, headers: Ok(Json(collection.to_json())) } +#[derive(Deserialize, Debug)] +#[allow(non_snake_case)] +struct DeleteCollectionData { + id: String, + orgId: String, +} + +#[post("/organizations/<org_id>/collections/<col_id>/delete", data = "<data>")] +fn post_organization_collection_delete(org_id: String, col_id: String, headers: Headers, data: Json<DeleteCollectionData>, conn: DbConn) -> EmptyResult { + match UserOrganization::find_by_user_and_org(&headers.user.uuid, &org_id, &conn) { + None => err!("Not a member of Organization"), + Some(user_org) => if user_org.has_full_access() { + match Collection::find_by_uuid(&col_id, &conn) { + None => err!("Collection not found"), + Some(collection) => if collection.org_uuid == org_id { + match collection.delete(&conn) { + Ok(()) => Ok(()), + Err(_) => err!("Failed deleting collection") + } + } else { + err!("Collection and Organization id do not match") + } + } + } else { + err!("Not enought rights to delete Collection") + } + } +} + #[get("/organizations/<org_id>/collections/<coll_id>/details")] fn get_org_collection_detail(org_id: String, coll_id: String, headers: Headers, conn: DbConn) -> JsonResult { match Collection::find_by_uuid_and_user(&coll_id, &headers.user.uuid, &conn) { @@ -309,7 +338,7 @@ fn send_invite(org_id: String, data: Json<InviteData>, headers: Headers, conn: D if !data.accessAll { for collection in data.collections.iter() { // TODO: Check that collection is in org - CollectionUsers::save(&headers.user.uuid, &collection.id, collection.readOnly, &conn); + CollectionUser::save(&headers.user.uuid, &collection.id, collection.readOnly, &conn); } } @@ -435,14 +464,14 @@ fn edit_user(org_id: String, user_id: String, data: Json<EditUserData>, headers: // Delete all the odd collections for c in Collection::find_by_organization_and_user_uuid(&org_id, &user_to_edit.user_uuid, &conn) { - CollectionUsers::delete(&user_to_edit.user_uuid, &c.uuid, &conn); + CollectionUser::delete(&user_to_edit.user_uuid, &c.uuid, &conn); } // If no accessAll, add the collections received if !data.accessAll { for collection in data.collections.iter() { // TODO: Check that collection is in org - CollectionUsers::save(&user_to_edit.user_uuid, &collection.id, collection.readOnly, &conn); + CollectionUser::save(&user_to_edit.user_uuid, &collection.id, collection.readOnly, &conn); } } @@ -487,7 +516,7 @@ fn delete_user(org_id: String, user_id: String, headers: Headers, conn: DbConn) user_to_delete.delete(&conn); for c in Collection::find_by_organization_and_user_uuid(&org_id, &current_user.uuid, &conn) { - CollectionUsers::delete(&current_user.uuid, &c.uuid, &conn); + CollectionUser::delete(&current_user.uuid, &c.uuid, &conn); } Ok(()) diff --git a/src/db/models/collection.rs b/src/db/models/collection.rs @@ -51,13 +51,15 @@ impl Collection { } } - pub fn delete(self, conn: &DbConn) -> bool { - match diesel::delete(collections::table.filter( - collections::uuid.eq(self.uuid))) - .execute(&**conn) { - Ok(1) => true, // One row deleted - _ => false, - } + pub fn delete(self, conn: &DbConn) -> QueryResult<()> { + CollectionCipher::delete_all_by_collection(&self.uuid, &conn)?; + CollectionUser::delete_all_by_collection(&self.uuid, &conn)?; + + diesel::delete( + collections::table.filter( + collections::uuid.eq(self.uuid) + ) + ).execute(&**conn).and(Ok(())) } pub fn find_by_uuid(uuid: &str, conn: &DbConn) -> Option<Self> { @@ -130,14 +132,14 @@ use super::User; #[belongs_to(User, foreign_key = "user_uuid")] #[belongs_to(Collection, foreign_key = "collection_uuid")] #[primary_key(user_uuid, collection_uuid)] -pub struct CollectionUsers { +pub struct CollectionUser { pub user_uuid: String, pub collection_uuid: String, pub read_only: bool, } /// Database methods -impl CollectionUsers { +impl CollectionUser { pub fn find_by_organization_and_user_uuid(org_uuid: &str, user_uuid: &str, conn: &DbConn) -> Vec<Self> { users_collections::table .filter(users_collections::user_uuid.eq(user_uuid)) @@ -168,6 +170,12 @@ impl CollectionUsers { _ => false, } } + + pub fn delete_all_by_collection(collection_uuid: &str, conn: &DbConn) -> QueryResult<()> { + diesel::delete(users_collections::table + .filter(users_collections::collection_uuid.eq(collection_uuid)) + ).execute(&**conn).and(Ok(())) + } } use super::Cipher; @@ -210,4 +218,10 @@ impl CollectionCipher { .filter(ciphers_collections::cipher_uuid.eq(cipher_uuid)) ).execute(&**conn).and(Ok(())) } + + pub fn delete_all_by_collection(collection_uuid: &str, conn: &DbConn) -> QueryResult<()> { + diesel::delete(ciphers_collections::table + .filter(ciphers_collections::collection_uuid.eq(collection_uuid)) + ).execute(&**conn).and(Ok(())) + } } \ No newline at end of file diff --git a/src/db/models/mod.rs b/src/db/models/mod.rs @@ -14,4 +14,4 @@ pub use self::folder::{Folder, FolderCipher}; pub use self::user::User; pub use self::organization::Organization; pub use self::organization::{UserOrganization, UserOrgStatus, UserOrgType}; -pub use self::collection::{Collection, CollectionUsers, CollectionCipher}; +pub use self::collection::{Collection, CollectionUser, CollectionCipher}; diff --git a/src/db/models/organization.rs b/src/db/models/organization.rs @@ -188,8 +188,8 @@ impl UserOrganization { let coll_uuids = if self.access_all { vec![] // If we have complete access, no need to fill the array } else { - use super::CollectionUsers; - let collections = CollectionUsers::find_by_organization_and_user_uuid(&self.org_uuid, &self.user_uuid, conn); + use super::CollectionUser; + let collections = CollectionUser::find_by_organization_and_user_uuid(&self.org_uuid, &self.user_uuid, conn); collections.iter().map(|c| json!({"Id": c.collection_uuid, "ReadOnly": c.read_only})).collect() };