Merge branch 'master' into mariadb-fk-issues

This commit is contained in:
Mathijs van Veluw 2020-09-25 22:25:57 +02:00 committed by GitHub
commit c698bca2b9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -32,6 +32,7 @@ pub fn routes() -> Vec<rocket::Route> {
revision_date, revision_date,
password_hint, password_hint,
prelogin, prelogin,
verify_password,
] ]
} }
@ -623,3 +624,20 @@ fn prelogin(data: JsonUpcase<PreloginData>, conn: DbConn) -> JsonResult {
"KdfIterations": kdf_iter "KdfIterations": kdf_iter
}))) })))
} }
#[derive(Deserialize)]
#[allow(non_snake_case)]
struct VerifyPasswordData {
MasterPasswordHash: String,
}
#[post("/accounts/verify-password", data = "<data>")]
fn verify_password(data: JsonUpcase<VerifyPasswordData>, headers: Headers, _conn: DbConn) -> EmptyResult {
let data: VerifyPasswordData = data.into_inner().data;
let user = headers.user;
if !user.check_valid_password(&data.MasterPasswordHash) {
err!("Invalid password")
}
Ok(())
}