diff --git a/app/server/auth.js b/app/server/auth.js index e47a995..a43cd30 100644 --- a/app/server/auth.js +++ b/app/server/auth.js @@ -79,6 +79,13 @@ function isPublicPath(p) { return false; } +// 登录成功后的回跳目标:只允许本站绝对路径,拦掉 //evil.com(协议相对)与反斜杠混淆,防开放重定向。 +function safeNextUrl(u) { + const s = String(u || ''); + if (!s.startsWith('/') || s.startsWith('//') || s.includes('\\')) return '/'; + return s; +} + // 带签名 token 的临时下载链接(files.js 自己验签),此处放行由路由层拒绝伪造请求。 // URL 形态都要认:/files/download?path=…、/files/download-name/<名字>?path=…, // 及打包下载 /files/zip?paths=…、/files/zip-name/<名字>?paths=…; @@ -203,7 +210,8 @@ function createAuth(cfg) { // ----- 登录页 / 登出跳转 ----- router.get('/login', (req, res) => { - if (sessionUser(req)) return res.redirect('/'); + // 已登录直接放行:优先回跳 next 指定的原页面(中间件在 302 来 /login 时带上的) + if (sessionUser(req)) return res.redirect(safeNextUrl(req.query.next)); res.sendFile(path.join(__dirname, 'public', 'login.html')); }); @@ -219,7 +227,8 @@ function createAuth(cfg) { if (user) { req.user = user; return next(); } if (isPublicPath(req.path) || isSignedDownload(req)) return next(); if (req.path.startsWith('/api/')) return res.status(401).json({ error: '未登录' }); - return res.redirect('/login'); + // 带上原始 URL(含 query),登录页成功后回跳,不再一律进首页 + return res.redirect('/login?next=' + encodeURIComponent(req.originalUrl)); }; return { enabled: true, middleware, router }; diff --git a/app/server/public/js/core.js b/app/server/public/js/core.js index d413444..944749e 100644 --- a/app/server/public/js/core.js +++ b/app/server/public/js/core.js @@ -129,7 +129,8 @@ } throw e; } - if (res.status === 401) { location.href = '/login'; throw new Error('未登录'); } + // 运行中登录态失效:带上当前页 URL,重新登录后原页返回 + if (res.status === 401) { location.href = '/login?next=' + encodeURIComponent(location.pathname + location.search); throw new Error('未登录'); } if (!res.ok) { let msg = 'HTTP ' + res.status; try { msg = (await res.json()).error || msg; } catch (_) {} diff --git a/app/server/public/js/files.js b/app/server/public/js/files.js index 6337172..7b8e50c 100644 --- a/app/server/public/js/files.js +++ b/app/server/public/js/files.js @@ -496,7 +496,7 @@ async function previewInFs(name) { try { const r = await fetch('/api/sessions/' + state.sessionId + '/files/download?path=' + encodeURIComponent(name)); - if (r.status === 401) { location.href = '/login'; return; } + if (r.status === 401) { location.href = '/login?next=' + encodeURIComponent(location.pathname + location.search); return; } if (!r.ok) { let msg = 'HTTP ' + r.status; try { msg = (await r.json()).error || msg; } catch (_) {} throw new Error(msg); } if (/\.html?$/i.test(name)) { const html = await r.text(); diff --git a/app/server/public/login.html b/app/server/public/login.html index 6d9cf95..a25fa1a 100644 --- a/app/server/public/login.html +++ b/app/server/public/login.html @@ -42,11 +42,18 @@