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

Return default prelogin values when the user doesn't exist

This commit is contained in:
Daniel García 2018-09-13 23:04:52 +02:00
parent 8651df8c2a
commit b75ba216d1
No known key found for this signature in database
GPG Key ID: FC8A7D14C3CD543A
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/api/core/accounts.rs
View File

@ -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"),
}
} }