octoleo/vaultwarden
1
0
Fork 0
mirror of https://github.com/dani-garcia/vaultwarden.git synced 2024-11-11 00:00:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1219 from aveao/master

Browse Source 
Ensure that a user is actually in an org when applying policies
This commit is contained in:
Daniel García 2020-11-07 23:29:12 +01:00 committed by GitHub
commit e25fc7083d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/db/models/org_policy.rs
View File

@ -4,7 +4,7 @@ use crate::api::EmptyResult;
use crate::db::DbConn; use crate::db::DbConn;
use crate::error::MapResult; use crate::error::MapResult;
use super::Organization; use super::{Organization, UserOrgStatus};
db_object! { db_object! {
#[derive(Debug, Identifiable, Queryable, Insertable, Associations, AsChangeset)] #[derive(Debug, Identifiable, Queryable, Insertable, Associations, AsChangeset)]
@ -134,6 +134,9 @@ impl OrgPolicy {
users_organizations::org_uuid.eq(org_policies::org_uuid) users_organizations::org_uuid.eq(org_policies::org_uuid)
.and(users_organizations::user_uuid.eq(user_uuid))) .and(users_organizations::user_uuid.eq(user_uuid)))
) )
.filter(
users_organizations::status.eq(UserOrgStatus::Confirmed as i32)
)
.select(org_policies::all_columns) .select(org_policies::all_columns)
.load::<OrgPolicyDb>(conn) .load::<OrgPolicyDb>(conn)
.expect("Error loading org_policy") .expect("Error loading org_policy")