From edc0349708495d517fd808e11aa6a7237d8c3e8d Mon Sep 17 00:00:00 2001 From: kicer Date: Mon, 31 Aug 2026 20:32:08 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E6=94=B9=E4=B8=BA=E5=B8=A6?= =?UTF-8?q?=E7=AD=BE=E5=90=8D=20token=20=E7=9A=84=E4=B8=B4=E6=97=B6?= =?UTF-8?q?=E9=93=BE=E6=8E=A5=20+=20window.location.href=20=E5=8E=9F?= =?UTF-8?q?=E7=94=9F=E4=B8=8B=E8=BD=BD=EF=BC=9A=E6=96=B0=E5=A2=9E=20GET=20?= =?UTF-8?q?/:id/files/download-token=EF=BC=88HMAC=20=E7=AD=BE=E5=90=8D?= =?UTF-8?q?=EF=BC=8C5=20=E5=88=86=E9=92=9F=E6=9C=89=E6=95=88=EF=BC=8C?= =?UTF-8?q?=E5=AF=86=E9=92=A5=E9=9A=8F=E8=BF=9B=E7=A8=8B=E9=9A=8F=E6=9C=BA?= =?UTF-8?q?=EF=BC=89=EF=BC=8Cdownload=20=E8=B7=AF=E7=94=B1=E5=AF=B9?= =?UTF-8?q?=E5=B8=A6=20t=20=E5=8F=82=E6=95=B0=E8=AF=B7=E6=B1=82=E9=AA=8C?= =?UTF-8?q?=E7=AD=BE=EF=BC=9B=E5=89=8D=E7=AB=AF=E5=8E=BB=E6=8E=89=20fetch+?= =?UTF-8?q?blob/dataURL=20=E6=96=B9=E6=A1=88=EF=BC=9BJS=20=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E5=8F=B7=E5=8D=87=E8=87=B3=20v=3D20260831d?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/server/public/index.html | 2 +- app/server/public/js/app.js | 36 ++++------------------------- app/server/routes/files.js | 44 ++++++++++++++++++++++++++++++++++++ 3 files changed, 50 insertions(+), 32 deletions(-) diff --git a/app/server/public/index.html b/app/server/public/index.html index 332ee3f..7629ffc 100644 --- a/app/server/public/index.html +++ b/app/server/public/index.html @@ -111,6 +111,6 @@ - + diff --git a/app/server/public/js/app.js b/app/server/public/js/app.js index 242c060..c1aa4c4 100644 --- a/app/server/public/js/app.js +++ b/app/server/public/js/app.js @@ -359,40 +359,14 @@ function updatePhaseUI(d) { } // ---------- 文件 ---------- -// 下载:fetch + Blob 绕过浏览器原生下载(移动端 Chrome 对 Basic 认证下的 -// Content-Disposition 下载处理有 bug,会卡在“等待中”)。 -// 同源 fetch 会自动携带浏览器缓存的 Basic 认证头,无需在 JS 里处理密码。 +// 下载:先换一枚短时效签名链接,再 window.location.href 交给浏览器原生下载。 +// (fetch+blob 在移动端浏览器会被改名 uuid.bin;原生导航下载按服务端 +// Content-Disposition 保留原名,同源自动带 Basic 认证头。) async function downloadFile(name) { if (!state.sessionId) return; - toast('下载中…'); try { - const url = '/api/sessions/' + state.sessionId + '/files/download?path=' + encodeURIComponent(name); - const res = await fetch(url); - if (!res.ok) throw new Error('HTTP ' + res.status); - let blob = await res.blob(); - // 抹掉 blob 的 MIME:响应常为 octet-stream,部分移动端浏览器内核会按类型给下载名追加 .bin,抹掉后按原名保存 - try { blob = new Blob([blob], { type: '' }); } catch (_) {} - // 用 data: URL 触发下载:移动端 Chrome(约 114 起)对 blob: object URL 常忽略 download 属性, - // 文件名会兜底成 uuid.bin;data: URL 不走该回归逻辑,能正常保留原文件名。 - let href; - try { - href = await new Promise(function (resolve, reject) { - const r = new FileReader(); - r.onload = function () { resolve(String(r.result)); }; - r.onerror = function () { reject(new Error('blob 转 data URL 失败')); }; - r.readAsDataURL(blob); - }); - } catch (_) { - // 兜底:回到 object URL(电脑端正常) - href = URL.createObjectURL(blob); - setTimeout(function () { URL.revokeObjectURL(href); }, 3000); - } - const a = document.createElement('a'); - a.href = href; - a.download = name.split('/').pop() || 'download'; - document.body.appendChild(a); - a.click(); - setTimeout(function () { a.remove(); }, 1000); + const r = await req('GET', '/api/sessions/' + state.sessionId + '/files/download-token?path=' + encodeURIComponent(name)); + window.location.href = r.url; } catch (e) { toast('下载失败:' + e.message); } diff --git a/app/server/routes/files.js b/app/server/routes/files.js index 862cd21..0fd255c 100644 --- a/app/server/routes/files.js +++ b/app/server/routes/files.js @@ -3,6 +3,7 @@ const express = require('express'); const fs = require('fs'); const path = require('path'); const multer = require('multer'); +const crypto = require('crypto'); const engine = require('../engine'); const { listTaskFiles } = require('./sessions'); const { resolveInTask } = require('../tools/executor'); @@ -70,6 +71,45 @@ router.get('/:id/files', function (req, res) { } }); +// ---------- 临时下载链接(带签名 token,供浏览器原生下载使用) ---------- +// 移动端浏览器 fetch+blob 下载会丢失文件名(uuid.bin);改为短时效签名链接, +// 前端拿到后 window.location.href 导航下载,走原生下载流程。 +// 密钥随进程启动随机生成,重启后旧 token 自动失效。 +const DOWNLOAD_TOKEN_TTL_MS = 5 * 60 * 1000; +const downloadTokenSecret = crypto.randomBytes(32).toString('hex'); + +function signDownloadToken(sessionId, rel, expires) { + return crypto.createHmac('sha256', downloadTokenSecret) + .update(sessionId + '\n' + rel + '\n' + expires).digest('hex'); +} + +function validDownloadToken(sessionId, rel, expires, t) { + const exp = Number(expires); + if (!t || !Number.isFinite(exp) || exp < Date.now()) return false; + const expected = signDownloadToken(sessionId, rel, exp); + try { + return crypto.timingSafeEqual(Buffer.from(String(t), 'utf8'), Buffer.from(expected, 'utf8')); + } catch (_) { return false; } +} + +// 签发临时下载链接(需正常认证;拿到的链接 5 分钟内有效) +router.get('/:id/files/download-token', function (req, res) { + try { + const rel = String(req.query.path || ''); + if (!rel) return res.status(400).json({ error: '缺少 path 参数' }); + const abs = resolveInTask(engine.taskDirOf(req.params.id), rel); + if (!fs.statSync(abs).isFile()) return res.status(400).json({ error: '不是文件' }); + const expires = Date.now() + DOWNLOAD_TOKEN_TTL_MS; + const t = signDownloadToken(req.params.id, rel, expires); + res.json({ + url: '/api/sessions/' + encodeURIComponent(req.params.id) + '/files/download?path=' + + encodeURIComponent(rel) + '&expires=' + expires + '&t=' + t, + }); + } catch (err) { + res.status(404).json({ error: '文件不存在' }); + } +}); + // 下载统一响应:禁用一切缓存协商。 // 默认的 ETag/Last-Modified + Cache-Control: public, max-age=0 会诱导移动端浏览器 // 先发条件请求拿 304 空体,下载管理器随后卡在“等待中”(桌面 Safari/curl 不受影响)。 @@ -85,6 +125,10 @@ router.get('/:id/files/download', function (req, res) { try { const rel = String(req.query.path || ''); if (!rel) return res.status(400).json({ error: '缺少 path 参数' }); + // 带 token 的请求须先验签(会话/路径/时效任一不符即拒绝) + if (req.query.t && !validDownloadToken(req.params.id, rel, req.query.expires, String(req.query.t))) { + return res.status(403).json({ error: '下载链接已过期或无效' }); + } const abs = resolveInTask(engine.taskDirOf(req.params.id), rel); const st = fs.statSync(abs); if (!st.isFile()) return res.status(400).json({ error: '不是文件' });