|
|
@ -1885,7 +1885,7 @@ async fn post_sstamp(data: Json<PasswordOrOtpData>, headers: Headers, conn: DbCo |
|
|
let data: PasswordOrOtpData = data.into_inner(); |
|
|
let data: PasswordOrOtpData = data.into_inner(); |
|
|
let mut user = headers.user; |
|
|
let mut user = headers.user; |
|
|
|
|
|
|
|
|
data.validate(&user, true, &conn).await?; |
|
|
data.validate(&mut user, true, &conn).await?; |
|
|
|
|
|
|
|
|
user.reset_security_stamp(&conn).await?; |
|
|
user.reset_security_stamp(&conn).await?; |
|
|
let save_result = user.save(&conn).await; |
|
|
let save_result = user.save(&conn).await; |
|
|
@ -2143,9 +2143,9 @@ async fn post_delete_account( |
|
|
#[delete("/accounts", data = "<data>")] |
|
|
#[delete("/accounts", data = "<data>")] |
|
|
async fn delete_account(data: Json<PasswordOrOtpData>, headers: Headers, conn: DbConn, nt: Notify<'_>) -> EmptyResult { |
|
|
async fn delete_account(data: Json<PasswordOrOtpData>, headers: Headers, conn: DbConn, nt: Notify<'_>) -> EmptyResult { |
|
|
let data: PasswordOrOtpData = data.into_inner(); |
|
|
let data: PasswordOrOtpData = data.into_inner(); |
|
|
let user = headers.user; |
|
|
let mut user = headers.user; |
|
|
|
|
|
|
|
|
data.validate(&user, true, &conn).await?; |
|
|
data.validate(&mut user, true, &conn).await?; |
|
|
|
|
|
|
|
|
// The devices are deleted together with the user, so check for push devices beforehand
|
|
|
// The devices are deleted together with the user, so check for push devices beforehand
|
|
|
let has_push_device = CONFIG.push_enabled() && Device::check_user_has_push_device(&user.uuid, &conn).await; |
|
|
let has_push_device = CONFIG.push_enabled() && Device::check_user_has_push_device(&user.uuid, &conn).await; |
|
|
@ -2271,19 +2271,6 @@ struct SecretVerificationRequest { |
|
|
master_password_hash: String, |
|
|
master_password_hash: String, |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
// Change the KDF Iterations if necessary
|
|
|
|
|
|
pub async fn kdf_upgrade(user: &mut User, pwd_hash: &str, conn: &DbConn) -> ApiResult<()> { |
|
|
|
|
|
if user.password_iterations < CONFIG.password_iterations() { |
|
|
|
|
|
user.password_iterations = CONFIG.password_iterations(); |
|
|
|
|
|
user.set_password(pwd_hash, None, false, None, conn).await?; |
|
|
|
|
|
|
|
|
|
|
|
if let Err(e) = user.save(conn).await { |
|
|
|
|
|
error!("Error updating user: {e:#?}"); |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
Ok(()) |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
#[post("/accounts/verify-password", data = "<data>")] |
|
|
#[post("/accounts/verify-password", data = "<data>")] |
|
|
async fn verify_password(data: Json<SecretVerificationRequest>, headers: Headers, conn: DbConn) -> JsonResult { |
|
|
async fn verify_password(data: Json<SecretVerificationRequest>, headers: Headers, conn: DbConn) -> JsonResult { |
|
|
let data: SecretVerificationRequest = data.into_inner(); |
|
|
let data: SecretVerificationRequest = data.into_inner(); |
|
|
@ -2293,7 +2280,7 @@ async fn verify_password(data: Json<SecretVerificationRequest>, headers: Headers |
|
|
err!("Invalid password") |
|
|
err!("Invalid password") |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
kdf_upgrade(&mut user, &data.master_password_hash, &conn).await?; |
|
|
user.check_persist_kdf_upgrade(&data.master_password_hash, &conn).await?; |
|
|
|
|
|
|
|
|
Ok(Json(master_password_policy(&user, &conn).await)) |
|
|
Ok(Json(master_password_policy(&user, &conn).await)) |
|
|
} |
|
|
} |
|
|
@ -2302,7 +2289,7 @@ async fn update_api_key(data: Json<PasswordOrOtpData>, rotate: bool, headers: He |
|
|
let data: PasswordOrOtpData = data.into_inner(); |
|
|
let data: PasswordOrOtpData = data.into_inner(); |
|
|
let mut user = headers.user; |
|
|
let mut user = headers.user; |
|
|
|
|
|
|
|
|
data.validate(&user, true, &conn).await?; |
|
|
data.validate(&mut user, true, &conn).await?; |
|
|
|
|
|
|
|
|
if rotate || user.api_key.is_none() { |
|
|
if rotate || user.api_key.is_none() { |
|
|
user.api_key = Some(crypto::generate_api_key()); |
|
|
user.api_key = Some(crypto::generate_api_key()); |
|
|
|