mirror of
https://github.com/TriliumNext/Notes.git
synced 2025-09-29 16:41:31 +08:00
Merge pull request #1597 from TriliumNext/hotfix/totp-validation-bypass
hotfix(auth): fix TOTP validation bypass issue
This commit is contained in:
commit
9f3076755c
@ -77,11 +77,6 @@ function login(req: Request, res: Response) {
|
||||
const submittedPassword = req.body.password;
|
||||
const submittedTotpToken = req.body.totpToken;
|
||||
|
||||
if (!verifyPassword(submittedPassword)) {
|
||||
sendLoginError(req, res, 'password');
|
||||
return;
|
||||
}
|
||||
|
||||
if (totp.isTotpEnabled()) {
|
||||
if (!verifyTOTP(submittedTotpToken)) {
|
||||
sendLoginError(req, res, 'totp');
|
||||
@ -89,6 +84,11 @@ function login(req: Request, res: Response) {
|
||||
}
|
||||
}
|
||||
|
||||
if (!verifyPassword(submittedPassword)) {
|
||||
sendLoginError(req, res, 'password');
|
||||
return;
|
||||
}
|
||||
|
||||
const rememberMe = req.body.rememberMe;
|
||||
|
||||
req.session.regenerate(() => {
|
||||
|
Loading…
x
Reference in New Issue
Block a user