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 54f54ee8450acec8b3eb1e10532eff101823ac32
parent 015bd28cc2d39f38e8533d21ffa344887eed72a3
Author: Miroslav Prasil <miroslav@prasil.info>
Date:   Mon,  1 Oct 2018 16:52:36 +0100

Update revision for users on collection save

Diffstat:
Msrc/db/models/collection.rs | 19++++++++++++-------
Msrc/db/models/organization.rs | 16++++++++++++++++
2 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/src/db/models/collection.rs b/src/db/models/collection.rs @@ -42,13 +42,18 @@ use db::schema::*; /// Database methods impl Collection { - pub fn save(&mut self, conn: &DbConn) -> bool { - match diesel::replace_into(collections::table) - .values(&*self) - .execute(&**conn) { - Ok(1) => true, // One row inserted - _ => false, - } + pub fn save(&mut self, conn: &DbConn) -> QueryResult<()> { + // Update affected users revision + UserOrganization::find_by_collection_and_org(&self.uuid, &self.org_uuid, conn) + .iter() + .for_each(|user_org| { + User::update_uuid_revision(&user_org.user_uuid, conn); + }); + + diesel::replace_into(collections::table) + .values(&*self) + .execute(&**conn) + .and(Ok(())) } pub fn delete(self, conn: &DbConn) -> QueryResult<()> { diff --git a/src/db/models/organization.rs b/src/db/models/organization.rs @@ -331,6 +331,22 @@ impl UserOrganization { .select(users_organizations::all_columns) .load::<Self>(&**conn).expect("Error loading user organizations") } + + pub fn find_by_collection_and_org(collection_uuid: &str, org_uuid: &str, conn: &DbConn) -> Vec<Self> { + users_organizations::table + .filter(users_organizations::org_uuid.eq(org_uuid)) + .left_join(users_collections::table.on( + users_collections::user_uuid.eq(users_organizations::user_uuid) + )) + .filter( + users_organizations::access_all.eq(true).or( // AccessAll.. + users_collections::collection_uuid.eq(&collection_uuid) // ..or access to collection with cipher + ) + ) + .select(users_organizations::all_columns) + .load::<Self>(&**conn).expect("Error loading user organizations") + } + }