mirror of
https://github.com/dani-garcia/vaultwarden.wiki.git
synced 2026-11-13 00:38:36 +02:00
* Fix several scheduled job issues Several jobs could cause a panic, or stop without running through all items because of this panic. This could cause missed items until that panic somehow resolved it self, and probably would never work fully again. This could cause emergency access for example to never work again. Besides this, emergency access was also able to be panic if the wait-time was out-of-bounds and date/time calculation might fail. This is also fixed now by using `checked` functions and continue upon those issues so all awaiting items will be handled. Signed-off-by: BlackDex <black.dex@gmail.com> * Fix several possible panics and overflows Adjust several integer types to be a lower or unsigned type. Most types were too large, only because the function which used this value needed that specific type. But, this allowed too large values which either caused panics or might cause a DoS. This does however might possible cause configurations which have larger values, which are probably way too large anyway to be not loaded or use their defaults. During the config loading, either via env or json, it will show error logs regarding these items. Also fixed an issue with protected actions via OTP, it increased the attempt before it validated if the attempt limit was reached. This could cause an issue when set to `1`, that way it was never allowed, and `3` times would actually be `2`. Also added several config validation checks which otherwise would have prevent Vaultwarden to start, or login, so these will probably not cause issues, else users would already have issues. Signed-off-by: BlackDex <black.dex@gmail.com> * Show config errors on diagnostics page With the previous commits it is now possible to add a warning if their rare issues with loading of the config, either environment variables which we were not able to parse correctly, or if loading the `config.json` failed instead of just showing it wasn't used, while it does exists, which might be confusing. Signed-off-by: BlackDex <black.dex@gmail.com> --------- Signed-off-by: BlackDex <black.dex@gmail.com>
434 lines
14 KiB
Rust
434 lines
14 KiB
Rust
use chrono::{NaiveDateTime, TimeDelta, Utc};
|
|
use derive_more::{AsRef, Deref, Display, From};
|
|
use diesel::prelude::*;
|
|
use serde_json::Value;
|
|
|
|
use crate::{
|
|
api::EmptyResult,
|
|
db::{DbConn, schema::emergency_access},
|
|
error::MapResult,
|
|
};
|
|
use macros::UuidFromParam;
|
|
|
|
use super::{User, UserId};
|
|
|
|
#[derive(Identifiable, Queryable, Insertable, AsChangeset)]
|
|
#[diesel(table_name = emergency_access)]
|
|
#[diesel(treat_none_as_null = true)]
|
|
#[diesel(primary_key(uuid))]
|
|
pub struct EmergencyAccess {
|
|
pub uuid: EmergencyAccessId,
|
|
pub grantor_uuid: UserId,
|
|
pub grantee_uuid: Option<UserId>,
|
|
pub email: Option<String>,
|
|
pub key_encrypted: Option<String>,
|
|
pub atype: i32, //EmergencyAccessType
|
|
pub status: i32, //EmergencyAccessStatus
|
|
pub wait_time_days: i32,
|
|
pub recovery_initiated_at: Option<NaiveDateTime>,
|
|
pub last_notification_at: Option<NaiveDateTime>,
|
|
pub updated_at: NaiveDateTime,
|
|
pub created_at: NaiveDateTime,
|
|
}
|
|
|
|
// Local methods
|
|
impl EmergencyAccess {
|
|
pub fn new(grantor_uuid: UserId, email: String, status: i32, atype: i32, wait_time_days: i32) -> Self {
|
|
let now = Utc::now().naive_utc();
|
|
|
|
Self {
|
|
uuid: EmergencyAccessId(crate::util::get_uuid()),
|
|
grantor_uuid,
|
|
grantee_uuid: None,
|
|
email: Some(email),
|
|
status,
|
|
atype,
|
|
wait_time_days,
|
|
recovery_initiated_at: None,
|
|
created_at: now,
|
|
updated_at: now,
|
|
key_encrypted: None,
|
|
last_notification_at: None,
|
|
}
|
|
}
|
|
|
|
pub fn get_type_as_str(&self) -> &'static str {
|
|
if self.atype == EmergencyAccessType::View as i32 {
|
|
"View"
|
|
} else {
|
|
"Takeover"
|
|
}
|
|
}
|
|
|
|
pub fn to_json(&self) -> Value {
|
|
json!({
|
|
"id": self.uuid,
|
|
"status": self.status,
|
|
"type": self.atype,
|
|
"waitTimeDays": self.wait_time_days,
|
|
"object": "emergencyAccess",
|
|
})
|
|
}
|
|
|
|
pub async fn to_json_grantor_details(&self, conn: &DbConn) -> Value {
|
|
let grantor_user = User::find_by_uuid(&self.grantor_uuid, conn).await.expect("Grantor user not found.");
|
|
|
|
json!({
|
|
"id": self.uuid,
|
|
"status": self.status,
|
|
"type": self.atype,
|
|
"waitTimeDays": self.wait_time_days,
|
|
"grantorId": grantor_user.uuid,
|
|
"email": grantor_user.email,
|
|
"name": grantor_user.name,
|
|
"avatarColor": grantor_user.avatar_color,
|
|
"object": "emergencyAccessGrantorDetails",
|
|
})
|
|
}
|
|
|
|
pub async fn to_json_grantee_details(&self, conn: &DbConn) -> Option<Value> {
|
|
let grantee_user = if let Some(grantee_uuid) = &self.grantee_uuid {
|
|
User::find_by_uuid(grantee_uuid, conn).await.expect("Grantee user not found.")
|
|
} else {
|
|
let email = self.email.as_deref()?;
|
|
if let Some(user) = User::find_by_mail(email, conn).await {
|
|
user
|
|
} else {
|
|
// remove outstanding invitations which should not exist
|
|
Self::delete_all_by_grantee_email(email, conn).await.ok();
|
|
return None;
|
|
}
|
|
};
|
|
|
|
Some(json!({
|
|
"id": self.uuid,
|
|
"status": self.status,
|
|
"type": self.atype,
|
|
"waitTimeDays": self.wait_time_days,
|
|
"granteeId": grantee_user.uuid,
|
|
"email": grantee_user.email,
|
|
"name": grantee_user.name,
|
|
"avatarColor": grantee_user.avatar_color,
|
|
"object": "emergencyAccessGranteeDetails",
|
|
}))
|
|
}
|
|
|
|
pub fn deadline_at(&self) -> Result<NaiveDateTime, crate::Error> {
|
|
if !(EMERGENCY_ACCESS_TIMEOUT_RANGE).contains(&self.wait_time_days) {
|
|
err!("Emergency access wait time is out-of-bounds!")
|
|
}
|
|
|
|
let initiated_at = self.recovery_initiated_at.map_res("Emergency access initiation date missing!")?;
|
|
|
|
TimeDelta::try_days(i64::from(self.wait_time_days))
|
|
.and_then(|w| initiated_at.checked_add_signed(w))
|
|
.map_res("Emergency access deadline is invalid")
|
|
}
|
|
|
|
pub fn is_recovery_allowed(&self, now: &NaiveDateTime) -> Result<bool, crate::Error> {
|
|
Ok(self.deadline_at()?.le(now))
|
|
}
|
|
}
|
|
|
|
pub const EMERGENCY_ACCESS_TIMEOUT_RANGE: std::ops::RangeInclusive<i32> = 1..=90;
|
|
|
|
#[derive(Copy, Clone)]
|
|
pub enum EmergencyAccessType {
|
|
View = 0,
|
|
Takeover = 1,
|
|
}
|
|
|
|
impl EmergencyAccessType {
|
|
pub fn from_str(s: &str) -> Option<Self> {
|
|
match s {
|
|
"0" | "View" => Some(EmergencyAccessType::View),
|
|
"1" | "Takeover" => Some(EmergencyAccessType::Takeover),
|
|
_ => None,
|
|
}
|
|
}
|
|
}
|
|
|
|
pub enum EmergencyAccessStatus {
|
|
Invited = 0,
|
|
Accepted = 1,
|
|
Confirmed = 2,
|
|
RecoveryInitiated = 3,
|
|
RecoveryApproved = 4,
|
|
}
|
|
|
|
// region Database methods
|
|
|
|
impl EmergencyAccess {
|
|
pub async fn save(&mut self, conn: &DbConn) -> EmptyResult {
|
|
User::update_uuid_revision(&self.grantor_uuid, conn).await;
|
|
self.updated_at = Utc::now().naive_utc();
|
|
|
|
db_run! { conn:
|
|
mysql {
|
|
diesel::insert_into(emergency_access::table)
|
|
.values(&*self)
|
|
.on_conflict(diesel::dsl::DuplicatedKeys)
|
|
.do_update()
|
|
.set(&*self)
|
|
.execute(conn)
|
|
.map_res("Error saving emergency access")
|
|
}
|
|
postgresql, sqlite {
|
|
diesel::insert_into(emergency_access::table)
|
|
.values(&*self)
|
|
.on_conflict(emergency_access::uuid)
|
|
.do_update()
|
|
.set(&*self)
|
|
.execute(conn)
|
|
.map_res("Error saving emergency access")
|
|
}
|
|
}
|
|
}
|
|
|
|
pub async fn update_access_status_and_save(
|
|
&mut self,
|
|
from_status: i32,
|
|
to_status: i32,
|
|
date: &NaiveDateTime,
|
|
conn: &DbConn,
|
|
) -> EmptyResult {
|
|
let uuid = self.uuid.clone();
|
|
let updated_at = *date;
|
|
let res = conn
|
|
.run(move |conn| {
|
|
crate::util::retry(
|
|
|| {
|
|
diesel::update(
|
|
emergency_access::table
|
|
.filter(emergency_access::uuid.eq(&uuid))
|
|
.filter(emergency_access::status.eq(from_status)),
|
|
)
|
|
.set((emergency_access::status.eq(to_status), emergency_access::updated_at.eq(updated_at)))
|
|
.execute(conn)
|
|
},
|
|
10,
|
|
)
|
|
})
|
|
.await;
|
|
|
|
match res {
|
|
Ok(1) => {} // One record updated, which is valid
|
|
Ok(_) => err!("Emergency access status was changed already"),
|
|
Err(e) => err!("Error updating emergency access status", format!("{e}")),
|
|
}
|
|
|
|
self.status = to_status;
|
|
self.updated_at = updated_at;
|
|
|
|
// Update the grantee so that it will refresh it's status.
|
|
User::update_uuid_revision(self.grantee_uuid.as_ref().expect("Error getting grantee"), conn).await;
|
|
Ok(())
|
|
}
|
|
|
|
pub async fn update_last_notification_date_and_save(&mut self, date: &NaiveDateTime, conn: &DbConn) -> EmptyResult {
|
|
self.last_notification_at = Some(date.to_owned());
|
|
date.clone_into(&mut self.updated_at);
|
|
|
|
conn.run(move |conn| {
|
|
crate::util::retry(
|
|
|| {
|
|
diesel::update(emergency_access::table.filter(emergency_access::uuid.eq(&self.uuid)))
|
|
.set((emergency_access::last_notification_at.eq(date), emergency_access::updated_at.eq(date)))
|
|
.execute(conn)
|
|
},
|
|
10,
|
|
)
|
|
.map_res("Error updating emergency access status")
|
|
})
|
|
.await
|
|
}
|
|
|
|
pub async fn delete_all_by_user(user_uuid: &UserId, conn: &DbConn) -> EmptyResult {
|
|
for ea in Self::find_all_by_grantor_uuid(user_uuid, conn).await {
|
|
ea.delete(conn).await?;
|
|
}
|
|
for ea in Self::find_all_by_grantee_uuid(user_uuid, conn).await {
|
|
ea.delete(conn).await?;
|
|
}
|
|
Ok(())
|
|
}
|
|
|
|
pub async fn delete_all_by_grantee_email(grantee_email: &str, conn: &DbConn) -> EmptyResult {
|
|
for ea in Self::find_all_invited_by_grantee_email(grantee_email, conn).await {
|
|
ea.delete(conn).await?;
|
|
}
|
|
Ok(())
|
|
}
|
|
|
|
pub async fn delete(self, conn: &DbConn) -> EmptyResult {
|
|
User::update_uuid_revision(&self.grantor_uuid, conn).await;
|
|
|
|
conn.run(move |conn| {
|
|
diesel::delete(emergency_access::table.filter(emergency_access::uuid.eq(self.uuid)))
|
|
.execute(conn)
|
|
.map_res("Error removing user from emergency access")
|
|
})
|
|
.await
|
|
}
|
|
|
|
pub async fn find_by_grantor_uuid_and_grantee_uuid_or_email(
|
|
grantor_uuid: &UserId,
|
|
grantee_uuid: &UserId,
|
|
email: &str,
|
|
conn: &DbConn,
|
|
) -> Option<Self> {
|
|
conn.run(move |conn| {
|
|
emergency_access::table
|
|
.filter(emergency_access::grantor_uuid.eq(grantor_uuid))
|
|
.filter(emergency_access::grantee_uuid.eq(grantee_uuid).or(emergency_access::email.eq(email)))
|
|
.first::<Self>(conn)
|
|
.ok()
|
|
})
|
|
.await
|
|
}
|
|
|
|
pub async fn find_all_recoveries_initiated(conn: &DbConn) -> Vec<Self> {
|
|
conn.run(move |conn| {
|
|
emergency_access::table
|
|
.filter(emergency_access::status.eq(EmergencyAccessStatus::RecoveryInitiated as i32))
|
|
.filter(emergency_access::recovery_initiated_at.is_not_null())
|
|
.load::<Self>(conn)
|
|
.expect("Error loading emergency_access")
|
|
})
|
|
.await
|
|
}
|
|
|
|
pub async fn find_by_uuid_and_grantor_uuid(
|
|
uuid: &EmergencyAccessId,
|
|
grantor_uuid: &UserId,
|
|
conn: &DbConn,
|
|
) -> Option<Self> {
|
|
conn.run(move |conn| {
|
|
emergency_access::table
|
|
.filter(emergency_access::uuid.eq(uuid))
|
|
.filter(emergency_access::grantor_uuid.eq(grantor_uuid))
|
|
.first::<Self>(conn)
|
|
.ok()
|
|
})
|
|
.await
|
|
}
|
|
|
|
pub async fn find_by_uuid_and_grantee_uuid(
|
|
uuid: &EmergencyAccessId,
|
|
grantee_uuid: &UserId,
|
|
conn: &DbConn,
|
|
) -> Option<Self> {
|
|
conn.run(move |conn| {
|
|
emergency_access::table
|
|
.filter(emergency_access::uuid.eq(uuid))
|
|
.filter(emergency_access::grantee_uuid.eq(grantee_uuid))
|
|
.first::<Self>(conn)
|
|
.ok()
|
|
})
|
|
.await
|
|
}
|
|
|
|
pub async fn find_by_uuid_and_grantee_email(
|
|
uuid: &EmergencyAccessId,
|
|
grantee_email: &str,
|
|
conn: &DbConn,
|
|
) -> Option<Self> {
|
|
conn.run(move |conn| {
|
|
emergency_access::table
|
|
.filter(emergency_access::uuid.eq(uuid))
|
|
.filter(emergency_access::email.eq(grantee_email))
|
|
.first::<Self>(conn)
|
|
.ok()
|
|
})
|
|
.await
|
|
}
|
|
|
|
pub async fn find_all_by_grantee_uuid(grantee_uuid: &UserId, conn: &DbConn) -> Vec<Self> {
|
|
conn.run(move |conn| {
|
|
emergency_access::table
|
|
.filter(emergency_access::grantee_uuid.eq(grantee_uuid))
|
|
.load::<Self>(conn)
|
|
.expect("Error loading emergency_access")
|
|
})
|
|
.await
|
|
}
|
|
|
|
pub async fn find_invited_by_grantee_email(grantee_email: &str, conn: &DbConn) -> Option<Self> {
|
|
conn.run(move |conn| {
|
|
emergency_access::table
|
|
.filter(emergency_access::email.eq(grantee_email))
|
|
.filter(emergency_access::status.eq(EmergencyAccessStatus::Invited as i32))
|
|
.first::<Self>(conn)
|
|
.ok()
|
|
})
|
|
.await
|
|
}
|
|
|
|
pub async fn find_all_invited_by_grantee_email(grantee_email: &str, conn: &DbConn) -> Vec<Self> {
|
|
conn.run(move |conn| {
|
|
emergency_access::table
|
|
.filter(emergency_access::email.eq(grantee_email))
|
|
.filter(emergency_access::status.eq(EmergencyAccessStatus::Invited as i32))
|
|
.load::<Self>(conn)
|
|
.expect("Error loading emergency_access")
|
|
})
|
|
.await
|
|
}
|
|
|
|
pub async fn find_all_by_grantor_uuid(grantor_uuid: &UserId, conn: &DbConn) -> Vec<Self> {
|
|
conn.run(move |conn| {
|
|
emergency_access::table
|
|
.filter(emergency_access::grantor_uuid.eq(grantor_uuid))
|
|
.load::<Self>(conn)
|
|
.expect("Error loading emergency_access")
|
|
})
|
|
.await
|
|
}
|
|
|
|
pub async fn find_all_confirmed_by_grantor_uuid(grantor_uuid: &UserId, conn: &DbConn) -> Vec<Self> {
|
|
conn.run(move |conn| {
|
|
emergency_access::table
|
|
.filter(emergency_access::grantor_uuid.eq(grantor_uuid))
|
|
.filter(emergency_access::status.ge(EmergencyAccessStatus::Confirmed as i32))
|
|
.load::<Self>(conn)
|
|
.expect("Error loading emergency_access")
|
|
})
|
|
.await
|
|
}
|
|
|
|
pub async fn accept_invite(&mut self, grantee_uuid: &UserId, grantee_email: &str, conn: &DbConn) -> EmptyResult {
|
|
if self.email.is_none() || self.email.as_ref().unwrap() != grantee_email {
|
|
err!("User email does not match invite.");
|
|
}
|
|
|
|
if self.status == EmergencyAccessStatus::Accepted as i32 {
|
|
err!("Emergency contact already accepted.");
|
|
}
|
|
|
|
self.status = EmergencyAccessStatus::Accepted as i32;
|
|
self.grantee_uuid = Some(grantee_uuid.clone());
|
|
self.email = None;
|
|
self.save(conn).await
|
|
}
|
|
}
|
|
|
|
// endregion
|
|
|
|
#[derive(
|
|
Clone,
|
|
Debug,
|
|
AsRef,
|
|
Deref,
|
|
DieselNewType,
|
|
Display,
|
|
From,
|
|
FromForm,
|
|
Hash,
|
|
PartialEq,
|
|
Eq,
|
|
Serialize,
|
|
Deserialize,
|
|
UuidFromParam,
|
|
)]
|
|
pub struct EmergencyAccessId(String);
|