geforkt von mirrored/vaultwarden
* Password History Support (#155) * down.sql logic not required as per review comments
Dieser Commit ist enthalten in:
Ursprung
b82710eecf
Commit
781056152a
5 geänderte Dateien mit 16 neuen und 0 gelöschten Zeilen
0
migrations/2018-08-27-172114_update_ciphers/down.sql
Normale Datei
0
migrations/2018-08-27-172114_update_ciphers/down.sql
Normale Datei
3
migrations/2018-08-27-172114_update_ciphers/up.sql
Normale Datei
3
migrations/2018-08-27-172114_update_ciphers/up.sql
Normale Datei
|
@ -0,0 +1,3 @@
|
||||||
|
ALTER TABLE ciphers
|
||||||
|
ADD COLUMN
|
||||||
|
password_history TEXT;
|
|
@ -112,6 +112,8 @@ struct CipherData {
|
||||||
Identity: Option<Value>,
|
Identity: Option<Value>,
|
||||||
|
|
||||||
Favorite: Option<bool>,
|
Favorite: Option<bool>,
|
||||||
|
|
||||||
|
PasswordHistory: Option<Value>,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[post("/ciphers/admin", data = "<data>")]
|
#[post("/ciphers/admin", data = "<data>")]
|
||||||
|
@ -177,6 +179,7 @@ fn update_cipher_from_data(cipher: &mut Cipher, data: CipherData, headers: &Head
|
||||||
type_data["Name"] = Value::String(data.Name.clone());
|
type_data["Name"] = Value::String(data.Name.clone());
|
||||||
type_data["Notes"] = data.Notes.clone().map(Value::String).unwrap_or(Value::Null);
|
type_data["Notes"] = data.Notes.clone().map(Value::String).unwrap_or(Value::Null);
|
||||||
type_data["Fields"] = data.Fields.clone().unwrap_or(Value::Null);
|
type_data["Fields"] = data.Fields.clone().unwrap_or(Value::Null);
|
||||||
|
type_data["PasswordHistory"] = data.PasswordHistory.clone().unwrap_or(Value::Null);
|
||||||
// TODO: ******* Backwards compat end **********
|
// TODO: ******* Backwards compat end **********
|
||||||
|
|
||||||
cipher.favorite = data.Favorite.unwrap_or(false);
|
cipher.favorite = data.Favorite.unwrap_or(false);
|
||||||
|
@ -184,6 +187,7 @@ fn update_cipher_from_data(cipher: &mut Cipher, data: CipherData, headers: &Head
|
||||||
cipher.notes = data.Notes;
|
cipher.notes = data.Notes;
|
||||||
cipher.fields = data.Fields.map(|f| f.to_string());
|
cipher.fields = data.Fields.map(|f| f.to_string());
|
||||||
cipher.data = type_data.to_string();
|
cipher.data = type_data.to_string();
|
||||||
|
cipher.password_history = data.PasswordHistory.map(|f| f.to_string());
|
||||||
|
|
||||||
cipher.save(&conn);
|
cipher.save(&conn);
|
||||||
|
|
||||||
|
|
|
@ -32,6 +32,7 @@ pub struct Cipher {
|
||||||
pub data: String,
|
pub data: String,
|
||||||
|
|
||||||
pub favorite: bool,
|
pub favorite: bool,
|
||||||
|
pub password_history: Option<String>,
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Local methods
|
/// Local methods
|
||||||
|
@ -55,6 +56,7 @@ impl Cipher {
|
||||||
fields: None,
|
fields: None,
|
||||||
|
|
||||||
data: String::new(),
|
data: String::new(),
|
||||||
|
password_history: None,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -78,6 +80,10 @@ impl Cipher {
|
||||||
serde_json::from_str(fields).unwrap()
|
serde_json::from_str(fields).unwrap()
|
||||||
} else { JsonValue::Null };
|
} else { JsonValue::Null };
|
||||||
|
|
||||||
|
let password_history_json: JsonValue = if let Some(ref password_history) = self.password_history {
|
||||||
|
serde_json::from_str(password_history).unwrap()
|
||||||
|
} else { JsonValue::Null };
|
||||||
|
|
||||||
let mut data_json: JsonValue = serde_json::from_str(&self.data).unwrap();
|
let mut data_json: JsonValue = serde_json::from_str(&self.data).unwrap();
|
||||||
|
|
||||||
// TODO: ******* Backwards compat start **********
|
// TODO: ******* Backwards compat start **********
|
||||||
|
@ -108,6 +114,8 @@ impl Cipher {
|
||||||
|
|
||||||
"Object": "cipher",
|
"Object": "cipher",
|
||||||
"Edit": true,
|
"Edit": true,
|
||||||
|
|
||||||
|
"PasswordHistory": password_history_json,
|
||||||
});
|
});
|
||||||
|
|
||||||
let key = match self.type_ {
|
let key = match self.type_ {
|
||||||
|
|
|
@ -21,6 +21,7 @@ table! {
|
||||||
fields -> Nullable<Text>,
|
fields -> Nullable<Text>,
|
||||||
data -> Text,
|
data -> Text,
|
||||||
favorite -> Bool,
|
favorite -> Bool,
|
||||||
|
password_history -> Nullable<Text>,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Laden …
In neuem Issue referenzieren