mirror of
https://github.com/dani-garcia/vaultwarden.git
synced 2025-08-04 18:19:08 +00:00
Compare commits
No commits in common. "548db625615175df8030968212dae617fb20e969" and "f819e6c728dcbf9a3a27fb603c76e8ea7697953d" have entirely different histories.
548db62561
...
f819e6c728
2 changed files with 2 additions and 12 deletions
|
@ -1253,19 +1253,11 @@ async fn put_auth_request(
|
|||
err!("AuthRequest doesn't exist", "User uuid's do not match")
|
||||
}
|
||||
|
||||
if auth_request.approved.is_some() {
|
||||
err!("An authentication request with the same device already exists")
|
||||
}
|
||||
|
||||
let response_date = Utc::now().naive_utc();
|
||||
let response_date_utc = format_date(&response_date);
|
||||
|
||||
if data.request_approved {
|
||||
auth_request.approved = Some(data.request_approved);
|
||||
auth_request.enc_key = Some(data.key);
|
||||
auth_request.master_password_hash = data.master_password_hash;
|
||||
auth_request.response_device_id = Some(data.device_identifier.clone());
|
||||
auth_request.response_date = Some(response_date);
|
||||
auth_request.save(&mut conn).await?;
|
||||
|
||||
ant.send_auth_response(&auth_request.user_uuid, &auth_request.uuid).await;
|
||||
|
@ -1275,6 +1267,8 @@ async fn put_auth_request(
|
|||
auth_request.delete(&mut conn).await?;
|
||||
}
|
||||
|
||||
let response_date_utc = auth_request.response_date.map(|response_date| format_date(&response_date));
|
||||
|
||||
Ok(Json(json!({
|
||||
"id": uuid,
|
||||
"publicKey": auth_request.public_key,
|
||||
|
|
|
@ -190,12 +190,8 @@ async fn _password_login(
|
|||
)
|
||||
};
|
||||
|
||||
let expiration_time = auth_request.creation_date + chrono::Duration::minutes(5);
|
||||
let request_expired = Utc::now().naive_utc() >= expiration_time;
|
||||
|
||||
if auth_request.user_uuid != user.uuid
|
||||
|| !auth_request.approved.unwrap_or(false)
|
||||
|| request_expired
|
||||
|| ip.ip.to_string() != auth_request.request_ip
|
||||
|| !auth_request.check_access_code(password)
|
||||
{
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue