公网链接改为内网现签:新增 /public-link 签发入口,删掉 /mcp-uploads 中转
- download-token.js(新): 从 files.js 抽出临时链接签名(密钥/报文形状/验签),浏览器下载与公网链接共用一份
- routes/public-link.js(新): GET /public-link?path=<绝对路径> 现签一条签名下载链接,
返回纯文本 URL(AI 直接 curl 取用,免解析 JSON)
边界:只收绝对路径 + workspace_root 前缀 + 会话表存在性 + realpath 复核(挡 ln -s 外泄)
- server.js: 该路由只挂在【不映射宿主机】的内网端口(PUBLIC_LINK_PORT,默认 8081),
因此不需要任何凭据 —— 鉴权靠网络边界而不是密钥,密钥也不会漏进会话记录
- server.js/routes: 删掉 mcp-uploads.js 及其挂载(上传中转整套作废)
- config.js/config.example.yml: 新增 public_link.{base_url,ttl_ms}(默认 30 分钟,夹 1min~24h)
- docker-compose.yml: 去掉 MCP_UPLOADS_URL
- 文档: DEPLOY.md 4.1 改写为「公网临时链接」;ARCHITECTURE.md 同步文件树/时序图/约束
This commit is contained in:
+12
-25
@@ -3,10 +3,10 @@ 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');
|
||||
const downloadToken = require('../download-token');
|
||||
const log = require('../log');
|
||||
|
||||
const router = express.Router();
|
||||
@@ -90,22 +90,11 @@ router.get('/:id/files', function (req, res) {
|
||||
// 移动端浏览器 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; }
|
||||
}
|
||||
// 签名实现(密钥、报文形状、验签)统一在 ../download-token.js:
|
||||
// routes/public-link.js 给外部服务签的是同一种链接,两边共用一份形状,避免“签得出、验不过”。
|
||||
const DOWNLOAD_TOKEN_TTL_MS = downloadToken.BROWSER_TTL_MS;
|
||||
const signDownloadToken = downloadToken.signDownload;
|
||||
const validDownloadToken = downloadToken.validDownload;
|
||||
|
||||
// 签发临时下载链接(需正常认证;拿到的链接 5 分钟内有效)
|
||||
router.get('/:id/files/download-token', function (req, res) {
|
||||
@@ -353,17 +342,15 @@ function zipNameFor(paths) {
|
||||
'-' + pad(d.getHours()) + pad(d.getMinutes()) + pad(d.getSeconds()) + '.zip';
|
||||
}
|
||||
|
||||
// 打包下载的报文形状与单文件下载不同(整串 paths 一起签),其余共用 ../download-token.js
|
||||
function zipPayload(sessionId, pathsRaw, expires) {
|
||||
return sessionId + '\nzip\n' + pathsRaw + '\n' + expires;
|
||||
}
|
||||
function signZipToken(sessionId, pathsRaw, expires) {
|
||||
return crypto.createHmac('sha256', downloadTokenSecret)
|
||||
.update(sessionId + '\nzip\n' + pathsRaw + '\n' + expires).digest('hex');
|
||||
return downloadToken.signPayload(zipPayload(sessionId, pathsRaw, expires));
|
||||
}
|
||||
function validZipToken(sessionId, pathsRaw, expires, t) {
|
||||
const exp = Number(expires);
|
||||
if (!t || !Number.isFinite(exp) || exp < Date.now()) return false;
|
||||
const expected = signZipToken(sessionId, pathsRaw, exp);
|
||||
try {
|
||||
return crypto.timingSafeEqual(Buffer.from(String(t), 'utf8'), Buffer.from(expected, 'utf8'));
|
||||
} catch (_) { return false; }
|
||||
return downloadToken.validPayload(zipPayload(sessionId, pathsRaw, expires), expires, t);
|
||||
}
|
||||
|
||||
// 签发打包下载链接(需正常认证;与单文件下载同一条 token 链路)
|
||||
|
||||
Reference in New Issue
Block a user