mirror of
https://github.com/dani-garcia/vaultwarden.wiki.git
synced 2026-09-17 16:46:22 +03:00
Trusted proxy support, unauthenticated rate limit & other fixes (#7472)
* Trusted proxies, unauthenticated rate limits and various fixes * Fix get_groups_data * Fix get_groups_data when not using full_access * Fmt * Fix org import * deduplicate send validation
This commit is contained in:
@@ -629,6 +629,47 @@ impl Collection {
|
||||
pub async fn is_manageable_by_user(&self, user_uuid: &UserId, conn: &DbConn) -> bool {
|
||||
Self::is_coll_manageable_by_user(&self.uuid, user_uuid, conn).await
|
||||
}
|
||||
|
||||
// Whether the user has manage access to at least one collection in the org, directly or via a
|
||||
// group. Org-scoped counterpart of is_coll_manageable_by_user.
|
||||
pub async fn has_manageable_collection_by_user(
|
||||
org_uuid: &OrganizationId,
|
||||
user_uuid: &UserId,
|
||||
conn: &DbConn,
|
||||
) -> bool {
|
||||
let org_uuid = org_uuid.to_string();
|
||||
let user_uuid = user_uuid.to_string();
|
||||
conn.run(move |conn| {
|
||||
collections::table
|
||||
.left_join(
|
||||
users_collections::table.on(users_collections::collection_uuid
|
||||
.eq(collections::uuid)
|
||||
.and(users_collections::user_uuid.eq(user_uuid.clone()))),
|
||||
)
|
||||
.left_join(
|
||||
users_organizations::table.on(collections::org_uuid
|
||||
.eq(users_organizations::org_uuid)
|
||||
.and(users_organizations::user_uuid.eq(user_uuid))),
|
||||
)
|
||||
.left_join(groups_users::table.on(groups_users::users_organizations_uuid.eq(users_organizations::uuid)))
|
||||
.left_join(
|
||||
collections_groups::table.on(collections_groups::groups_uuid
|
||||
.eq(groups_users::groups_uuid)
|
||||
.and(collections_groups::collections_uuid.eq(collections::uuid))),
|
||||
)
|
||||
.filter(collections::org_uuid.eq(&org_uuid))
|
||||
.filter(
|
||||
// Manage permission on a collection assigned directly or via a group.
|
||||
users_collections::manage.eq(true).or(collections_groups::manage.eq(true)),
|
||||
)
|
||||
.count()
|
||||
.first::<i64>(conn)
|
||||
.ok()
|
||||
.unwrap_or(0)
|
||||
!= 0
|
||||
})
|
||||
.await
|
||||
}
|
||||
}
|
||||
|
||||
/// Database methods
|
||||
|
||||
@@ -271,7 +271,9 @@ impl Group {
|
||||
groups::table
|
||||
.inner_join(groups_users::table.on(groups_users::groups_uuid.eq(groups::uuid)))
|
||||
.inner_join(
|
||||
users_organizations::table.on(users_organizations::uuid.eq(groups_users::users_organizations_uuid)),
|
||||
users_organizations::table.on(users_organizations::uuid
|
||||
.eq(groups_users::users_organizations_uuid)
|
||||
.and(users_organizations::org_uuid.eq(groups::organizations_uuid))),
|
||||
)
|
||||
.filter(users_organizations::user_uuid.eq(user_uuid))
|
||||
.filter(groups::organizations_uuid.eq(org_uuid))
|
||||
|
||||
@@ -231,6 +231,53 @@ impl Send {
|
||||
}
|
||||
}
|
||||
|
||||
/// Registers an access, incrementing `access_count` only while below `max_access_count`.
|
||||
/// Returns false when the limit was already reached. The check and the increment are a single
|
||||
/// statement, otherwise concurrent accesses can both pass the check and exceed the limit.
|
||||
pub async fn register_access(&mut self, conn: &DbConn) -> Result<bool, crate::Error> {
|
||||
self.update_users_revision(conn).await;
|
||||
|
||||
let revision_date = Utc::now().naive_utc();
|
||||
let uuid = self.uuid.clone();
|
||||
let updated = conn
|
||||
.run(move |conn| {
|
||||
diesel::update(sends::table)
|
||||
.filter(sends::uuid.eq(uuid))
|
||||
.filter(
|
||||
sends::max_access_count
|
||||
.is_null()
|
||||
.or(sends::access_count.nullable().lt(sends::max_access_count)),
|
||||
)
|
||||
.set((sends::access_count.eq(sends::access_count + 1), sends::revision_date.eq(revision_date)))
|
||||
.execute(conn)
|
||||
})
|
||||
.await?;
|
||||
|
||||
if updated == 0 {
|
||||
return Ok(false);
|
||||
}
|
||||
|
||||
self.access_count += 1;
|
||||
self.revision_date = revision_date;
|
||||
Ok(true)
|
||||
}
|
||||
|
||||
/// Whether the Send is currently within its validity window: not disabled, not past its
|
||||
/// expiration date, and not past its deletion date. Does not consider `max_access_count`
|
||||
/// (consumed at token issuance) or the password.
|
||||
pub fn is_accessible(&self) -> bool {
|
||||
let now = Utc::now().naive_utc();
|
||||
if self.disabled {
|
||||
return false;
|
||||
}
|
||||
if let Some(expiration) = self.expiration_date
|
||||
&& now >= expiration
|
||||
{
|
||||
return false;
|
||||
}
|
||||
now < self.deletion_date
|
||||
}
|
||||
|
||||
pub async fn delete(&self, conn: &DbConn) -> EmptyResult {
|
||||
self.update_users_revision(conn).await;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user