Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-10-31 18:36:30 +01:00
Code Issues Packages Projects Releases Activity

feat: 🎸 Fix TOTP not load correctly

Browse Source
This commit is contained in:
Jin
2025-03-26 00:42:19 +01:00
parent 8f157e04d4
commit 083ee5d23b
4 changed files with 9 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/routes/login.ts
View File

@@ -68,7 +68,7 @@ function setPassword(req: Request, res: Response) {
function login(req: Request, res: Response) { function login(req: Request, res: Response) {
const submittedPassword = req.body.password; const submittedPassword = req.body.password;
const submittedTotp = req.body.token; const submittedTotpToken = req.body.totpToken;
// 首先验证密码 // 首先验证密码
if (!verifyPassword(submittedPassword)) { if (!verifyPassword(submittedPassword)) {
@@ -78,7 +78,7 @@ function login(req: Request, res: Response) {
// 如果密码正确且启用了 TOTP，验证 TOTP // 如果密码正确且启用了 TOTP，验证 TOTP
if (totp.isTotpEnabled()) { if (totp.isTotpEnabled()) {
if (!verifyTOTP(submittedTotp)) { if (!verifyTOTP(submittedTotpToken)) {
sendLoginError(req, res, 'totp'); sendLoginError(req, res, 'totp');
return; return;
} }
@@ -106,10 +106,10 @@ function login(req: Request, res: Response) {
}); });
} }
function verifyTOTP(submittedToken: string) { function verifyTOTP(submittedTotpToken: string) {
if (totp.validateTOTP(submittedToken)) return true; if (totp.validateTOTP(submittedTotpToken)) return true;
const recoveryCodeValidates = recoveryCodeService.verifyRecoveryCode(submittedToken); const recoveryCodeValidates = recoveryCodeService.verifyRecoveryCode(submittedTotpToken);
return recoveryCodeValidates; return recoveryCodeValidates;
} }

9
src/routes/session_parser.ts
View File

@@ -25,9 +25,7 @@ const sessionParser = session({
}) })
}); });
// 创建一个检查认证状态的中间件
const checkAuthState = (req: Request, res: Response, next: NextFunction) => { const checkAuthState = (req: Request, res: Response, next: NextFunction) => {
// 如果用户未登录或者是登录页面，直接继续
if (!req.session.loggedIn || req.path === '/login') { if (!req.session.loggedIn || req.path === '/login') {
return next(); return next();
} }
@@ -35,23 +33,17 @@ const checkAuthState = (req: Request, res: Response, next: NextFunction) => {
const currentTotpStatus = totp.isTotpEnabled(); const currentTotpStatus = totp.isTotpEnabled();
const currentSsoStatus = open_id.isOpenIDEnabled(); const currentSsoStatus = open_id.isOpenIDEnabled();
// 从 session 中获取上次登录时的认证状态
const lastAuthState = req.session.lastAuthState || { const lastAuthState = req.session.lastAuthState || {
totpEnabled: false, totpEnabled: false,
ssoEnabled: false ssoEnabled: false
}; };
// 检查认证状态是否发生变化
if (lastAuthState.totpEnabled !== currentTotpStatus || if (lastAuthState.totpEnabled !== currentTotpStatus ||
lastAuthState.ssoEnabled !== currentSsoStatus) { lastAuthState.ssoEnabled !== currentSsoStatus) {
// 如果认证状态发生变化，先销毁当前 session
req.session.destroy((err) => { req.session.destroy((err) => {
if (err) { if (err) {
console.error('Error destroying session:', err); console.error('Error destroying session:', err);
} }
// 清除 cookie
res.clearCookie('trilium.sid');
// 重定向到登录页面
res.redirect('/login'); res.redirect('/login');
}); });
return; return;
@@ -60,7 +52,6 @@ const checkAuthState = (req: Request, res: Response, next: NextFunction) => {
next(); next();
}; };
// 导出一个组合的中间件
export default function (req: Request, res: Response, next: NextFunction) { export default function (req: Request, res: Response, next: NextFunction) {
sessionParser(req, res, () => { sessionParser(req, res, () => {
checkAuthState(req, res, next); checkAuthState(req, res, next);

4
src/services/totp.ts
View File

@@ -18,12 +18,12 @@ function checkForTotSecret() {
return config.MultiFactorAuthentication.totpSecret === "" ? false : true; return config.MultiFactorAuthentication.totpSecret === "" ? false : true;
} }
function validateTOTP(guessedPasscode: string) { function validateTOTP(submittedPasscode: string) {
if (config.MultiFactorAuthentication.totpSecret === "") return false; if (config.MultiFactorAuthentication.totpSecret === "") return false;
try { try {
const valid = Totp.validate({ const valid = Totp.validate({
passcode: guessedPasscode, passcode: submittedPasscode,
secret: config.MultiFactorAuthentication.totpSecret.trim() secret: config.MultiFactorAuthentication.totpSecret.trim()
}); });
return valid; return valid;

5
src/views/login.ejs
View File

@@ -33,10 +33,9 @@
</div> </div>
<% if( totpEnabled ) { %> <% if( totpEnabled ) { %>
<div class="form-group"> <div class="form-group">
<label for="totp-token">TOTP Token</label> <label for="totpToken">TOTP Token</label>
<div class="controls"> <div class="controls">
<input id="totp-token" name="totp-token" placeholder="" class="form-control" type="text" <input id="totpToken" name="totpToken" placeholder="" class="form-control" type="text" required />
required />
</div> </div>
</div> </div>
<% } %> <% } %>