feat: v0.7.4 时序语义修正 · 防线实效补漏 · 全量测试翻倍 — 2406 用例 + jsdom 组件测试全量回归
P1 修复面收口: - 超时三态区分(aborted→USER_INTERRUPT / ETIMEDOUT→TIMEOUT / 其余→ERROR), 根治"真实网络超时被误报为用户中断" - 流空闲超时统一(SSE/Ollama/Anthropic 读循环 60s 无数据抛 504 进重试通道) - 同会话并发 sendMessage 防重入(isRunning 守卫)+ 会话存在性预检 + 前置调用移入 try(ERROR+DONE 双事件保证,根治 isStreaming 假死) - 清空审计后 resetChainCache(根治 verifyChain 误报 TAMPERED) - DONE 不再提前清理 TRACE(TERMINATED 统一收尾,补全最终迭代录制) - IME 合成回车不发送(普通 Enter + Cmd/Ctrl+Enter 双分支)+ handleSend 闭包修复 P2 安全纵深: - preload 移除原始 electronAPI 暴露(渲染层零使用,关掉 XSS invoke 任意通道单点风险) - CORS 同源回显根治(仅当前浏览页面 Origin,did-navigate 同步) - MEMORY.md 命令保护正则扩展(括号/$/反引号/< 重定向边界 + 前导路径) - write_file append TOCTOU 统一(open 后 realpath 校验,新文件分支补漏) - 敏感键归一化(authKey 驼峰/连字符命中)+ MCP headers 鉴权值加密落库 - ReDoS 检测共享化(search_files/file_editor 统一拦截) - run_tests/lint_code 升风险 + 需确认 + npx --no-install(执行边界对齐 run_command) - MCP/SearXNG/llm.baseURL/updateFeedUrl 配置类 URL 高危目标校验(IPv6 去括号 + 十六进制映射解析 + 尾点剥离) P3 架构还债: - temperature/maxTokens 热生效(引擎/编排器/SubAgent 三处接线)+ setBatch 单事务落盘 - SessionRecorder flush 竞态根治(flushPromise 等待 + 超限内联落盘 + stopRecording async) - 内存收口(lastConsolidationBySession LRU / subTraces 清理 / 会话删除 disposeEngine) - i18n 全量收口(28 组件 + 353 key 双字典,状态标签改渲染时函数) - 死代码清理(updateTraceStep/HEADER_HEIGHT/void preA/失实注释) - 斜杠菜单 MUI 化 + 删除逻辑收敛 resetSessionState + Blob URL 统一释放 + 用户消息"仅保存"落库(saveMessage 透传前端 id 修复 id 错位) P4 能力演进: - 死循环检测拆分(驻留前置 + 乒乓后置带进度信号,合法交替不误报) - run-lock 30s 超时强制 abort(旧 run 卡死不无限排队) - RETRY 双通道 stream_reset(前端按 run 归属精确清空,根治重试文本重复) - FTS5 trigram 中文子串搜索(迁移 9 版本化 SCHEMA_VERSION=2,≤2 字符 LIKE 回退) - getContextWindow 兜底 1M→128K(未知模型防 413) 测试: - 855 → 2406 用例(+1551,2.8 倍):服务层 +325(含 MemoryManager 51 新用例)、 工具实体 +483、IPC/适配器 +390(含 OpenAI/Anthropic/Ollama 独立套件)、 纯函数表格化 +330;引入 jsdom + @testing-library(14 组件测试文件 249 用例) - 修复 R1(saveMessage id 透传)/ R2(stream_reset 精确归属)两个回归缺陷 - 遗留低危项清零:git-tools 顺序耦合 / web-fetch 真实时间退避 / slo 内存断言 / mcp-security 多余 skipIf / deepseek-balance 命名误导 / 组件 mock 注入脆弱性 版本: 0.7.4; README 同步(工具风险表/版本徽章); 依赖: 移除 @electron-toolkit/preload, 新增 jsdom/@testing-library(devDependencies 不打包) 回归: typecheck 双端 0 错误; ESLint 0/0; Electron ABI 全量 2406/2406 零跳过; 系统 Node 2110 通过 296 跳过(better-sqlite3 ABI)
This commit is contained in:
@@ -27,44 +27,15 @@ import {
|
||||
extractErrorMessage,
|
||||
MAX_FILE_SIZE_BYTES,
|
||||
FILE_TOOL_TIMEOUT_MS,
|
||||
isPotentiallyCatastrophicRegex,
|
||||
} from './file-guard';
|
||||
|
||||
/**
|
||||
* #45 修复: 检测潜在灾难性正则模式(ReDoS 风险)
|
||||
*
|
||||
* 灾难性回溯通常由以下模式引起:
|
||||
* - 嵌套量词:(a+)+、(a*)*、(a+)*
|
||||
* - 重叠量词:a+a+、a+.*a+(两个量词之间无固定字符分隔)
|
||||
* - 交替分支加量词:(a|a)*
|
||||
*
|
||||
* 这些模式在长字符串上执行时间指数级增长,可阻塞主进程
|
||||
*
|
||||
* @param pattern 用户提供的正则模式字符串
|
||||
* @returns true 如果检测到潜在灾难性模式
|
||||
* v0.7.4 P2-7: 灾难性正则检测从 file-guard 导入(共享模块),
|
||||
* search_files / file_editor / code_search 统一复用 —— 消除三份实现漂移。
|
||||
* @see file-guard.ts — isPotentiallyCatastrophicRegex
|
||||
*/
|
||||
function isPotentiallyCatastrophicRegex(pattern: string): boolean {
|
||||
// 审查修复: 放宽规则减少误报,补充漏报检测
|
||||
|
||||
// 1. 嵌套量词(捕获组内量词+外层量词)
|
||||
// 审查修复: 区分外层量词类型 — 外层 +* 时组内一个量词即可触发(如 (a+)+),
|
||||
// 外层 ? 时需组内两个量词才触发(排除 (\d+)? 误报)
|
||||
if (/\([^)]*[+*?][^)]*\)[+*]/.test(pattern)) return true;
|
||||
if (/\([^)]*[+*?][^)]*[+*?][^)]*\)[?]/.test(pattern)) return true;
|
||||
|
||||
// 2. 重叠量词 — 补充 a+a+ 漏报
|
||||
if (/[+*][+*]/.test(pattern)) return true;
|
||||
// 审查修复: 补充 a+a+ / a+.*a+ 等重叠量词检测
|
||||
if (/\w[+*]\s*\w[+*]/.test(pattern)) return true;
|
||||
if (/\.\*[+*]\.\*[+*]/.test(pattern)) return true;
|
||||
|
||||
// 3. 交替分支加量词 — 放宽: 仅当分支有重叠前缀时才危险
|
||||
// 移除对 (GET|POST)+ 的误报,只检测真正危险的重叠分支
|
||||
// (a|a)* 类型难以用正则精确检测,保留简化版
|
||||
if (/\(([^)]+)\|(\1[^)]*)\)[+*?]/.test(pattern)) return true;
|
||||
if (/\(([^)]*\|[^)]*)\)[+*?]/.test(pattern) && /(.)\1.*\|.*\1/.test(pattern)) return true;
|
||||
|
||||
return false;
|
||||
}
|
||||
export { isPotentiallyCatastrophicRegex };
|
||||
|
||||
export class FileEditorTool implements IMetonaTool {
|
||||
readonly definition: MetonaToolDef = {
|
||||
@@ -80,18 +51,49 @@ export class FileEditorTool implements IMetonaTool {
|
||||
description: 'Edit operation',
|
||||
enum: ['replace', 'insert', 'delete', 'regex', 'find_replace'],
|
||||
},
|
||||
start_line: { type: 'number', description: 'Start line number (1-indexed). Used by replace/insert/delete/regex' },
|
||||
end_line: { type: 'number', description: 'End line number (inclusive). Used by replace/delete/regex' },
|
||||
start_line: {
|
||||
type: 'number',
|
||||
description: 'Start line number (1-indexed). Used by replace/insert/delete/regex',
|
||||
},
|
||||
end_line: {
|
||||
type: 'number',
|
||||
description: 'End line number (inclusive). Used by replace/delete/regex',
|
||||
},
|
||||
content: { type: 'string', description: 'New content for replace/insert operations' },
|
||||
pattern: { type: 'string', description: 'Regex pattern for regex operation' },
|
||||
replacement: { type: 'string', description: 'Replacement string for regex operation' },
|
||||
flags: { type: 'string', description: 'Regex flags (default "g"). Use "gm" for multiline, "gms" for multiline+dotall' },
|
||||
multiline: { type: 'boolean', description: 'F2-6: Enable cross-line regex matching. When true, regex is applied to the joined content of the range (not line-by-line). Useful for replacing multi-line code blocks. Default false.' },
|
||||
find: { type: 'string', description: 'F2-5: Literal string to find for find_replace operation (no regex interpretation)' },
|
||||
replace: { type: 'string', description: 'F2-5: Replacement string for find_replace operation' },
|
||||
replace_all: { type: 'boolean', description: 'F2-5: Replace all occurrences (true, default) or only the first (false). For find_replace operation.' },
|
||||
backup: { type: 'boolean', description: 'F2-7: Save a .bak copy of the original file before editing (default false)' },
|
||||
dry_run: { type: 'boolean', description: 'Preview mode: return the diff without writing to file (default false)' },
|
||||
flags: {
|
||||
type: 'string',
|
||||
description:
|
||||
'Regex flags (default "g"). Use "gm" for multiline, "gms" for multiline+dotall',
|
||||
},
|
||||
multiline: {
|
||||
type: 'boolean',
|
||||
description:
|
||||
'F2-6: Enable cross-line regex matching. When true, regex is applied to the joined content of the range (not line-by-line). Useful for replacing multi-line code blocks. Default false.',
|
||||
},
|
||||
find: {
|
||||
type: 'string',
|
||||
description:
|
||||
'F2-5: Literal string to find for find_replace operation (no regex interpretation)',
|
||||
},
|
||||
replace: {
|
||||
type: 'string',
|
||||
description: 'F2-5: Replacement string for find_replace operation',
|
||||
},
|
||||
replace_all: {
|
||||
type: 'boolean',
|
||||
description:
|
||||
'F2-5: Replace all occurrences (true, default) or only the first (false). For find_replace operation.',
|
||||
},
|
||||
backup: {
|
||||
type: 'boolean',
|
||||
description: 'F2-7: Save a .bak copy of the original file before editing (default false)',
|
||||
},
|
||||
dry_run: {
|
||||
type: 'boolean',
|
||||
description: 'Preview mode: return the diff without writing to file (default false)',
|
||||
},
|
||||
},
|
||||
required: ['file_path', 'operation'],
|
||||
},
|
||||
@@ -108,14 +110,22 @@ export class FileEditorTool implements IMetonaTool {
|
||||
return { success: false, error: 'file_path is required' };
|
||||
}
|
||||
const filePath = safeResolvePath(args.file_path as string, context.workspacePath);
|
||||
const operation = args.operation as 'replace' | 'insert' | 'delete' | 'regex' | 'find_replace';
|
||||
const operation = args.operation as
|
||||
| 'replace'
|
||||
| 'insert'
|
||||
| 'delete'
|
||||
| 'regex'
|
||||
| 'find_replace';
|
||||
const dryRun = (args.dry_run as boolean) ?? false;
|
||||
// F2-7: backup 参数 — 编辑前保存 .bak 文件
|
||||
const backup = (args.backup as boolean) ?? false;
|
||||
|
||||
// 文件必须存在(不支持创建新文件,请用 write_file)
|
||||
if (!existsSync(filePath)) {
|
||||
return { success: false, error: `File not found: ${args.file_path}. Use write_file to create new files.` };
|
||||
return {
|
||||
success: false,
|
||||
error: `File not found: ${args.file_path}. Use write_file to create new files.`,
|
||||
};
|
||||
}
|
||||
|
||||
// v0.3.2: 文件大小上限(防止 OOM)
|
||||
@@ -132,22 +142,21 @@ export class FileEditorTool implements IMetonaTool {
|
||||
|
||||
let newLines: string[];
|
||||
let affectedRange: { start: number; end: number };
|
||||
let replaceCount = 0; // v0.3.2: 统一在外层声明,供 dry_run 返回
|
||||
let replaceCount = 0; // v0.3.2: 统一在外层声明,供 dry_run 返回
|
||||
|
||||
switch (operation) {
|
||||
case 'replace': {
|
||||
const startLine = Math.max(1, (args.start_line as number) ?? 1);
|
||||
const endLine = Math.min(lines.length, (args.end_line as number) ?? startLine);
|
||||
if (endLine < startLine) {
|
||||
return { success: false, error: `end_line (${endLine}) must be >= start_line (${startLine})` };
|
||||
return {
|
||||
success: false,
|
||||
error: `end_line (${endLine}) must be >= start_line (${startLine})`,
|
||||
};
|
||||
}
|
||||
const content = (args.content as string) ?? '';
|
||||
const contentLines = content.split('\n');
|
||||
newLines = [
|
||||
...lines.slice(0, startLine - 1),
|
||||
...contentLines,
|
||||
...lines.slice(endLine),
|
||||
];
|
||||
newLines = [...lines.slice(0, startLine - 1), ...contentLines, ...lines.slice(endLine)];
|
||||
affectedRange = { start: startLine, end: endLine };
|
||||
replaceCount = endLine - startLine + 1;
|
||||
break;
|
||||
@@ -155,7 +164,7 @@ export class FileEditorTool implements IMetonaTool {
|
||||
|
||||
case 'insert': {
|
||||
let startLine = Math.max(1, (args.start_line as number) ?? 1);
|
||||
startLine = Math.min(startLine, lines.length + 1); // 允许追加到末尾
|
||||
startLine = Math.min(startLine, lines.length + 1); // 允许追加到末尾
|
||||
const content = (args.content as string) ?? '';
|
||||
const contentLines = content.split('\n');
|
||||
newLines = [
|
||||
@@ -172,12 +181,12 @@ export class FileEditorTool implements IMetonaTool {
|
||||
const startLine = Math.max(1, (args.start_line as number) ?? 1);
|
||||
const endLine = Math.min(lines.length, (args.end_line as number) ?? startLine);
|
||||
if (endLine < startLine) {
|
||||
return { success: false, error: `end_line (${endLine}) must be >= start_line (${startLine})` };
|
||||
return {
|
||||
success: false,
|
||||
error: `end_line (${endLine}) must be >= start_line (${startLine})`,
|
||||
};
|
||||
}
|
||||
newLines = [
|
||||
...lines.slice(0, startLine - 1),
|
||||
...lines.slice(endLine),
|
||||
];
|
||||
newLines = [...lines.slice(0, startLine - 1), ...lines.slice(endLine)];
|
||||
affectedRange = { start: startLine, end: endLine };
|
||||
replaceCount = endLine - startLine + 1;
|
||||
break;
|
||||
@@ -199,12 +208,19 @@ export class FileEditorTool implements IMetonaTool {
|
||||
// #45 修复: ReDoS 防护 — 检测灾难性正则模式,拒绝可能导致指数级回溯的 pattern
|
||||
// 攻击场景:恶意 LLM 传入 (a+)+ 等模式,在长字符串上阻塞主进程
|
||||
if (isPotentiallyCatastrophicRegex(pattern)) {
|
||||
return { success: false, error: 'Potentially catastrophic regex pattern detected (ReDoS risk): nested or overlapping quantifiers' };
|
||||
return {
|
||||
success: false,
|
||||
error:
|
||||
'Potentially catastrophic regex pattern detected (ReDoS risk): nested or overlapping quantifiers',
|
||||
};
|
||||
}
|
||||
const startLine = Math.max(1, (args.start_line as number) ?? 1);
|
||||
const endLine = Math.min(lines.length, (args.end_line as number) ?? lines.length);
|
||||
if (endLine < startLine) {
|
||||
return { success: false, error: `end_line (${endLine}) must be >= start_line (${startLine})` };
|
||||
return {
|
||||
success: false,
|
||||
error: `end_line (${endLine}) must be >= start_line (${startLine})`,
|
||||
};
|
||||
}
|
||||
|
||||
// F1-1 修复: 强制 regex 含 g 标志,保证 match 计数与 replace 结果一致
|
||||
@@ -294,7 +310,10 @@ export class FileEditorTool implements IMetonaTool {
|
||||
const idx = originalContent.indexOf(find);
|
||||
if (idx >= 0) {
|
||||
replaceCount = 1;
|
||||
const newContent = originalContent.slice(0, idx) + replaceStr + originalContent.slice(idx + find.length);
|
||||
const newContent =
|
||||
originalContent.slice(0, idx) +
|
||||
replaceStr +
|
||||
originalContent.slice(idx + find.length);
|
||||
newLines = newContent.split('\n');
|
||||
} else {
|
||||
replaceCount = 0;
|
||||
@@ -335,10 +354,9 @@ export class FileEditorTool implements IMetonaTool {
|
||||
if (operation === 'insert') {
|
||||
// insert: 原文件无被替换内容;新文件显示插入的内容
|
||||
originalPreview = '';
|
||||
modifiedPreview = newLines.slice(
|
||||
affectedRange.start - 1,
|
||||
Math.min(affectedRange.end, newLines.length),
|
||||
).join('\n');
|
||||
modifiedPreview = newLines
|
||||
.slice(affectedRange.start - 1, Math.min(affectedRange.end, newLines.length))
|
||||
.join('\n');
|
||||
} else if (operation === 'find_replace') {
|
||||
// F2-5: find_replace 的 dry_run — 只预览第一个匹配附近的内容
|
||||
// 避免大文件预览整个文件(affectedRange 覆盖全部行)
|
||||
@@ -352,27 +370,24 @@ export class FileEditorTool implements IMetonaTool {
|
||||
originalPreview = lines.slice(previewStart - 1, previewEnd).join('\n');
|
||||
const lineDelta = newLines.length - lines.length;
|
||||
const modifiedEnd = Math.min(newLines.length, previewEnd + lineDelta);
|
||||
modifiedPreview = newLines.slice(previewStart - 1, Math.max(previewStart - 1, modifiedEnd)).join('\n');
|
||||
modifiedPreview = newLines
|
||||
.slice(previewStart - 1, Math.max(previewStart - 1, modifiedEnd))
|
||||
.join('\n');
|
||||
} else {
|
||||
originalPreview = '';
|
||||
modifiedPreview = '';
|
||||
}
|
||||
} else {
|
||||
// replace/delete/regex: 原文件取 [start-1, end) 区间
|
||||
originalPreview = lines.slice(
|
||||
affectedRange.start - 1,
|
||||
Math.min(affectedRange.end, lines.length),
|
||||
).join('\n');
|
||||
originalPreview = lines
|
||||
.slice(affectedRange.start - 1, Math.min(affectedRange.end, lines.length))
|
||||
.join('\n');
|
||||
// 新文件取相同范围 + 行数差修正(replace 可能改变行数,delete 后该位置为空)
|
||||
const lineDelta = newLines.length - lines.length;
|
||||
const modifiedEnd = Math.min(
|
||||
affectedRange.end + lineDelta,
|
||||
newLines.length,
|
||||
);
|
||||
modifiedPreview = newLines.slice(
|
||||
affectedRange.start - 1,
|
||||
Math.max(affectedRange.start - 1, modifiedEnd),
|
||||
).join('\n');
|
||||
const modifiedEnd = Math.min(affectedRange.end + lineDelta, newLines.length);
|
||||
modifiedPreview = newLines
|
||||
.slice(affectedRange.start - 1, Math.max(affectedRange.start - 1, modifiedEnd))
|
||||
.join('\n');
|
||||
}
|
||||
|
||||
return {
|
||||
@@ -414,7 +429,11 @@ export class FileEditorTool implements IMetonaTool {
|
||||
} catch (err) {
|
||||
// 原子写入失败,清理临时文件
|
||||
if (existsSync(tmpPath)) {
|
||||
try { await unlink(tmpPath); } catch { /* 忽略清理错误 */ }
|
||||
try {
|
||||
await unlink(tmpPath);
|
||||
} catch {
|
||||
/* 忽略清理错误 */
|
||||
}
|
||||
}
|
||||
throw err;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user