Browse Source

Fix Pw History null dates (#4966)

It seemed to have been possible to have `null` date values.
This PR fixes this by setting the epoch start date if either the date does not exists or is not a string.

This should solve sync issues with the new native mobile clients.

Fixes https://github.com/dani-garcia/vaultwarden/pull/4932#issuecomment-2357581292

Signed-off-by: BlackDex <black.dex@gmail.com>
pull/4968/head
Mathijs van Veluw 2 weeks ago
committed by GitHub
parent
commit
1bf85201e7
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
  1. 9
      src/db/models/cipher.rs

9
src/db/models/cipher.rs

@ -190,11 +190,20 @@ impl Cipher {
.map(|d| {
// 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
// A second check is done to verify the lastUsedDate exists and is a string, if not the epoch start time will be used
d.into_iter()
.filter_map(|d| match d.data.get("password") {
Some(p) if p.is_string() => Some(d.data),
_ => None,
})
.map(|d| match d.get("lastUsedDate") {
Some(l) if l.is_string() => d,
_ => {
let mut d = d;
d["lastUsedDate"] = json!("1970-01-01T00:00:00.000Z");
d
}
})
.collect()
})
.unwrap_or_default();

Loading…
Cancel
Save