Spiegel von
https://github.com/dani-garcia/vaultwarden.git
synchronisiert 2024-11-26 05:50:29 +01:00
Return default prelogin values when the user doesn't exist
Dieser Commit ist enthalten in:
Ursprung
8651df8c2a
Commit
b75ba216d1
1 geänderte Dateien mit 13 neuen und 11 gelöschten Zeilen
|
@ -320,20 +320,22 @@ struct PreloginData {
|
||||||
fn prelogin(data: JsonUpcase<PreloginData>, conn: DbConn) -> JsonResult {
|
fn prelogin(data: JsonUpcase<PreloginData>, conn: DbConn) -> JsonResult {
|
||||||
let data: PreloginData = data.into_inner().data;
|
let data: PreloginData = data.into_inner().data;
|
||||||
|
|
||||||
match User::find_by_mail(&data.Email, &conn) {
|
const KDF_TYPE_DEFAULT: i32 = 0; // PBKDF2: 0
|
||||||
|
const KDF_ITER_DEFAULT: i32 = 5_000;
|
||||||
|
|
||||||
|
let (kdf_type, kdf_iter) = match User::find_by_mail(&data.Email, &conn) {
|
||||||
Some(user) => {
|
Some(user) => {
|
||||||
let kdf_type = 0; // PBKDF2: 0
|
|
||||||
|
|
||||||
let _server_iter = user.password_iterations;
|
let _server_iter = user.password_iterations;
|
||||||
let client_iter = 5000; // TODO: Make iterations user configurable
|
let client_iter = KDF_ITER_DEFAULT; // TODO: Make iterations user configurable
|
||||||
|
|
||||||
|
(KDF_TYPE_DEFAULT, client_iter)
|
||||||
|
},
|
||||||
|
None => (KDF_TYPE_DEFAULT, KDF_ITER_DEFAULT), // Return default values when no user
|
||||||
|
};
|
||||||
|
|
||||||
Ok(Json(json!({
|
Ok(Json(json!({
|
||||||
"Kdf": kdf_type,
|
"Kdf": kdf_type,
|
||||||
"KdfIterations": client_iter
|
"KdfIterations": kdf_iter
|
||||||
})))
|
})))
|
||||||
},
|
|
||||||
None => err!("Invalid user"),
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Laden …
In neuem Issue referenzieren