octoleo/vaultwarden
1
0
Fork 0
mirror of https://github.com/dani-garcia/vaultwarden.git synced 2025-02-11 08:18:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix passwordRevisionDate format (#5477)

Browse Source
This commit is contained in:
Mathijs van Veluw 2025-01-27 20:16:59 +01:00 committed by GitHub
parent 1b46c80389
commit c0ebe0d982
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -142,7 +142,7 @@ impl Cipher {
sync_type: CipherSyncType, sync_type: CipherSyncType,
conn: &mut DbConn, conn: &mut DbConn,
) -> Value { ) -> Value {
use crate::util::format_date; use crate::util::{format_date, validate_and_format_date};
let mut attachments_json: Value = Value::Null; let mut attachments_json: Value = Value::Null;
if let Some(cipher_sync_data) = cipher_sync_data { if let Some(cipher_sync_data) = cipher_sync_data {
@ -220,7 +220,7 @@ impl Cipher {
}) })
.map(|mut d| match d.get("lastUsedDate").and_then(|l| l.as_str()) { .map(|mut d| match d.get("lastUsedDate").and_then(|l| l.as_str()) {
Some(l) => { Some(l) => {
d["lastUsedDate"] = json!(crate::util::validate_and_format_date(l)); d["lastUsedDate"] = json!(validate_and_format_date(l));
d d
} }
_ => { _ => {
@ -261,6 +261,11 @@ impl Cipher {
type_data_json["uri"] = uris[0]["uri"].clone(); type_data_json["uri"] = uris[0]["uri"].clone();
} }
} }
// Check if `passwordRevisionDate` is a valid date, else convert it
if let Some(pw_revision) = type_data_json["passwordRevisionDate"].as_str() {
type_data_json["passwordRevisionDate"] = json!(validate_and_format_date(pw_revision));
}
} }
// Fix secure note issues when data is invalid // Fix secure note issues when data is invalid