MyFavMirrors
/
vaultwarden
mirror of https://github.com/dani-garcia/vaultwarden.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix encrypted lastUsedDate (#4972) 

It appears that some password histories have an encrypted value on the `lastUsedDate`
Instead of only checking if it is a string, also check if it is a valid RFC Date/Time String.
If not, set it also to epoch 0.

Signed-off-by: BlackDex <black.dex@gmail.com>
This commit is contained in:
Mathijs van Veluw 2024-09-20 20:38:42 +02:00 committed by GitHub
parent de01111082
commit 7d6dec6413
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/db/models/cipher.rs
View File

@ -1,6 +1,6 @@
use crate::util::LowerCase; use crate::util::LowerCase;
use crate::CONFIG; use crate::CONFIG;
use chrono::{NaiveDateTime, TimeDelta, Utc}; use chrono::{DateTime, NaiveDateTime, TimeDelta, Utc};
use serde_json::Value; use serde_json::Value;
use super::{ use super::{
@ -190,14 +190,14 @@ impl Cipher {
.map(|d| { .map(|d| {
// Check every password history item if they are valid and return it. // Check every password history item if they are valid and return it.
// If a password field has the type `null` skip it, it breaks newer Bitwarden clients // If a password field has the type `null` skip it, it breaks newer Bitwarden clients
// A second check is done to verify the lastUsedDate exists and is a string, if not the epoch start time will be used // A second check is done to verify the lastUsedDate exists and is a valid DateTime string, if not the epoch start time will be used
d.into_iter() d.into_iter()
.filter_map(|d| match d.data.get("password") { .filter_map(|d| match d.data.get("password") {
Some(p) if p.is_string() => Some(d.data), Some(p) if p.is_string() => Some(d.data),
_ => None, _ => None,
}) })
.map(|d| match d.get("lastUsedDate") { .map(|d| match d.get("lastUsedDate").and_then(|l| l.as_str()) {
Some(l) if l.is_string() => d, Some(l) if DateTime::parse_from_rfc3339(l).is_ok() => d,
_ => { _ => {
let mut d = d; let mut d = d;
d["lastUsedDate"] = json!("1970-01-01T00:00:00.000Z"); d["lastUsedDate"] = json!("1970-01-01T00:00:00.000Z");