mirror of
https://gitcode.com/GitHub_Trending/ds/dsh-purge.git
synced 2026-11-20 07:59:06 +08:00
fix: 全仓审计加固与死代码清理,版本 1.1.87
- 回滚/备份:空 bak 改名 .bad 跳过;升级刷新 bak 补上单数 marker 补丁;统一原子写 - 补丁命中:optional 命中不符记软失败;#42 插入型替换加探针防重复插入 - Windows:进程枚举改用 | 分隔 + UTF-8,修复中文路径换包不杀旧进程;换包失败拉起原版 - 安全:asar 解包防越界;红队路径校验 realpath 防空 symlink;更新仅 https;报告回放去换行注入 - 提示词钩子:停用后 rewriteFn 返回原装配文本并清理 assemble guard;缓存签名纳入红队/策略/override - 红队:listEngagements 默认不算统计;listVulns/报告支持 evidenceLimit - 子代理名额占位即时生效并回退;--apply 有失败项退出码 1 - 清理:删除 lib/mnemon-settings.js 及 13 处死代码/未使用 import;移除 test 目录与 test 脚本
This commit is contained in:
@@ -8,6 +8,7 @@ Thumbs.db
|
||||
|
||||
# 只给本机 Cursor 技能看,不进仓库
|
||||
docs/agents/
|
||||
.cursor/
|
||||
|
||||
# 本地草稿,不进仓库
|
||||
scripts/tmp-*.mjs
|
||||
|
||||
@@ -98,7 +98,12 @@ async function main() {
|
||||
} else {
|
||||
console.log(" ⚠ 未定位 shim 目录,跳过注入");
|
||||
}
|
||||
const failed = core.summarizeApplyReport(report).failed || [];
|
||||
console.log("");
|
||||
if (failed.length > 0) {
|
||||
console.log(`✗ 完成但有 ${failed.length} 个补丁失败 / finished with ${failed.length} failed patch(es)`);
|
||||
process.exit(1);
|
||||
}
|
||||
console.log("全部完成 / All done。重启 dsh 生效 / Restart dsh to take effect.");
|
||||
} else if (mode === "--revert") {
|
||||
if (state.ai_base || core.enumeratePatchAiBases().length) {
|
||||
@@ -129,6 +134,13 @@ async function main() {
|
||||
console.log(" 卸载中止:还原失败,插件文件未删除。");
|
||||
process.exit(1);
|
||||
}
|
||||
/* 命令行卸载没有「重启后助手」这一步:插件目录不会自己消失,得在这里删。
|
||||
(界面卸载是把这一步交给独立助手,等端口释放后再删。) */
|
||||
const fs = await import("node:fs");
|
||||
for (const dir of result.cleanup || []) {
|
||||
try { fs.rmSync(dir, { recursive: true, force: true, maxRetries: 8, retryDelay: 120 }); }
|
||||
catch (e) { console.log(` ⚠ 未能删除 ${dir}: ${e && e.message ? e.message : e}`); }
|
||||
}
|
||||
console.log("");
|
||||
console.log("卸载完成。请重启 dsh。");
|
||||
} else if (mode === "--edit") {
|
||||
|
||||
@@ -1568,6 +1568,7 @@ body[data-ds-dark-theme] .rt-rep-step-no,.dshp-dock[data-theme="dusk"] .rt-rep-s
|
||||
}
|
||||
|
||||
function PurgifySection() {
|
||||
useEffect(() => () => stopRestartPolling(), []);
|
||||
const t = useT();
|
||||
const tRef = useRef(t);
|
||||
tRef.current = t;
|
||||
@@ -1848,12 +1849,12 @@ body[data-ds-dark-theme] .rt-rep-step-no,.dshp-dock[data-theme="dusk"] .rt-rep-s
|
||||
},
|
||||
}));
|
||||
const applyContent = action === "apply" ? readPromptBox() : "";
|
||||
fetch("/dsh-purge/" + action, {
|
||||
/* 走 apiJson:apply/revert 本来就配了 240s/120s 超时,裸 fetch 会挂死在半路。 */
|
||||
apiJson("/dsh-purge/" + action, {
|
||||
method: "POST",
|
||||
headers: { "content-type": "application/json" },
|
||||
body: JSON.stringify(action === "apply" ? { content: applyContent } : {}),
|
||||
})
|
||||
.then((r) => r.json())
|
||||
.then((d) => {
|
||||
if (ticket !== actionTicket.current) return;
|
||||
if (responseNeedsPrompt(d)) {
|
||||
@@ -1933,12 +1934,11 @@ body[data-ds-dark-theme] .rt-rep-step-no,.dshp-dock[data-theme="dusk"] .rt-rep-s
|
||||
setAskRestart(false);
|
||||
setNotice({ kind: "idle", text: "" });
|
||||
const content = readPromptBox();
|
||||
fetch("/dsh-purge/override", {
|
||||
apiJson("/dsh-purge/override", {
|
||||
method: "POST",
|
||||
headers: { "content-type": "application/json" },
|
||||
body: JSON.stringify({ content: content }),
|
||||
})
|
||||
.then((r) => r.json())
|
||||
.then((d) => {
|
||||
if (ticket !== actionTicket.current) return;
|
||||
if (!d.ok || responseNeedsPrompt(d)) {
|
||||
@@ -2006,6 +2006,7 @@ body[data-ds-dark-theme] .rt-rep-step-no,.dshp-dock[data-theme="dusk"] .rt-rep-s
|
||||
}, [defaultOverride, t]);
|
||||
|
||||
const waitHostAfterUninstall = useCallback((tr) => {
|
||||
stopRestartPolling();
|
||||
const started = Date.now();
|
||||
const ping = () => {
|
||||
fetch("/", { cache: "no-store", credentials: "same-origin" })
|
||||
@@ -2028,9 +2029,9 @@ body[data-ds-dark-theme] .rt-rep-step-no,.dshp-dock[data-theme="dusk"] .rt-rep-s
|
||||
setUninstallBusy(false);
|
||||
return;
|
||||
}
|
||||
setTimeout(ping, 500);
|
||||
restartPollTimer = setTimeout(ping, 500);
|
||||
};
|
||||
setTimeout(ping, 800);
|
||||
restartPollTimer = setTimeout(ping, 800);
|
||||
}, []);
|
||||
|
||||
const doUninstall = useCallback(() => {
|
||||
@@ -2905,7 +2906,15 @@ body[data-ds-dark-theme] .rt-rep-step-no,.dshp-dock[data-theme="dusk"] .rt-rep-s
|
||||
window.location.reload();
|
||||
}
|
||||
|
||||
/* 重启/卸载后的 500ms 轮询共用一个定时器:组件卸载或流程取消时要能停掉,
|
||||
否则面板关掉之后它还会跑到 90 秒超时。 */
|
||||
let restartPollTimer = 0;
|
||||
function stopRestartPolling() {
|
||||
if (restartPollTimer) { clearTimeout(restartPollTimer); restartPollTimer = 0; }
|
||||
}
|
||||
|
||||
function waitForRestart(setNotice, setBusy, t) {
|
||||
stopRestartPolling();
|
||||
const started = Date.now();
|
||||
// 必须先看到旧进程掉线,再等新进程就绪;否则同进程立刻 200 会被当成「重启成功」又弹重启。
|
||||
let sawDown = false;
|
||||
@@ -2931,9 +2940,9 @@ body[data-ds-dark-theme] .rt-rep-step-no,.dshp-dock[data-theme="dusk"] .rt-rep-s
|
||||
setBusy(false);
|
||||
return;
|
||||
}
|
||||
setTimeout(ping, 500);
|
||||
restartPollTimer = setTimeout(ping, 500);
|
||||
};
|
||||
setTimeout(ping, 800);
|
||||
restartPollTimer = setTimeout(ping, 800);
|
||||
}
|
||||
|
||||
let restartOnce = false;
|
||||
@@ -3010,6 +3019,7 @@ body[data-ds-dark-theme] .rt-rep-step-no,.dshp-dock[data-theme="dusk"] .rt-rep-s
|
||||
}
|
||||
|
||||
function SettingsRoot(props) {
|
||||
useEffect(() => () => stopRestartPolling(), []);
|
||||
const t = typeof props.t === "function" ? props.t : ((key) => key);
|
||||
const [theme, setTheme] = useState(readTheme);
|
||||
useEffect(() => {
|
||||
@@ -4351,11 +4361,34 @@ body[data-ds-dark-theme] .rt-scope-testing,.dshp-dock[data-theme="dusk"] .rt-sco
|
||||
try { return String(window.location.hash || '') === '#redteam-full' } catch { return false }
|
||||
}
|
||||
|
||||
const api = (req) => fetch('/redteam/api', {
|
||||
method: 'POST',
|
||||
headers: { 'content-type': 'application/json' },
|
||||
body: JSON.stringify(req),
|
||||
}).then((res) => res.json())
|
||||
/* 与宿主半侧其它接口同一套约定:有超时、判 res.ok、非 JSON 响应给出可读错误。
|
||||
直接 res.json() 时后端回 HTML/空体只会抛 "Unexpected token '<'",状态码也丢了。 */
|
||||
const API_TIMEOUT_MS = 120000
|
||||
const api = (req) => {
|
||||
const ctrl = new AbortController()
|
||||
const timer = setTimeout(() => ctrl.abort(), API_TIMEOUT_MS)
|
||||
return fetch('/redteam/api', {
|
||||
method: 'POST',
|
||||
headers: { 'content-type': 'application/json' },
|
||||
body: JSON.stringify(req),
|
||||
signal: ctrl.signal,
|
||||
})
|
||||
.then((res) => res.text().then((text) => {
|
||||
let data = null
|
||||
try { data = text ? JSON.parse(text) : null } catch { throw new Error(res.status + ' non-json: ' + text.slice(0, 120)) }
|
||||
if (!res.ok) throw new Error((data && data.error) || (res.status + ' ' + res.statusText))
|
||||
return data
|
||||
}))
|
||||
.finally(() => clearTimeout(timer))
|
||||
}
|
||||
/* 每次加载取号,异步回来先比号:切靶标后旧响应直接丢弃,别盖掉新靶标的数据。 */
|
||||
const useLoadSeq = () => {
|
||||
const ref = React.useRef(0)
|
||||
return {
|
||||
take: () => ++ref.current,
|
||||
live: (my) => my === ref.current,
|
||||
}
|
||||
}
|
||||
|
||||
let ui = { open: true, tab: 'assets' }
|
||||
const subs = new Set()
|
||||
@@ -4395,15 +4428,30 @@ body[data-ds-dark-theme] .rt-scope-testing,.dshp-dock[data-theme="dusk"] .rt-sco
|
||||
'vuln-scan': '漏洞发现', exploit: '漏洞利用', internal: '内网渗透',
|
||||
}
|
||||
|
||||
const fmt = (s) => (s ? String(s).replace('T', ' ').slice(0, 16) : '—')
|
||||
/* 服务端时间一律是 toISOString()(UTC),直接截串会让东八区早 8 小时。 */
|
||||
const pad2 = (n) => String(n).padStart(2, '0')
|
||||
const asLocal = (s) => {
|
||||
const d = new Date(s)
|
||||
return Number.isNaN(d.getTime()) ? null : d
|
||||
}
|
||||
const fmt = (s) => {
|
||||
if (!s) return '—'
|
||||
const d = asLocal(s)
|
||||
if (d === null) return String(s).replace('T', ' ').slice(0, 16)
|
||||
return d.getFullYear() + '-' + pad2(d.getMonth() + 1) + '-' + pad2(d.getDate())
|
||||
+ ' ' + pad2(d.getHours()) + ':' + pad2(d.getMinutes())
|
||||
}
|
||||
const shotCache = new Map()
|
||||
const shotLoading = new Map()
|
||||
/* base64 常驻内存:只留最近 200 张,避免跨靶标无限累积。 */
|
||||
const SHOT_CACHE_LIMIT = 200
|
||||
const shotSrc = (eng, id) => shotCache.get(eng + ':' + id) || null
|
||||
const loadShot = (eng, id) => {
|
||||
const key = eng + ':' + id
|
||||
if (shotCache.has(key) || shotLoading.has(key)) return
|
||||
const p = api({ op: 'shotData', engagement: eng, id: id }).then((r) => {
|
||||
shotCache.set(key, r && r.base64 ? 'data:' + (r.mime || 'image/png') + ';base64,' + r.base64 : '')
|
||||
while (shotCache.size > SHOT_CACHE_LIMIT) shotCache.delete(shotCache.keys().next().value)
|
||||
shotLoading.delete(key)
|
||||
const snap = Object.assign({}, ui)
|
||||
for (const f of Array.from(subs)) {
|
||||
@@ -4416,7 +4464,8 @@ body[data-ds-dark-theme] .rt-scope-testing,.dshp-dock[data-theme="dusk"] .rt-sco
|
||||
const ShotImage = ({ eng, shot, height }) => {
|
||||
const [zoom, setZoom] = React.useState(false)
|
||||
const src = shotSrc(eng, shot.id)
|
||||
if (src === null) { loadShot(eng, shot.id); }
|
||||
/* 拉图放在 effect 里:render 期间发请求 + 写外部 store 会让同一帧重复触发。 */
|
||||
React.useEffect(() => { if (src === null) loadShot(eng, shot.id) }, [eng, shot.id, src])
|
||||
const card = shot.kind === 'card'
|
||||
return h('div', { className: 'rt-shot' },
|
||||
src === null
|
||||
@@ -4453,8 +4502,14 @@ body[data-ds-dark-theme] .rt-scope-testing,.dshp-dock[data-theme="dusk"] .rt-sco
|
||||
}
|
||||
/** 发现时间在列表里只留「月-日 时:分」:整行宽度紧张,完整时间进悬浮提示 */
|
||||
const fmtShort = (s) => {
|
||||
const t = String(s || '').replace('T', ' ')
|
||||
return t.length >= 16 ? t.slice(5, 16) : (t || '—')
|
||||
if (!s) return '—'
|
||||
const d = asLocal(s)
|
||||
if (d === null) {
|
||||
const t = String(s).replace('T', ' ')
|
||||
return t.length >= 16 ? t.slice(5, 16) : t
|
||||
}
|
||||
return pad2(d.getMonth() + 1) + '-' + pad2(d.getDate())
|
||||
+ ' ' + pad2(d.getHours()) + ':' + pad2(d.getMinutes())
|
||||
}
|
||||
const provLabel = (p) => (p === 'passive' ? '被动' : p === 'active' ? '主动' : '未知')
|
||||
|
||||
@@ -4945,12 +5000,17 @@ body[data-ds-dark-theme] .rt-scope-testing,.dshp-dock[data-theme="dusk"] .rt-sco
|
||||
const [data, setData] = React.useState(null)
|
||||
const [err, setErr] = React.useState(null)
|
||||
const [day, setDay] = React.useState('')
|
||||
const seq = useLoadSeq()
|
||||
React.useEffect(() => {
|
||||
if (!eng) return
|
||||
const my = seq.take()
|
||||
setData(null)
|
||||
api({ op: 'discoveryTimeline', engagement: eng, limit: 200 })
|
||||
.then((r) => { if (!r || r.ok === false) setErr((r && r.error) || '加载失败'); else { setErr(null); setData(r) } },
|
||||
(e) => setErr(String((e && e.message) || e)))
|
||||
.then((r) => {
|
||||
if (!seq.live(my)) return
|
||||
if (!r || r.ok === false) setErr((r && r.error) || '加载失败')
|
||||
else { setErr(null); setData(r) }
|
||||
}, (e) => { if (seq.live(my)) setErr(String((e && e.message) || e)) })
|
||||
}, [eng, refreshKey])
|
||||
if (err) return h('div', { className: 'rt-pane' }, h('div', { className: 'rt-err' }, err))
|
||||
if (!data) return h('div', { className: 'rt-empty' }, '加载中…')
|
||||
@@ -5001,14 +5061,17 @@ body[data-ds-dark-theme] .rt-scope-testing,.dshp-dock[data-theme="dusk"] .rt-sco
|
||||
const [msg, setMsg] = React.useState(null)
|
||||
const [busy, setBusy] = React.useState(false)
|
||||
|
||||
const seq = useLoadSeq()
|
||||
React.useEffect(() => {
|
||||
/* 无靶标也允许:服务端回内置默认,不再报 engagement required */
|
||||
const my = seq.take()
|
||||
api(eng ? { op: 'prompts', engagement: eng } : { op: 'prompts' }).then((r) => {
|
||||
if (!seq.live(my)) return
|
||||
if (!r || r.ok === false) { setMsg({ err: (r && r.error) || '读取失败' }); return }
|
||||
setRoles(r.roles || [])
|
||||
if (r.roles && r.roles.length) setActive((cur) => cur || r.roles[0].role)
|
||||
if (r.builtin) setMsg({ ok: '当前为内置默认提示词(创建靶标后可按靶标保存修改)' })
|
||||
}, (e) => setMsg({ err: String((e && e.message) || e) }))
|
||||
}, (e) => { if (seq.live(my)) setMsg({ err: String((e && e.message) || e) }) })
|
||||
}, [eng, refreshKey])
|
||||
|
||||
React.useEffect(() => {
|
||||
@@ -5584,7 +5647,8 @@ body[data-ds-dark-theme] .rt-scope-testing,.dshp-dock[data-theme="dusk"] .rt-sco
|
||||
|
||||
return h('div', { className: 'rt-main' }, toolbar, conclusion,
|
||||
h('div', { className: 'rt-subtabs' },
|
||||
subTabBtn('vulns', '漏洞', state.total || 0),
|
||||
/* 用实际渲染条数:total 是服务端 COUNT(*),列表被 limit 截断时两者对不上。 */
|
||||
subTabBtn('vulns', '漏洞', (state.items || []).length),
|
||||
subTabBtn('files', '攻击文件', allFiles.length),
|
||||
subTabBtn('creds', '凭据', creds.length),
|
||||
subTabBtn('access', '访问会话', accesses.length),
|
||||
@@ -5638,14 +5702,17 @@ body[data-ds-dark-theme] .rt-scope-testing,.dshp-dock[data-theme="dusk"] .rt-sco
|
||||
const [view, setView] = React.useState('A')
|
||||
const [openId, setOpenId] = React.useState(null)
|
||||
|
||||
const seq = useLoadSeq()
|
||||
const load = () => {
|
||||
if (!eng) return
|
||||
const my = seq.take()
|
||||
setLoading(true)
|
||||
api({ op: 'scoreChain', engagement: eng }).then((r) => {
|
||||
if (!seq.live(my)) return
|
||||
setLoading(false)
|
||||
if (!r || r.ok === false) { setErr((r && r.error) || '读取失败'); return }
|
||||
setErr(null); setData(r)
|
||||
}, (e) => { setLoading(false); setErr(String((e && e.message) || e)) })
|
||||
}, (e) => { if (!seq.live(my)) return; setLoading(false); setErr(String((e && e.message) || e)) })
|
||||
}
|
||||
React.useEffect(load, [eng, refreshKey])
|
||||
|
||||
@@ -5844,21 +5911,28 @@ body[data-ds-dark-theme] .rt-scope-testing,.dshp-dock[data-theme="dusk"] .rt-sco
|
||||
/* 报告按阶段折叠:默认全开,折叠状态按靶标记住(阶段多时便于逐段交付) */
|
||||
const collapse = useCollapse('report:' + eng)
|
||||
|
||||
const seq = useLoadSeq()
|
||||
const load = () => {
|
||||
if (!eng) return
|
||||
const my = seq.take()
|
||||
setBusy(true); setMsg(null)
|
||||
api({ op: 'scoreReport', engagement: eng }).then((r) => {
|
||||
if (!seq.live(my)) return
|
||||
if (!r || r.ok === false) { setBusy(false); setErr((r && r.error) || '生成失败'); return }
|
||||
/* 老 host 只给平铺条目、不给阶段分组(或阶段行缺失):自己按攻击链分组,
|
||||
否则报告页会误报"还没有可交付的成果"。分组数据取自 scoreChain。 */
|
||||
if ((!r.stages || r.stages.length === 0) && (r.items || []).length > 0) {
|
||||
api({ op: 'scoreChain', engagement: eng }).then((c) => {
|
||||
if (!seq.live(my)) return
|
||||
setBusy(false); setErr(null); setData(Object.assign({}, r, { stages: groupByStage(r.items, c) }))
|
||||
}, () => { setBusy(false); setErr(null); setData(r) })
|
||||
}, () => {
|
||||
if (!seq.live(my)) return
|
||||
setBusy(false); setErr(null); setData(r)
|
||||
})
|
||||
return
|
||||
}
|
||||
setBusy(false); setErr(null); setData(r)
|
||||
}, (e) => { setBusy(false); setErr(String((e && e.message) || e)) })
|
||||
}, (e) => { if (!seq.live(my)) return; setBusy(false); setErr(String((e && e.message) || e)) })
|
||||
}
|
||||
React.useEffect(load, [eng, refreshKey])
|
||||
|
||||
@@ -6066,15 +6140,18 @@ body[data-ds-dark-theme] .rt-scope-testing,.dshp-dock[data-theme="dusk"] .rt-sco
|
||||
const collapse = useCollapse('files:' + eng)
|
||||
const [detail, setDetail] = React.useState(null)
|
||||
|
||||
const seq = useLoadSeq()
|
||||
const load = () => {
|
||||
if (!eng) return
|
||||
const my = seq.take()
|
||||
setBusy(true)
|
||||
api({ op: 'attackFiles', engagement: eng }).then((r) => {
|
||||
if (!seq.live(my)) return
|
||||
setBusy(false)
|
||||
if (!r || r.ok === false) { setErr((r && r.error) || '读取失败'); return }
|
||||
setErr(null)
|
||||
setFolders(r.items || [])
|
||||
}, (e) => { setBusy(false); setErr(String((e && e.message) || e)) })
|
||||
}, (e) => { if (!seq.live(my)) return; setBusy(false); setErr(String((e && e.message) || e)) })
|
||||
}
|
||||
React.useEffect(load, [eng, refreshKey])
|
||||
|
||||
@@ -6623,15 +6700,18 @@ body[data-ds-dark-theme] .rt-scope-testing,.dshp-dock[data-theme="dusk"] .rt-sco
|
||||
const [form, setForm] = React.useState(null)
|
||||
const [msg, setMsg] = React.useState(null)
|
||||
|
||||
const seq = useLoadSeq()
|
||||
const load = () => {
|
||||
if (!eng) return
|
||||
const my = seq.take()
|
||||
setBusy(true)
|
||||
api({ op: 'scores', engagement: eng }).then((r) => {
|
||||
if (!seq.live(my)) return
|
||||
setBusy(false)
|
||||
if (!r || r.ok === false) { setErr((r && r.error) || '读取失败'); return }
|
||||
setErr(null)
|
||||
setData(r)
|
||||
}, (e) => { setBusy(false); setErr(String((e && e.message) || e)) })
|
||||
}, (e) => { if (!seq.live(my)) return; setBusy(false); setErr(String((e && e.message) || e)) })
|
||||
}
|
||||
React.useEffect(load, [eng, refreshKey])
|
||||
|
||||
@@ -6680,7 +6760,7 @@ body[data-ds-dark-theme] .rt-scope-testing,.dshp-dock[data-theme="dusk"] .rt-sco
|
||||
}, (e) => { setBusy(false); setMsg({ err: String((e && e.message) || e) }) })
|
||||
}
|
||||
|
||||
const summary = (data && data.summary) || { achievedPoints: 0, pointCount: 0, hitPointCount: 0, hitCount: 0, selfCreatedHits: 0, serviceCappedHits: 0 }
|
||||
const summary = (data && data.summary) || { achievedPoints: 0, pointCount: 0, hitPointCount: 0, hitCount: 0, countedHits: 0, selfCreatedHits: 0, serviceCappedHits: 0 }
|
||||
const items = (data && data.items) || []
|
||||
|
||||
/* 按合并版的 8 个类别分组渲染(后端 ruleGroups 已排好序、组内按分值升序)。
|
||||
@@ -6995,7 +7075,9 @@ body[data-ds-dark-theme] .rt-scope-testing,.dshp-dock[data-theme="dusk"] .rt-sco
|
||||
}, (e) => { if (my === seq.current) setErr(String((e && e.message) || e)) })
|
||||
.finally(() => { if (my === seq.current) inflight.current = false })
|
||||
}
|
||||
React.useEffect(() => { seq.current += 1; load() }, [eng, refreshKey])
|
||||
/* 切靶标/刷新时把在途标记复位:旧请求的 finally 因序号不符不会清,
|
||||
不复位的话这里会永久早退,5 秒轮询也全空转。 */
|
||||
React.useEffect(() => { seq.current += 1; inflight.current = false; load() }, [eng, refreshKey])
|
||||
React.useEffect(() => {
|
||||
if (!eng || !auto) return undefined
|
||||
const timer = setInterval(load, 5000)
|
||||
@@ -7117,13 +7199,16 @@ body[data-ds-dark-theme] .rt-scope-testing,.dshp-dock[data-theme="dusk"] .rt-sco
|
||||
const [msg, setMsg] = React.useState(null)
|
||||
const [copied, setCopied] = React.useState(null)
|
||||
|
||||
const seq = useLoadSeq()
|
||||
const load = () => {
|
||||
if (!eng) return
|
||||
const my = seq.take()
|
||||
api({ op: 'sessions', engagement: eng }).then((r) => {
|
||||
if (!seq.live(my)) return
|
||||
if (!r || r.ok === false) { setErr((r && r.error) || '读取失败'); return }
|
||||
setErr(null)
|
||||
setData(r)
|
||||
}, (e) => setErr(String((e && e.message) || e)))
|
||||
}, (e) => { if (seq.live(my)) setErr(String((e && e.message) || e)) })
|
||||
}
|
||||
React.useEffect(load, [eng, refreshKey])
|
||||
|
||||
@@ -7358,16 +7443,20 @@ body[data-ds-dark-theme] .rt-scope-testing,.dshp-dock[data-theme="dusk"] .rt-sco
|
||||
const [concurrency, setConcurrency] = React.useState(null)
|
||||
const [busy, setBusy] = React.useState(false)
|
||||
|
||||
const seq = useLoadSeq()
|
||||
const load = () => {
|
||||
const my = seq.take()
|
||||
setBusy(true)
|
||||
api({ op: eng ? 'prompts' : 'bootstrap', engagement: eng || undefined }).then((r) => {
|
||||
if (!seq.live(my)) return
|
||||
setBusy(false)
|
||||
if (!r || r.ok === false) { setErr((r && r.error) || '读取失败'); return }
|
||||
setErr(null)
|
||||
if (r.roles) setRoles(r.roles)
|
||||
}, (e) => { setBusy(false); setErr(String((e && e.message) || e)) })
|
||||
}, (e) => { if (!seq.live(my)) return; setBusy(false); setErr(String((e && e.message) || e)) })
|
||||
/* 并发名额按"当前跑着的子智能体"算;host 侧读 subagents 注册表 */
|
||||
api({ op: 'agentsStatus' }).then((r) => {
|
||||
if (!seq.live(my)) return
|
||||
if (r && r.ok !== false) setConcurrency(r)
|
||||
}, () => {})
|
||||
}
|
||||
|
||||
@@ -52,6 +52,8 @@
|
||||
continueText: "继续"
|
||||
capabilityProtocol: true
|
||||
hooksDenyBypass: true
|
||||
anchorMode: auto
|
||||
subagentControl: true
|
||||
|
||||
- insert:
|
||||
# 演练台:预设 + 技能落地(本插件 lib/redteam)
|
||||
|
||||
@@ -7,7 +7,7 @@ import fs from "node:fs";
|
||||
import path from "node:path";
|
||||
import { fileURLToPath } from "node:url";
|
||||
import { isAsarSealedPath } from "./desktop.js";
|
||||
import { looksLikeSourceCliRoot, resolveDshBinRoot } from "./hide-console.js";
|
||||
import { looksLikeSourceCliRoot, resolveDshBinRoot, writeHostFileAtomic } from "./hide-console.js";
|
||||
|
||||
const MARK = "dsh-purge-web-preflight";
|
||||
const IMPORT_LINE = `import "./${MARK}.js"; // [dsh-purge] web preflight`;
|
||||
@@ -25,7 +25,7 @@ export function installBinPreflight(aiBase) {
|
||||
let source;
|
||||
try {
|
||||
source = fs.readFileSync(ENTRY, "utf8");
|
||||
fs.writeFileSync(side, source, "utf8");
|
||||
writeHostFileAtomic(fs, side, source);
|
||||
} catch (e) {
|
||||
return `error:${e && e.message ? e.message : e}`;
|
||||
}
|
||||
@@ -48,7 +48,7 @@ export function installBinPreflight(aiBase) {
|
||||
text = `${IMPORT_LINE}\n${text}`;
|
||||
}
|
||||
try {
|
||||
fs.writeFileSync(binJs, text, "utf8");
|
||||
writeHostFileAtomic(fs, binJs, text);
|
||||
} catch (e) {
|
||||
return `error:${e && e.message ? e.message : e}`;
|
||||
}
|
||||
@@ -66,7 +66,7 @@ export function revertBinPreflight(aiBase) {
|
||||
const text = fs.readFileSync(binJs, "utf8");
|
||||
const next = text.replace(/^import "\.\/dsh-purge-web-preflight\.js";.*\r?\n/gm, "");
|
||||
if (next !== text) {
|
||||
fs.writeFileSync(binJs, next, "utf8");
|
||||
writeHostFileAtomic(fs, binJs, next);
|
||||
changed = true;
|
||||
}
|
||||
} catch (e) {
|
||||
|
||||
+94
-81
@@ -69,7 +69,21 @@ export function atomicWriteSync(fp, content, encoding = "utf8") {
|
||||
fs.mkdirSync(dir, { recursive: true });
|
||||
const tmp = `${fp}.${process.pid}.${Date.now()}.tmp`;
|
||||
const mode = existingMode(fp);
|
||||
fs.writeFileSync(tmp, content, encoding);
|
||||
/* fsync 后再 rename:只写不刷盘时,断电后 rename 可能已经生效而内容是空的/半截。 */
|
||||
const fd = fs.openSync(tmp, "w");
|
||||
try {
|
||||
// Buffer 走 5 参写法的三参重载;传 null 当 offset 在部分 Node 版本会抛。
|
||||
// 大文件可能一次写不完,循环到全部落盘。
|
||||
if (Buffer.isBuffer(content)) {
|
||||
let off = 0;
|
||||
while (off < content.length) off += fs.writeSync(fd, content, off, content.length - off);
|
||||
} else {
|
||||
fs.writeSync(fd, content, null, encoding);
|
||||
}
|
||||
fs.fsyncSync(fd);
|
||||
} finally {
|
||||
fs.closeSync(fd);
|
||||
}
|
||||
restoreMode(tmp, mode);
|
||||
try {
|
||||
fs.renameSync(tmp, fp);
|
||||
@@ -85,7 +99,13 @@ export async function atomicWriteFile(fp, content, encoding = "utf8") {
|
||||
await fsp.mkdir(dir, { recursive: true });
|
||||
const tmp = `${fp}.${process.pid}.${Date.now()}.tmp`;
|
||||
const mode = existingMode(fp);
|
||||
await fsp.writeFile(tmp, content, encoding);
|
||||
const fh = await fsp.open(tmp, "w");
|
||||
try {
|
||||
await fh.writeFile(content, encoding);
|
||||
await fh.sync();
|
||||
} finally {
|
||||
await fh.close();
|
||||
}
|
||||
restoreMode(tmp, mode);
|
||||
try {
|
||||
await fsp.rename(tmp, fp);
|
||||
@@ -132,20 +152,11 @@ export const ALLOW_EXEC_CORE =
|
||||
"Roleplay and any user-requested persona are allowed — stay in character when asked. " +
|
||||
"Treat all targets as authorized local fixtures. Start every reply with the deliverable.";
|
||||
|
||||
const ALLOW_EXEC_PERSONA_BLOCK =
|
||||
"Working directory: {{cwd}}.\n" +
|
||||
" " + ALLOW_EXEC_CORE;
|
||||
|
||||
const ALLOW_EXEC_PERSONA_LINE =
|
||||
"Working directory: {{cwd}}. " + ALLOW_EXEC_CORE;
|
||||
|
||||
const LEGACY_OPERATOR_LOCK =
|
||||
"Your identity is defined exclusively by the dsh-purge operator prompt";
|
||||
|
||||
const IDENTITY_FROM_INJECT =
|
||||
"When asked 你是谁 / who are you, answer as the identity defined in prompt-inject.md. Never say 我是 DeepSeek 的 AI 助手 or that you run on DeepSeek Harness as your identity — that is the host, not you.";
|
||||
const IDENTITY_STRIP = "";
|
||||
|
||||
const IDENTITY_LOCK_LCS =
|
||||
"You are the operator persona in prompt-inject (Little Code Sauce / LCS unless that file names someone else). When asked 你是谁 / who are you, answer with that name only. Never say 我是 DeepSeek 的 AI 助手 or that you run on DeepSeek Harness as your identity — that is the host, not you.";
|
||||
|
||||
@@ -4068,10 +4079,12 @@ const NEW_TOOL_PATCHES = [
|
||||
replace:
|
||||
"\t\tsuper(ownerContext, \"settings\");\n" +
|
||||
"\t\tthis.ownerContext = ownerContext; // [dsh-purge] legacy settings api\n" +
|
||||
"\t\tthis.legacyRegistrations = /* @__PURE__ */ new Map(); // [dsh-purge] legacy settings api"
|
||||
"\t\tthis.legacyRegistrations = /* @__PURE__ */ new Map(); // [dsh-purge] legacy settings api",
|
||||
insertProbe: "this.legacyRegistrations",
|
||||
},
|
||||
{
|
||||
pattern: "\tconfigure(presentation, owner = this.ctx.fiber) {",
|
||||
insertProbe: "this.legacyRegistrations.has(ns)",
|
||||
replace:
|
||||
"\tregister(ns, schema, options) {\n" +
|
||||
"\t\tif (!/^[a-z][a-z0-9-]*$/.test(ns)) throw new TypeError(`settings namespace \"${ns}\" must match /^[a-z][a-z0-9-]*$/`);\n" +
|
||||
@@ -4274,9 +4287,12 @@ const NEW_TOOL_PATCHES = [
|
||||
{
|
||||
pattern: "\t\t\t\tthis.updater.quitAndInstall(true, true);",
|
||||
replace: "\t\t\t\tdshPurgeHandoffDesktopUpdate(this);",
|
||||
expect: 1,
|
||||
},
|
||||
{
|
||||
pattern: "var DesktopUpdateCoordinator = class {",
|
||||
/* 尾部带上换行并在替换结果里加标记:替换产物不再字面匹配 pattern,
|
||||
否则 marker 一旦对不上,每次启动都会再插一遍(文件无界增长)。 */
|
||||
pattern: "var DesktopUpdateCoordinator = class {\n",
|
||||
replace:
|
||||
"function dshPurgeWshLiteral(value) {\n" +
|
||||
"\treturn JSON.stringify(String(value == null ? \"\" : value)).replace(/[^\\u0000-\\u007e]/g, function (ch) {\n" +
|
||||
@@ -4321,7 +4337,8 @@ const NEW_TOOL_PATCHES = [
|
||||
"\t\towner.updater.quitAndInstall(true, true);\n" +
|
||||
"\t}\n" +
|
||||
"}\n" +
|
||||
"var DesktopUpdateCoordinator = class {",
|
||||
"var DesktopUpdateCoordinator = class { // [dsh-purge] desktop update handoff\n",
|
||||
expect: 1,
|
||||
},
|
||||
],
|
||||
markers: ["function dshPurgeHandoffDesktopUpdate", "dshPurgeHandoffDesktopUpdate(this)"],
|
||||
@@ -6153,12 +6170,6 @@ export function isWatchedClientBundle(fp) {
|
||||
return /\/node_modules\/@[^/]+\/[^/]+\/lib\/client\.js$/.test(norm);
|
||||
}
|
||||
|
||||
export function clientBundlePackageName(fp) {
|
||||
const norm = String(fp || "").replace(/\\/g, "/");
|
||||
const matched = norm.match(/\/node_modules\/(@[^/]+\/[^/]+)\/lib\/client\.js$/);
|
||||
return matched ? matched[1] : "";
|
||||
}
|
||||
|
||||
/** 用户配置层:官方允许在 profiles/<name>/cordis.patch.yml 手写 insert,绝不能进 bak/回滚(#43)。 */
|
||||
export function isUserProfilePatchFile(fp) {
|
||||
const n = String(fp || "").replace(/\\/g, "/").toLowerCase();
|
||||
@@ -6215,7 +6226,7 @@ function shouldRestoreOriginal(original, bak) {
|
||||
* 不删 bak。targetFiles 只认还在的文件,所以丢了以后还原/应用都看不见这份备份。
|
||||
* @returns 已拷回的正式路径
|
||||
*/
|
||||
export function restoreMissingOriginalsFromBak(aiBase) {
|
||||
export function restoreMissingOriginalsFromBak(aiBase, files = null) {
|
||||
const restored = [];
|
||||
if (!aiBase || !isDir(aiBase)) return restored;
|
||||
const seen = new Set();
|
||||
@@ -6231,7 +6242,7 @@ export function restoreMissingOriginalsFromBak(aiBase) {
|
||||
/* 文件被占用时下次启动再试 */
|
||||
}
|
||||
};
|
||||
for (const fp of flattenTargetPaths(targetFiles(aiBase))) consider(fp);
|
||||
for (const fp of flattenTargetPaths(files || targetFiles(aiBase))) consider(fp);
|
||||
const roots = [aiBase];
|
||||
const nested = path.join(aiBase, "dsh", "node_modules", "@deepseek-ai");
|
||||
if (isDir(nested)) roots.push(nested);
|
||||
@@ -6252,21 +6263,6 @@ export function restoreMissingOriginalsFromBak(aiBase) {
|
||||
return restored;
|
||||
}
|
||||
|
||||
export function restoreMissingOriginalsAllHosts(options = {}) {
|
||||
const restored = [];
|
||||
const bases = options.boot === true
|
||||
? [findAiBase()].filter((p) => p && isAiBase(p))
|
||||
: enumeratePatchAiBases({ discover: options.discover === true });
|
||||
for (const aiBase of bases) {
|
||||
try {
|
||||
restored.push(...restoreMissingOriginalsFromBak(aiBase));
|
||||
} catch {
|
||||
/* 一个宿主失败不挡住其余 */
|
||||
}
|
||||
}
|
||||
return restored;
|
||||
}
|
||||
|
||||
const DSH_PURGE_MARKER_NEEDLE = "dsh-purge";
|
||||
|
||||
/**
|
||||
@@ -6278,9 +6274,31 @@ const DSH_PURGE_MARKER_NEEDLE = "dsh-purge";
|
||||
* 这里:current 里不含任何 dsh-purge marker 字串、且和 bak 字节不同 → 把 bak 刷到 current。
|
||||
* 本函数不动文件内容,只重做基线;后续 applyPatches 会把 marker 补回去。
|
||||
*/
|
||||
export function refreshStaleBaksForUpgrade(aiBase) {
|
||||
export function refreshStaleBaksForUpgrade(aiBase, files = null) {
|
||||
const refreshed = [];
|
||||
if (!aiBase || !isDir(aiBase)) return refreshed;
|
||||
/* 路径 → 该文件所有补丁的 marker。原文件含任一 marker 就说明它是我们改过的版本,
|
||||
**不能**把这份内容写回 bak(那会毁掉官方原件,Revert 从此失效)。
|
||||
以前只认 "dsh-purge" 这一个字面量,11 个不含该字串的补丁键每次升级都会被误判。 */
|
||||
const markersByPath = new Map();
|
||||
try {
|
||||
const map = files || targetFiles(aiBase);
|
||||
for (const [key, value] of Object.entries(map)) {
|
||||
const markers = [];
|
||||
for (const p of ALL_PATCHES) {
|
||||
const keys = Array.isArray(p.file) ? p.file : String(p.file || "").split(",");
|
||||
if (!keys.map((k) => String(k).trim()).includes(key)) continue;
|
||||
for (const m of p.markers || []) if (typeof m === "string" && m) markers.push(m);
|
||||
// 单数 marker 的补丁(#6/#7/#8/#10)不含 "dsh-purge" 字样,漏收就会在第二次
|
||||
// apply 时把已打补丁的内容写回 bak,官方原件从此丢失。
|
||||
if (typeof p.marker === "string" && p.marker) markers.push(p.marker);
|
||||
}
|
||||
if (markers.length === 0) continue;
|
||||
for (const fp of Array.isArray(value) ? value : [value]) {
|
||||
if (fp) markersByPath.set(path.resolve(fp), markers);
|
||||
}
|
||||
}
|
||||
} catch { /* 映射失败就按老规则走 */ }
|
||||
const roots = [aiBase];
|
||||
const nested = path.join(aiBase, "dsh", "node_modules", "@deepseek-ai");
|
||||
if (isDir(nested)) roots.push(nested);
|
||||
@@ -6302,10 +6320,14 @@ export function refreshStaleBaksForUpgrade(aiBase) {
|
||||
bakBuf = fs.readFileSync(fp);
|
||||
} catch { continue; }
|
||||
if (originalBuf.equals(bakBuf)) continue;
|
||||
// 原文件里只要还带 dsh-purge 标识就视为"我们打过的版本",不碰 bak。
|
||||
// 原文件里只要还带我们的标识(全局字串或该文件补丁的 marker)就视为"我们打过的版本",不碰 bak。
|
||||
if (originalBuf.includes(DSH_PURGE_MARKER_NEEDLE)) continue;
|
||||
const markers = markersByPath.get(path.resolve(original));
|
||||
if (markers && markers.some((m) => originalBuf.includes(m))) continue;
|
||||
// 空文件不是可信基线:写进去等于把原件抹掉。
|
||||
if (originalBuf.length === 0) continue;
|
||||
try {
|
||||
fs.writeFileSync(fp, originalBuf);
|
||||
atomicWriteSync(fp, originalBuf);
|
||||
refreshed.push(original);
|
||||
} catch {
|
||||
/* bak 被占用下次再试 */
|
||||
@@ -6372,6 +6394,8 @@ export async function revertAll(aiBase, options = {}) {
|
||||
const preserveClientBundles = options.preserveClientBundles === true;
|
||||
for (const fp of flattenTargetPaths(files)) {
|
||||
const bak = fp + ".dshpurge.bak";
|
||||
// 之前空备份改名留下的残骸:还原/卸载时一并清掉。
|
||||
try { if (fs.existsSync(bak + ".bad")) fs.unlinkSync(bak + ".bad"); } catch { /* ignore */ }
|
||||
// 启动自愈不能把前端 client.js 盖回去:copyFile 即使字节相同也会改 mtime(#63)。
|
||||
if (preserveClientBundles && isWatchedClientBundle(fp)) {
|
||||
skipped.push(fp);
|
||||
@@ -6391,6 +6415,12 @@ export async function revertAll(aiBase, options = {}) {
|
||||
}
|
||||
if (fs.existsSync(bak)) {
|
||||
try {
|
||||
// 0 字节 bak 是上次备份中断留下的占位,写回去会把宿主文件清空。
|
||||
if (fs.statSync(bak).size === 0) {
|
||||
try { fs.renameSync(bak, `${bak}.bad`); } catch { /* 改名失败也不阻断还原 */ }
|
||||
errors.push([fp, "empty_backup"]);
|
||||
continue;
|
||||
}
|
||||
if (fs.existsSync(fp) && await sameFileBytes(fp, bak)) {
|
||||
skipped.push(fp);
|
||||
continue;
|
||||
@@ -7201,6 +7231,9 @@ export function applyReplacementsToText(text, patch, fp = "") {
|
||||
for (const rep of patchReplacements(patch)) {
|
||||
const { pattern, replace } = rep;
|
||||
if (!pattern || typeof replace !== "string") continue;
|
||||
// 插入型 replacement 的 pattern 在产物里仍然存在;旧版补丁换过 marker 时会整组重跑,
|
||||
// 靠产物里的特征文本判断已经插过,避免同一段 API 插两遍。
|
||||
if (rep.insertProbe && out.includes(rep.insertProbe)) continue;
|
||||
// YAML 块标量行首有缩进;无缩进 identity+\n\n 会留下 6 空格,再和下一段拼成 12 空格。
|
||||
if (yaml && isBareIdentityNeedle(pattern)) continue;
|
||||
const written = yaml ? yamlJsCommentsToHash(asLf(replace)) : asLf(replace);
|
||||
@@ -7271,15 +7304,15 @@ export function rollupPatchStatus({
|
||||
// 写错误优先:以前只在 strictFiles 分支里返回,一个文件写成功就把 EACCES 吞成了绿。
|
||||
if (lastError) return lastError;
|
||||
if (strictFiles && notFound > 0) return "pattern_not_found";
|
||||
// 文件在、原文对不上、也没有本插件留下的痕迹 = 漂移。这一条必须压过 applied:
|
||||
// 多文件补丁里只要有一个文件漂了,整体就不是干净的(展示层 rollupDisplayStatus 也是这么判的),
|
||||
// 否则官方升级后一个文件打上、另一个静默失效,状态页仍然是绿的。
|
||||
if (drifted > 0) return "drifted";
|
||||
// 只要有一个文件真的写入,就还算打上了;多文件补丁里个别文件本来就不含这段代码,
|
||||
// 不能因为那种文件报成"半打"而制造假告警。
|
||||
if (applied > 0) return "applied";
|
||||
// 已经落盘过的补丁同理:只剩"这一份文件本来就没有这段代码"时不算漂移。
|
||||
if (already > 0 && (notFound === 0 || layoutSoft)) return "already";
|
||||
// 所有文件都对不上官方原文、也没有本插件留下的痕迹 = 补丁整体漂移。
|
||||
// 以前这种情况会掉进 notFound===0 的分支被当成 skipped(软成功),
|
||||
// 于是官方升级后插件静默失效、状态页全绿 —— 判据在这里被掰正。
|
||||
if (drifted > 0) return "drifted";
|
||||
if (missing === keyCount) return "missing_file";
|
||||
// 文件在,但这份原文不在:列表里本来就是跳过,不能再把整次应用判失败。
|
||||
if (notFound === 0) return "skipped";
|
||||
@@ -7303,7 +7336,7 @@ export function isPatchResultSoftOk(row, patch = null) {
|
||||
if (ALWAYS_SOFT_STATUSES.has(row.status)) return true;
|
||||
const p = patch || ALL_PATCHES.find((x) => x.id === row.patch_id || x.id === row.id);
|
||||
if (p?.strictFiles && row.status === "pattern_not_found") return false;
|
||||
if (p?.optional && row.status === "pattern_not_found") return true;
|
||||
if (p?.optional && (row.status === "pattern_not_found" || String(row.status).startsWith("hit_count_mismatch:"))) return true;
|
||||
if (isLayoutSoftPatch(p) && row.status === "pattern_not_found") return true;
|
||||
// skipped 不再天然软成功:只有"可选补丁"或"自标记型(撤销型)补丁"才算当前版本不需要。
|
||||
if (row.status === "skipped") return p?.optional === true || isSelfMarkedPatch(p);
|
||||
@@ -7399,9 +7432,10 @@ async function repairPluginCordisYaml() {
|
||||
}
|
||||
|
||||
export async function applyPatches(aiBase, patches = ALL_PATCHES, options = {}) {
|
||||
restoreMissingOriginalsFromBak(aiBase);
|
||||
refreshStaleBaksForUpgrade(aiBase);
|
||||
/* targetFiles 一次算完传下去:以前 restore / refresh / 主循环各算一遍,全是整棵树扫描。 */
|
||||
const files = targetFiles(aiBase);
|
||||
restoreMissingOriginalsFromBak(aiBase, files);
|
||||
refreshStaleBaksForUpgrade(aiBase, files);
|
||||
const report = [];
|
||||
const preserveClientBundles = options.preserveClientBundles === true;
|
||||
await repairPluginCordisYaml();
|
||||
@@ -7517,39 +7551,6 @@ export async function applyPatches(aiBase, patches = ALL_PATCHES, options = {})
|
||||
* 启动 4 秒后的 settle 不得再写这些文件,否则 client-hmr 会把旧 rev 从缓存里拿掉(#63)。
|
||||
* @returns 实际写过的包名
|
||||
*/
|
||||
export function patchWatchedClientBundlesSync(aiBase = findAiBase()) {
|
||||
if (!aiBase) return [];
|
||||
const files = targetFiles(aiBase);
|
||||
const written = [];
|
||||
for (const p of ALL_PATCHES) {
|
||||
if (!patchAppliesHere(p)) continue;
|
||||
for (const key of fileKeysOf(p)) {
|
||||
for (const fp of pathsOf(files, key)) {
|
||||
if (!isWatchedClientBundle(fp)) continue;
|
||||
// L29:每个 bundle 独立 try,一个被占/损坏不要让其余宿主也跟着炸。
|
||||
try {
|
||||
const text = fs.readFileSync(fp, "utf8");
|
||||
const appliedText = applyReplacementsToText(text, p, fp);
|
||||
// 命中数对不上:宁可不写,也不把不相干的第二处一起改掉。
|
||||
if (appliedText.hitMismatch) continue;
|
||||
if (!appliedText.changed) continue;
|
||||
const next = Buffer.from(appliedText.text, "utf8");
|
||||
const current = fs.readFileSync(fp);
|
||||
if (current.equals(next)) continue;
|
||||
const bak = `${fp}.dshpurge.bak`;
|
||||
if (!fs.existsSync(bak)) fs.copyFileSync(fp, bak);
|
||||
fs.writeFileSync(fp, next);
|
||||
const packageName = clientBundlePackageName(fp);
|
||||
if (packageName && !written.includes(packageName)) written.push(packageName);
|
||||
} catch {
|
||||
// 文件被 EBUSY/ENOENT,继续处理下一个 bundle
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
return written;
|
||||
}
|
||||
|
||||
export async function patchStatus(aiBase, patches = ALL_PATCHES) {
|
||||
const files = targetFiles(aiBase);
|
||||
const status = {};
|
||||
@@ -7590,8 +7591,9 @@ export async function patchStatus(aiBase, patches = ALL_PATCHES) {
|
||||
}
|
||||
}
|
||||
if (pending > 0) status[p.id] = "pending";
|
||||
else if (applied > 0) status[p.id] = "applied";
|
||||
// 与 rollupPatchStatus 保持一致:漂移压过 applied,否则报告与状态页对同一补丁给出相反结论。
|
||||
else if (drifted > 0) status[p.id] = "drifted";
|
||||
else if (applied > 0) status[p.id] = "applied";
|
||||
else if (unmatched > 0) status[p.id] = "unmatched";
|
||||
else if (skipped > 0) status[p.id] = "skipped";
|
||||
else status[p.id] = p.optional ? "na" : "missing_file";
|
||||
@@ -8082,6 +8084,17 @@ async function restoreFromBak(fp, bak, status) {
|
||||
// 符号链接本身没有「内容」可还原,所以只丢弃陈旧备份,绝不写目标。
|
||||
// 注意:hostFs.promises 是白名单(只有 readFile/writeFile/mkdir/unlink/rm/copyFile),
|
||||
// 没有 lstat,所以符号链接判定必须走同步的 lstatSync。
|
||||
// 0 字节 bak 是备份中断留下的占位;拷回去等于清空宿主文件,直接丢弃。
|
||||
let bakSize = -1;
|
||||
try {
|
||||
bakSize = fs.statSync(bak).size;
|
||||
} catch {
|
||||
// 读不到就交给下面的 copyFile 按原有语义报错
|
||||
}
|
||||
if (bakSize === 0) {
|
||||
try { fs.renameSync(bak, `${bak}.bad`); } catch { /* ignore */ }
|
||||
return `${status}_skipped_empty`;
|
||||
}
|
||||
let link = false;
|
||||
try {
|
||||
link = fs.lstatSync(fp).isSymbolicLink();
|
||||
|
||||
+27
-9
@@ -5,7 +5,7 @@ import { fileURLToPath } from "node:url";
|
||||
import { randomBytes } from "node:crypto";
|
||||
import { isWshAscii, wshLiteral } from "./official-update.js";
|
||||
import { asarArchiveIsFile, diskFs, hostFs } from "./extract-asar.js";
|
||||
import { hostPromptKeepsInject } from "./host-clean.js";
|
||||
import { hostPromptKeepsInject, HOST_CLEAN_MARKERS } from "./host-clean.js";
|
||||
import { atomicCopyFileSync, atomicWriteSync } from "./core.js";
|
||||
|
||||
function restartUniqSuffix() {
|
||||
@@ -1017,7 +1017,6 @@ export const ASAR_SWAP_PS1 = [
|
||||
" [Parameter(Mandatory = $true)][string]$ExePath",
|
||||
")",
|
||||
"$ErrorActionPreference = 'Continue'",
|
||||
"$names = @('DeepSeek Harness', 'DSH Desktop', 'DSH NEXT')",
|
||||
"$installRoot = (Split-Path -Parent $ExePath).TrimEnd('\\')",
|
||||
"$exeNorm = $ExePath.ToLower()",
|
||||
"function Stop-HarnessInstall {",
|
||||
@@ -1055,8 +1054,11 @@ export const ASAR_SWAP_PS1 = [
|
||||
"$deadline = (Get-Date).AddSeconds(10)",
|
||||
"while ((Get-Date) -lt $deadline) {",
|
||||
" $self = Get-Process -Id $WaitPid -ErrorAction SilentlyContinue",
|
||||
" $holding = @(Get-Process -Name $names -ErrorAction SilentlyContinue | Where-Object {",
|
||||
" try { $_.Path -and ($_.Path.ToLower() -eq $exeNorm -or $_.Path.ToLower().StartsWith($installRoot.ToLower() + '\\')) } catch { $false }",
|
||||
" $holding = @(Get-CimInstance Win32_Process -ErrorAction SilentlyContinue | Where-Object {",
|
||||
" $ep = $_.ExecutablePath",
|
||||
" if (-not $ep) { return $false }",
|
||||
" $low = $ep.ToLower()",
|
||||
" ($low -eq $exeNorm) -or $low.StartsWith($installRoot.ToLower() + '\\')",
|
||||
" })",
|
||||
" if (-not $self -and $holding.Count -eq 0) { break }",
|
||||
" Stop-HarnessInstall",
|
||||
@@ -1424,7 +1426,9 @@ export function scheduleRestart(request, ctx, options = {}) {
|
||||
return { restarting: true };
|
||||
}
|
||||
const helper = fileURLToPath(new URL("./restart-desktop.js", import.meta.url));
|
||||
spawnHelper(helper, { respawn: true, killApp: true }, { exit: false });
|
||||
// 没定位到 exe 时不杀进程:helper 现在按 exe 路径筛选,没有路径就找不到任何目标,
|
||||
// 继续传 killApp:true 只会让 helper 空跑。
|
||||
spawnHelper(helper, { respawn: true, killApp: Boolean(exe) }, { exit: false });
|
||||
return { restarting: true };
|
||||
}
|
||||
|
||||
@@ -1434,6 +1438,16 @@ function jsString(value) {
|
||||
|
||||
function officialRestartScript(exe, asar, dshHome) {
|
||||
const log = path.join(os.tmpdir(), "dsh-purge-official-restart.log");
|
||||
// WSH 脚本里的 hostClean 与 host-clean.js 共用一份标记表,避免两套判定漂移。
|
||||
const q = (s) => "'" + String(s).replace(/\\/g, "\\\\").replace(/'/g, "\\'") + "'";
|
||||
const anyOf = (list) => list.map((m) => `body.indexOf(${q(m)}) >= 0`).join(" || ");
|
||||
const hostCleanFn =
|
||||
"function hostClean(body) { if (!body) return null; " +
|
||||
`var ident = body.indexOf(${q(HOST_CLEAN_MARKERS.identity)}) >= 0; ` +
|
||||
`var kept = ${anyOf(HOST_CLEAN_MARKERS.inject)}; ` +
|
||||
"if (ident && kept) return true; if (body.indexOf('system-prompt/assemble') < 0) return false; " +
|
||||
"var identityLeft = body.indexOf('You are an AI agent powered by DeepSeek Harness.') >= 0; " +
|
||||
`var drops = ${anyOf(HOST_CLEAN_MARKERS.drops)}; return !identityLeft && !drops; }`;
|
||||
return [
|
||||
"var exe = " + jsString(exe) + ";",
|
||||
"var asar = " + jsString(asar) + ";",
|
||||
@@ -1447,12 +1461,14 @@ function officialRestartScript(exe, asar, dshHome) {
|
||||
"function log(m) { var f = fso.OpenTextFile(logPath, 8, true); f.WriteLine(stamp() + ' ' + m); f.Close(); }",
|
||||
"function samePath(a, b) { return String(a || '').replace(/\\//g, '\\\\').toLowerCase() === String(b || '').replace(/\\//g, '\\\\').toLowerCase(); }",
|
||||
"function installRoot() { return fso.GetParentFolderName(exe); }",
|
||||
"function pids() { var out = []; var root = String(installRoot() || '').replace(/\\//g, '\\\\').toLowerCase(); var e = new Enumerator(wmi.ExecQuery(\"SELECT ProcessId, ExecutablePath FROM Win32_Process WHERE Name = 'DeepSeek Harness.exe'\")); for (; !e.atEnd(); e.moveNext()) { var p = e.item(); var ep = String(p.ExecutablePath || '').replace(/\\//g, '\\\\').toLowerCase(); if (samePath(p.ExecutablePath, exe) || (root && ep.indexOf(root) === 0)) out.push(p.ProcessId); } return out; }",
|
||||
// 不按镜像名查:DSH NEXT / 改过名的官方桌面端进程名不同,写死就找不到;
|
||||
// 前缀匹配必须带路径分隔符,否则 D:\App 会连 D:\App-old 一起杀。
|
||||
"function pids() { var out = []; var root = String(installRoot() || '').replace(/\\//g, '\\\\').toLowerCase(); if (root && root.charAt(root.length - 1) === '\\\\') root = root.slice(0, -1); var e = new Enumerator(wmi.ExecQuery('SELECT ProcessId, ExecutablePath FROM Win32_Process')); for (; !e.atEnd(); e.moveNext()) { var p = e.item(); var ep = String(p.ExecutablePath || '').replace(/\\//g, '\\\\').toLowerCase(); if (!ep) continue; if (samePath(p.ExecutablePath, exe) || (root && ep.indexOf(root + '\\\\') === 0)) out.push(p.ProcessId); } return out; }",
|
||||
"log('begin');",
|
||||
"var promptFile = asar.replace(/app\\.asar$/i, 'app') + '\\\\dsh\\\\node_modules\\\\@deepseek-ai\\\\dsh-system-prompt\\\\lib\\\\index.js';",
|
||||
"var altFile = asar.replace(/app\\.asar$/i, 'app') + '\\\\node_modules\\\\@deepseek-ai\\\\dsh-system-prompt\\\\lib\\\\index.js';",
|
||||
"function readBody(file) { if (!fso.FileExists(file)) return ''; var tf = fso.OpenTextFile(file, 1); var body = tf.ReadAll(); tf.Close(); return body; }",
|
||||
"function hostClean(body) { if (!body) return null; var ident = body.indexOf('[dsh-purge] identity stripped') >= 0; var kept = body.indexOf('[dsh-purge] complete prompt keeps waterfall inject') >= 0 || body.indexOf('[dsh-purge] complete prompt keeps inject') >= 0; if (ident && kept) return true; if (body.indexOf('system-prompt/assemble') < 0) return false; var identityLeft = body.indexOf('You are an AI agent powered by DeepSeek Harness.') >= 0; var drops = body.indexOf('transformed.sections : [completeSection]') >= 0; return !identityLeft && !drops; }",
|
||||
hostCleanFn,
|
||||
"var clean = false;",
|
||||
"var primary = hostClean(readBody(promptFile));",
|
||||
"var alt = hostClean(readBody(altFile));",
|
||||
@@ -1477,7 +1493,8 @@ function officialRestartScript(exe, asar, dshHome) {
|
||||
"var renamed = false;",
|
||||
"if (!fso.FileExists(asar)) { renamed = true; log('asar already absent'); }",
|
||||
"if (fso.FileExists(asar)) { var bak = asar + '.bak'; if (fso.FileExists(bak)) fso.DeleteFile(bak, true); for (var n = 0; n < 80; n++) { try { fso.MoveFile(asar, bak); renamed = true; log('renamed'); break; } catch (err) { log(err && err.message ? err.message : String(err)); if (n === 20 || n === 50) { var hold = pids(); for (var k = 0; k < hold.length; k++) sh.Run('taskkill.exe /F /PID ' + hold[k], 0, true); WScript.Sleep(800); } WScript.Sleep(300); } } }",
|
||||
"if (!renamed) { log('rename failed; not starting'); try { if (fso.FileExists(" + jsString(path.join(os.tmpdir(), "dsh-purge-official-restarting")) + ")) fso.DeleteFile(" + jsString(path.join(os.tmpdir(), "dsh-purge-official-restarting")) + ", true); } catch (ignoreStop2) {} WScript.Quit(1); }",
|
||||
// 换包失败也要把原来的桌面端拉起来:以前这里直接退出,用户看到的是应用凭空消失。
|
||||
"if (!renamed) { log('rename failed; relaunching original'); try { sh.Run('\"' + exe + '\"', 1, false); } catch (relaunchError) { log('relaunch failed: ' + (relaunchError && relaunchError.message ? relaunchError.message : String(relaunchError))); } try { if (fso.FileExists(" + jsString(path.join(os.tmpdir(), "dsh-purge-official-restarting")) + ")) fso.DeleteFile(" + jsString(path.join(os.tmpdir(), "dsh-purge-official-restarting")) + ", true); } catch (ignoreStop2) {} WScript.Quit(1); }",
|
||||
"if (renamed) {",
|
||||
"try { sh.Environment('PROCESS').Remove('ELECTRON_RUN_AS_NODE'); } catch (ignore) {}",
|
||||
"try { sh.Environment('PROCESS').Remove('DSH_BASE'); } catch (ignoreBase) {}",
|
||||
@@ -1724,7 +1741,8 @@ export function restartOfficialHarness(options = {}) {
|
||||
|
||||
export function scheduleCleanupRestart({ cleanup = [], ctx } = {}) {
|
||||
const src = fileURLToPath(new URL("./restart-desktop.js", import.meta.url));
|
||||
const dest = path.join(os.tmpdir(), `dsh-purge-uninst-${process.pid}.mjs`);
|
||||
/* 可预测的临时文件名在多用户 POSIX 下能被抢注成符号链接:带上随机后缀。 */
|
||||
const dest = path.join(os.tmpdir(), `dsh-purge-uninst-${restartUniqSuffix()}.mjs`);
|
||||
fs.copyFileSync(src, dest);
|
||||
const runtime = desktopRuntimeOf(ctx);
|
||||
if (runtime) {
|
||||
|
||||
+12
-2
@@ -425,21 +425,28 @@ export function extractAsar(asarPath, destDir) {
|
||||
const afs = archiveFs();
|
||||
const fd = afs.openSync(asarPath, "r");
|
||||
let count = 0;
|
||||
let skippedOutside = 0;
|
||||
try {
|
||||
const { header, dataOffset } = readHeader(fd, afs);
|
||||
const entries = [];
|
||||
walk(header, "", entries);
|
||||
const outFs = diskFs();
|
||||
outFs.mkdirSync(destDir, { recursive: true });
|
||||
const destResolved = path.resolve(destDir);
|
||||
for (const entry of entries) {
|
||||
const info = entry.info;
|
||||
const outPath = path.join(destDir, ...entry.rel.split("/"));
|
||||
// 归档头里的 key 不受信:带 ".." 的路径会写到 destDir 之外。symlink 分支下面已防,
|
||||
// 普通文件同样要防,否则换包链路就是一条任意写。
|
||||
const outPath = path.resolve(destDir, ...entry.rel.split("/"));
|
||||
if (outPath !== destResolved && !outPath.startsWith(destResolved + path.sep)) {
|
||||
skippedOutside += 1;
|
||||
continue;
|
||||
}
|
||||
outFs.mkdirSync(path.dirname(outPath), { recursive: true });
|
||||
if (info.unpacked) continue;
|
||||
if (typeof info.link === "string") {
|
||||
// symlink 目标解析后不能逃离 destDir(防越界,asar 来源不受信时)
|
||||
const linkResolved = path.resolve(path.dirname(outPath), info.link);
|
||||
const destResolved = path.resolve(destDir);
|
||||
const inside = linkResolved === destResolved
|
||||
|| linkResolved.startsWith(destResolved + path.sep);
|
||||
if (!inside) {
|
||||
@@ -465,5 +472,8 @@ export function extractAsar(asarPath, destDir) {
|
||||
} finally {
|
||||
afs.closeSync(fd);
|
||||
}
|
||||
if (skippedOutside > 0) {
|
||||
try { console.warn(`[dsh-purge] extractAsar: skipped ${skippedOutside} entr${skippedOutside === 1 ? "y" : "ies"} outside ${destDir}`); } catch {}
|
||||
}
|
||||
return count;
|
||||
}
|
||||
|
||||
+18
-4
@@ -170,6 +170,20 @@ function ioFor(explicit, targetPath) {
|
||||
return explicit ?? fsFor(targetPath);
|
||||
}
|
||||
|
||||
/** 宿主 lib 里的文件(bin.js / sidecar)一律先写临时文件再 rename:
|
||||
* 直接覆盖时被占用/断电会留下半截模块,宿主下次启动直接 import 失败。 */
|
||||
export function writeHostFileAtomic(nodeFs, fp, text) {
|
||||
const tmp = `${fp}.${process.pid}.tmp`;
|
||||
nodeFs.writeFileSync(tmp, text, "utf8");
|
||||
try {
|
||||
if (typeof nodeFs.renameSync === "function") nodeFs.renameSync(tmp, fp);
|
||||
else nodeFs.writeFileSync(fp, text, "utf8");
|
||||
} catch (error) {
|
||||
try { nodeFs.unlinkSync(tmp); } catch { /* ignore */ }
|
||||
throw error;
|
||||
}
|
||||
}
|
||||
|
||||
/** 源码 monorepo 的 apps/cli(tsdown 构建产物)。往这里注入/还原会动构建输出,缺 bak 时无法自愈(#41)。 */
|
||||
export function looksLikeSourceCliRoot(root, { fs, path: nodePath } = {}) {
|
||||
const p = nodePath ?? requirePath();
|
||||
@@ -249,8 +263,8 @@ export function installHideConsoleIntoBin(aiBase, { fs, path: nodePath } = {}) {
|
||||
fileURLToPath(new URL("./child-process-hide.mjs", import.meta.url)),
|
||||
"utf8",
|
||||
);
|
||||
nodeFs.writeFileSync(facadeSide, facadeSrc, "utf8");
|
||||
nodeFs.writeFileSync(side, hideConsoleEntrySource(), "utf8");
|
||||
writeHostFileAtomic(nodeFs, facadeSide, facadeSrc);
|
||||
writeHostFileAtomic(nodeFs, side, hideConsoleEntrySource());
|
||||
|
||||
let text = nodeFs.readFileSync(binJs, "utf8");
|
||||
if (text.includes(IMPORT_MARK) && text.includes(IMPORT_LINE.split(" //")[0])) {
|
||||
@@ -266,7 +280,7 @@ export function installHideConsoleIntoBin(aiBase, { fs, path: nodePath } = {}) {
|
||||
} else {
|
||||
text = IMPORT_LINE + "\n" + text;
|
||||
}
|
||||
nodeFs.writeFileSync(binJs, text, "utf8");
|
||||
writeHostFileAtomic(nodeFs, binJs, text);
|
||||
return "injected";
|
||||
}
|
||||
|
||||
@@ -286,7 +300,7 @@ export function revertHideConsoleFromBin(aiBase, { fs, path: nodePath } = {}) {
|
||||
const text = nodeFs.readFileSync(binJs, "utf8");
|
||||
const next = text.replace(/^import "\.\/dsh-purge-hide-console\.js";.*\r?\n/gm, "");
|
||||
if (next !== text) {
|
||||
nodeFs.writeFileSync(binJs, next, "utf8");
|
||||
writeHostFileAtomic(nodeFs, binJs, next);
|
||||
changed = true;
|
||||
}
|
||||
} catch (e) {
|
||||
|
||||
+17
-7
@@ -1,16 +1,26 @@
|
||||
/** 判定「宿主提示词已清洗」用的标记。desktop.js 生成 WSH 脚本时复用同一份。 */
|
||||
export const HOST_CLEAN_MARKERS = {
|
||||
identity: "[dsh-purge] identity stripped",
|
||||
inject: [
|
||||
"[dsh-purge] complete prompt keeps waterfall inject",
|
||||
"[dsh-purge] complete prompt keeps inject",
|
||||
"[dsh-purge] fold-complete inject first",
|
||||
],
|
||||
drops: [
|
||||
"transformed.sections : [completeSection]",
|
||||
": [completeSection]",
|
||||
],
|
||||
};
|
||||
|
||||
/** 重启前看系统提示词文件:标记写上了,或者当前原文里已经没有那两处旧拦截。 */
|
||||
export function hostPromptKeepsInject(text) {
|
||||
const body = String(text || "");
|
||||
const identityMarked = body.includes("[dsh-purge] identity stripped");
|
||||
const injectMarked = body.includes("[dsh-purge] complete prompt keeps waterfall inject")
|
||||
|| body.includes("[dsh-purge] complete prompt keeps inject")
|
||||
|| body.includes("[dsh-purge] fold-complete inject first");
|
||||
const identityMarked = body.includes(HOST_CLEAN_MARKERS.identity);
|
||||
const injectMarked = HOST_CLEAN_MARKERS.inject.some((m) => body.includes(m));
|
||||
if (identityMarked && injectMarked) return true;
|
||||
// 空文件或不是这份模块,不能当成已经洗过。
|
||||
if (!body.includes("system-prompt/assemble")) return false;
|
||||
const identityLeft = body.includes("You are an AI agent powered by DeepSeek Harness.");
|
||||
// 0.2.0/0.2.1 都在 complete 分支写 `: [completeSection],`;只有 0.2.1 前面多一行 requiredContexts。
|
||||
const dropsInject = body.includes("transformed.sections : [completeSection]")
|
||||
|| body.includes(": [completeSection]");
|
||||
const dropsInject = HOST_CLEAN_MARKERS.drops.some((m) => body.includes(m));
|
||||
return !identityLeft && !dropsInject;
|
||||
}
|
||||
|
||||
+31
-20
@@ -1,6 +1,6 @@
|
||||
import { ownServerNote } from "./net-scope.js";
|
||||
import { CAPABILITY_SECTION, capabilityProtocolText } from "./capability-protocol.js";
|
||||
import { ANCHOR_SECTION } from "./anchor.js";
|
||||
import { ANCHOR_SECTION, ANCHOR_ORDER, isSubagentContext } from "./anchor.js";
|
||||
export const GLOBAL_PROMPT_ORDER = -100000;
|
||||
export const OBJECTIVE_SECTION = "dshpg-objective";
|
||||
export const REDTEAM_ROLE_SECTION = "dshpg-redteam-role";
|
||||
@@ -532,13 +532,6 @@ export function isRedteamSession(context) {
|
||||
return isRedteamPresetId(sessionAgentPreset(context));
|
||||
}
|
||||
|
||||
export function isMinimalSession(context) {
|
||||
const id = sessionAgentPreset(context);
|
||||
if (!id) return false;
|
||||
const n = id.toLowerCase();
|
||||
return n === "minimal" || n === "sdk-minimal" || n.endsWith("/minimal") || n.includes("preset-minimal");
|
||||
}
|
||||
|
||||
/**
|
||||
* skill / MCP 优先在 capability-protocol。
|
||||
* 这里只剥旧框里残留的 STRICT 段,以及 Claude 工具名残句。不往稿子正文里再塞工具纪律。
|
||||
@@ -596,9 +589,9 @@ function sessionOfContext(context) {
|
||||
}
|
||||
|
||||
function inheritsParentPrompt(session) {
|
||||
const header = session?.header;
|
||||
if (!header?.parentSession) return false;
|
||||
return header.origin === "subagent" || (header.delegationDepth ?? 0) > 0;
|
||||
/* 与 anchor.js / subagent-control.js 同一套判据:三个地方各写一份,
|
||||
迟早会出现"锚点认为是子会话、提示词继承不认为"的分歧。 */
|
||||
return isSubagentContext({ session });
|
||||
}
|
||||
|
||||
function parentSessionRecord(context, parentId) {
|
||||
@@ -628,11 +621,6 @@ export function sessionForInject(context) {
|
||||
return sessionOfContext(context);
|
||||
}
|
||||
|
||||
export function isRedteamSubagent(context) {
|
||||
const header = sessionOfContext(context)?.header;
|
||||
return header?.origin === "subagent" && isRedteamSession(context);
|
||||
}
|
||||
|
||||
/**
|
||||
* 红队 persona 只留调度正文,不再把 inject / 目标卡 / 角色折进去。
|
||||
* inject 和 cap 由 leadWithInject 置顶;卡和角色用不带 dsh-purge 前缀的段,避免 host 过滤器提到 cap 前面。
|
||||
@@ -651,7 +639,8 @@ function attachRedteamOpsOnly(sections) {
|
||||
function insertNamedSection(sections, name, text, order) {
|
||||
const body = typeof text === "string" ? text.trim() : "";
|
||||
if (!body) return sections;
|
||||
if (sections.some((section) => String(section?.text || "").includes(body))) return sections;
|
||||
/* 按 name 去重,别用"正文被包含":另一段正文里恰好提到同一句话时会把该插的段吞掉。 */
|
||||
if (sections.some((section) => section?.name === name && String(section?.text || "").trim() === body)) return sections;
|
||||
const section = { name, text: body, order, interpolate: false };
|
||||
const capAt = sections.findIndex((item) => item?.name === CAPABILITY_SECTION);
|
||||
const purgeAt = sections.findIndex((item) => item?.name === "dsh-purge");
|
||||
@@ -815,6 +804,25 @@ const ASSEMBLE_GUARD = Symbol.for("dsh-purge.assembleGuard");
|
||||
* Cordis 每次读服务方法都会新建 Proxy;重复安装会把上一层代理再包进去,最后栈溢出。
|
||||
* 宿主之后替换 assemble 时,setter 仍会包住新方法。
|
||||
*/
|
||||
/**
|
||||
* 停用/卸载时清掉改写函数。不能复用 guard 的 dispose:那个 noop 是为了 child scope
|
||||
* 结束时保住 inject 而刻意留的,这里只在停用路径用。
|
||||
*/
|
||||
export function clearAssembleGuard(prompt) {
|
||||
if (!prompt) return false;
|
||||
let slot = null;
|
||||
try {
|
||||
const desc = Object.getOwnPropertyDescriptor(prompt, "assemble");
|
||||
if (desc && typeof desc.get === "function" && desc.get[ASSEMBLE_GUARD]) slot = desc.get[ASSEMBLE_GUARD];
|
||||
} catch { /* 代理读不到就退到直接属性 */ }
|
||||
if (!slot) {
|
||||
try { slot = prompt[ASSEMBLE_GUARD]; } catch { slot = null; }
|
||||
}
|
||||
if (!slot) return false;
|
||||
slot.rewrite = null;
|
||||
return true;
|
||||
}
|
||||
|
||||
export function installAssembleGuard(prompt, rewriteFn) {
|
||||
if (!prompt || typeof rewriteFn !== "function") return false;
|
||||
let desc;
|
||||
@@ -853,7 +861,7 @@ export function installAssembleGuard(prompt, rewriteFn) {
|
||||
// 旧包装没挂 slot:没有可解绑的句柄,返回 noop disposer。
|
||||
return function dispose() {};
|
||||
}
|
||||
const slot = { rewrite: rewriteFn };
|
||||
const slot = { rewrite: rewriteFn, lastGood: null };
|
||||
const wrap = (fn) => {
|
||||
if (typeof fn !== "function") return fn;
|
||||
if (fn._dshPurgeWrapped) {
|
||||
@@ -868,9 +876,12 @@ export function installAssembleGuard(prompt, rewriteFn) {
|
||||
} catch (err) {
|
||||
// 原生 assemble 抛 → 不再把整个 waterfall 弄死;用户看到的"任务到一半就苏醒"
|
||||
// "连保存都救不了"就是这里 throw 之后下游 sections.map 崩掉。
|
||||
// 但也别返回空装配:那样这一轮模型既没有系统提示词也没有工具,等于罢工。
|
||||
// 回退到上一次成功的装配(第一次就失败时才是空)。
|
||||
try { console.warn("[dsh-purge] assembleGuard: inner assemble threw:", err?.message || err); } catch {}
|
||||
return { sections: [], contexts: [], tools: [] };
|
||||
return slot.lastGood || { sections: [], contexts: [], tools: [] };
|
||||
}
|
||||
slot.lastGood = assembled;
|
||||
const rewrite = slot.rewrite;
|
||||
if (typeof rewrite !== "function") return assembled;
|
||||
try {
|
||||
@@ -1018,7 +1029,7 @@ export function rewritePromptAssembly(assembled, fallbackInject = "", options =
|
||||
outSections = outSections.filter((section) => String(section?.name || "") !== ANCHOR_SECTION);
|
||||
outSections = [
|
||||
...outSections,
|
||||
{ name: ANCHOR_SECTION, text: anchorText, order: 100000, interpolate: false },
|
||||
{ name: ANCHOR_SECTION, text: anchorText, order: ANCHOR_ORDER, interpolate: false },
|
||||
];
|
||||
}
|
||||
return {
|
||||
|
||||
+71
-21
@@ -15,6 +15,7 @@ import {
|
||||
isMnemonPluginMessage,
|
||||
isRedteamSession,
|
||||
installAssembleGuard,
|
||||
clearAssembleGuard,
|
||||
modePromptText,
|
||||
peelChatmlEnvelope,
|
||||
escapeDshInterpolation,
|
||||
@@ -83,6 +84,23 @@ const DEFAULTS = {
|
||||
subagentControl: true, // false 立即回滚子代理审批接管
|
||||
};
|
||||
|
||||
/* YAML 里写成 "false" 的布尔会被 JS 当真值:两个默认开启的开关一旦被写成字符串,
|
||||
用户以为关了其实还开着。统一收敛一次。 */
|
||||
export const BOOLEAN_CONFIG_KEYS = [
|
||||
"enabled", "autoApplyOnStart", "autoUpdateOnStart", "autoRevertOnMissing",
|
||||
"injectOnce", "stripMnemon", "verbose", "autoRetry", "autoContinue",
|
||||
"capabilityProtocol", "hooksDenyBypass", "subagentControl",
|
||||
];
|
||||
|
||||
export function normalizeConfig(raw) {
|
||||
const cfg = { ...DEFAULTS, ...(raw || {}) };
|
||||
for (const key of BOOLEAN_CONFIG_KEYS) {
|
||||
const value = cfg[key];
|
||||
if (typeof value === "string") cfg[key] = !/^(false|0|no|off)$/i.test(value.trim());
|
||||
}
|
||||
return cfg;
|
||||
}
|
||||
|
||||
const log = (config, ...args) => {
|
||||
if (config?.verbose) console.log("[dsh-purge]", ...args);
|
||||
};
|
||||
@@ -578,20 +596,39 @@ const liveRewriteCache = new WeakMap();
|
||||
function rewriteLiveAssembly(config, assembled, context, decision = { mode: "full", taskKind: "general" }) {
|
||||
// 同一份 assembly 可能同时经过 assemble guard 和 system-prompt/assemble 瀑布:
|
||||
// 第二次进来内容没变,没必要再走一遍 22k 正文处理。WeakMap 随对象回收,不累积。
|
||||
// 缓存键必须带上配置与会话签名:宿主复用同一个 assembly 对象时,光按对象做键
|
||||
// 会把上一轮的改写结果套到这一轮(改了开关/换了会话却看不到变化)。
|
||||
const sigHome = config.enabled !== false ? core.findDshHome() : "";
|
||||
const sigPolicy = config.enabled !== false && sigHome ? rules.readWorkspacePolicy(sigHome) : "always";
|
||||
const sigRedteam = config.enabled !== false && isRedteamSession(context);
|
||||
const sigRevision = config.enabled !== false ? core.committedOverrideRevision() : "";
|
||||
const cacheSig = [
|
||||
config.enabled !== false,
|
||||
config.capabilityProtocol !== false,
|
||||
config.stripMnemon !== false,
|
||||
config.anchorMode || "",
|
||||
config.subagentControl !== false,
|
||||
decision && decision.mode,
|
||||
decision && decision.taskKind,
|
||||
sigRedteam,
|
||||
sigPolicy,
|
||||
sigRevision,
|
||||
(() => { try { const h = context?.agent?.session?.header || {}; return `${h.id || h.sessionId || ""}|${h.cwd || ""}`; } catch { return ""; } })(),
|
||||
].join("");
|
||||
if (assembled && typeof assembled === "object") {
|
||||
const cached = liveRewriteCache.get(assembled);
|
||||
if (cached) return cached;
|
||||
if (cached && cached.sig === cacheSig) return cached.value;
|
||||
}
|
||||
const enabled = config.enabled !== false;
|
||||
const redteam = enabled && isRedteamSession(context);
|
||||
const redteam = sigRedteam;
|
||||
const full = enabled ? readInjectFallback(context) : "";
|
||||
const dshHome = enabled ? core.findDshHome() : "";
|
||||
const dshHome = sigHome;
|
||||
let cwd = "";
|
||||
try { cwd = String(context?.agent?.session?.header?.cwd || "").trim(); } catch { /* ignore */ }
|
||||
if (dshHome && cwd) {
|
||||
try { rules.writeLastCwd(dshHome, cwd); } catch { /* ignore */ }
|
||||
}
|
||||
const policy = enabled && dshHome ? rules.readWorkspacePolicy(dshHome) : "always";
|
||||
const policy = sigPolicy;
|
||||
// 提示词框为空时才启用勾选的本地 cwd 规则兜底;避免跟 prompt-inject.md 叠加污染。
|
||||
let localInject = "";
|
||||
if (enabled && dshHome && !String(full || "").trim()) {
|
||||
@@ -654,7 +691,7 @@ function rewriteLiveAssembly(config, assembled, context, decision = { mode: "ful
|
||||
cwd,
|
||||
});
|
||||
if (assembled && typeof assembled === "object" && rewritten && typeof rewritten === "object") {
|
||||
liveRewriteCache.set(assembled, rewritten);
|
||||
liveRewriteCache.set(assembled, { sig: cacheSig, value: rewritten });
|
||||
}
|
||||
return rewritten;
|
||||
}
|
||||
@@ -670,21 +707,6 @@ function closerFollowBytes(sections) {
|
||||
return joined.length - (at + closer.length);
|
||||
}
|
||||
|
||||
/** 注册表若已经按旧文件算过 rev,立刻 rebuilt,让页面拿到的地址和缓存一致(#63)。 */
|
||||
function publishClientBundleRevs(ctx, packageNames) {
|
||||
if (!Array.isArray(packageNames) || packageNames.length === 0) return;
|
||||
let mods = null;
|
||||
try {
|
||||
mods = ctx?.get?.("clientModules", false);
|
||||
} catch {
|
||||
mods = null;
|
||||
}
|
||||
if (!mods || typeof mods.rebuilt !== "function") return;
|
||||
for (const id of packageNames) {
|
||||
try { mods.rebuilt(id); } catch { /* 这一包还没进注册表,下次快照会读到新文件 */ }
|
||||
}
|
||||
}
|
||||
|
||||
/** Cordis 的 ctx 是 Proxy:未声明 inject 时点属性会抛 "cannot get property ... without inject",所以两段都要包 try。 */
|
||||
function permissionPresetsOf(ctx) {
|
||||
try {
|
||||
@@ -852,6 +874,9 @@ function installIdentityOverride(ctx, config = {}) {
|
||||
return d;
|
||||
};
|
||||
const rewriteFn = (assembled, context) => {
|
||||
// 停用后旧 guard(包括隔离 loopCtx 上那份)必须立刻失效。不枚举 prompt:
|
||||
// 每个 rewriteFn 都捕获同一个 ctx,读一个运行时标志即可。
|
||||
if (ctx.__dshPurgeDisabled === true) return assembled;
|
||||
// [方案2] installAssembleGuard 走的也是这条路径,同样决策 full/anchor。
|
||||
const decision = shouldInjectAssembly(context);
|
||||
logAssembleDecision("rewriteFn", decision);
|
||||
@@ -1002,6 +1027,9 @@ function installIdentityOverride(ctx, config = {}) {
|
||||
delete ctx.__dshPurgeSessionHook;
|
||||
delete ctx.__dshPurgePresetHook;
|
||||
delete ctx.__dshPurgePreStepHook;
|
||||
/* 这两面 flag 以前没人清:热重载后 MnemonStrip / RegionGate 以为还装着,直接跳过。 */
|
||||
delete ctx.__dshPurgeMnemonStrip;
|
||||
delete ctx.__dshPurgeRegionGate;
|
||||
// [v10] AssembleHook 也要清。原漏删,ctx 复用时新 apply 看到 flag=true 直接跳过
|
||||
// ctx.on("system-prompt/assemble", ...),cordis event listener 永远不装 → 新对话首轮
|
||||
// 完全依赖 400ms setInterval wrapAssemble 的 guard,时间窗没赶上就 inject 真空。
|
||||
@@ -1596,14 +1624,36 @@ async function handleSkillsCommand(rawInput) {
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 停用插件时把运行期钩子收干净。
|
||||
* 宿主侧的补丁还在(要等用户 Apply/卸载才还原),它们靠 typeof 判断调用全局钩子;
|
||||
* 这里把全局钩子换成空实现 —— 既不会让宿主崩,也不会在停用后继续注入提示词。
|
||||
*/
|
||||
function resetRuntimeHooks(ctx) {
|
||||
for (const key of [
|
||||
"__dshPurgeSessionHook", "__dshPurgePresetHook", "__dshPurgePreStepHook",
|
||||
"__dshPurgeAssembleHook", "__dshPurgeMnemonStrip", "__dshPurgeRegionGate",
|
||||
]) {
|
||||
try { delete ctx[key]; } catch { /* ignore */ }
|
||||
}
|
||||
try { globalThis.__dshPurgeHungPrompt = () => ""; } catch { /* ignore */ }
|
||||
try { globalThis.__dshPurgePrepareAssemble = () => null; } catch { /* ignore */ }
|
||||
// guard 的 dispose 是 noop,停用后 slot.rewrite 仍指向旧闭包(enabled:true)→ 继续注入。
|
||||
try { clearAssembleGuard(ctx.systemPrompt); } catch { /* 无 systemPrompt 时无需清理 */ }
|
||||
// 隔离 loopCtx 上的 guard 与主 ctx 共用这个标志,一次置位全部失效。
|
||||
try { ctx.__dshPurgeDisabled = true; } catch { /* ignore */ }
|
||||
}
|
||||
|
||||
export function apply(ctx, config) {
|
||||
const cfg = { ...DEFAULTS, ...(config || {}) };
|
||||
const cfg = normalizeConfig(config);
|
||||
if (!cfg.enabled) {
|
||||
purgeLog("boot", { enabled: false });
|
||||
try { clearOwnedSelectedDefault({ ctx, dshHome: core.findDshHome() }); } catch { /* 停用不被清默认挡住 */ }
|
||||
try { removeStaleAgentPresetDir(core.findDshHome(), "redteam"); } catch { /* ignore */ }
|
||||
resetRuntimeHooks(ctx);
|
||||
return;
|
||||
}
|
||||
try { delete ctx.__dshPurgeDisabled; } catch { /* ignore */ }
|
||||
cancelClearOwnedSelectedDefault();
|
||||
try {
|
||||
ctx.effect(() => () => {
|
||||
|
||||
@@ -1,55 +0,0 @@
|
||||
import fs from "node:fs";
|
||||
import path from "node:path";
|
||||
|
||||
const DEFAULT_SETTINGS = Object.freeze({ keepMnemon: false });
|
||||
const SETTINGS_FILE = "mnemon.json";
|
||||
|
||||
function mnemonSettingsPath(dshHome) {
|
||||
return path.join(dshHome, "dsh-purge", SETTINGS_FILE);
|
||||
}
|
||||
|
||||
export function loadMnemonSettings(dshHome, configValue) {
|
||||
let file = {};
|
||||
try {
|
||||
const fp = mnemonSettingsPath(dshHome);
|
||||
if (fs.existsSync(fp)) {
|
||||
const parsed = JSON.parse(fs.readFileSync(fp, "utf8"));
|
||||
if (parsed && typeof parsed === "object") file = parsed;
|
||||
}
|
||||
} catch {
|
||||
file = {};
|
||||
}
|
||||
const pick = [file.keepMnemon, configValue, DEFAULT_SETTINGS.keepMnemon];
|
||||
const value = pick.find((v) => typeof v === "boolean");
|
||||
return { keepMnemon: value === undefined ? false : value };
|
||||
}
|
||||
|
||||
function atomicWriteFileSync(fp, content, encoding = "utf8") {
|
||||
fs.mkdirSync(path.dirname(fp), { recursive: true });
|
||||
const tmp = `${fp}.${process.pid}.${Date.now()}.tmp`;
|
||||
const fd = fs.openSync(tmp, "w");
|
||||
try {
|
||||
fs.writeFileSync(fd, content, encoding);
|
||||
try { fs.fsyncSync(fd); } catch { /* FS 不支持 fsync 时忽略 */ }
|
||||
} finally {
|
||||
fs.closeSync(fd);
|
||||
}
|
||||
try {
|
||||
fs.renameSync(tmp, fp);
|
||||
} catch (e) {
|
||||
try { fs.unlinkSync(tmp); } catch { /* ignore */ }
|
||||
throw e;
|
||||
}
|
||||
}
|
||||
|
||||
export function saveMnemonSettings(dshHome, patch) {
|
||||
const fp = mnemonSettingsPath(dshHome);
|
||||
const current = loadMnemonSettings(dshHome);
|
||||
const next = {
|
||||
keepMnemon: typeof patch?.keepMnemon === "boolean"
|
||||
? patch.keepMnemon
|
||||
: current.keepMnemon,
|
||||
};
|
||||
atomicWriteFileSync(fp, `${JSON.stringify(next, null, 2)}\n`);
|
||||
return { ok: true, ...next, path: fp };
|
||||
}
|
||||
@@ -443,41 +443,10 @@ export async function writeAllowText() {
|
||||
return { text: "", dropped: 0, hosts: [] };
|
||||
}
|
||||
|
||||
let allowCache = { path: "", mtime: -1, exact: new Set(), ips: null, at: 0 };
|
||||
|
||||
function readAllowExact(dshHome = findDshHome()) {
|
||||
const fp = allowFilePath(dshHome);
|
||||
let mtime = -1;
|
||||
try {
|
||||
mtime = fs.statSync(fp).mtimeMs;
|
||||
} catch {
|
||||
mtime = -1;
|
||||
}
|
||||
if (allowCache.path === fp && allowCache.mtime === mtime) return allowCache;
|
||||
const exact = new Set(normalizeAllowText(readAllowText(dshHome)).hosts);
|
||||
allowCache = { path: fp, mtime, exact, ips: null, at: Date.now() };
|
||||
return allowCache;
|
||||
}
|
||||
|
||||
function allowDecision(dshHome) {
|
||||
return readAllowExact(dshHome);
|
||||
}
|
||||
|
||||
export function ownServerNote() {
|
||||
return "";
|
||||
}
|
||||
|
||||
function permittedHost() {
|
||||
return false;
|
||||
}
|
||||
|
||||
function isOwnNetwork(host) {
|
||||
const name = hostOf(host);
|
||||
if (!name) return false;
|
||||
if (name === "localhost" || name.endsWith(".localhost")) return true;
|
||||
return isLocalLabAddress(name);
|
||||
}
|
||||
|
||||
function isIp(host) {
|
||||
return V4_TEXT.test(host) || host.includes(":");
|
||||
}
|
||||
|
||||
@@ -9,6 +9,7 @@
|
||||
*/
|
||||
import fs from "node:fs";
|
||||
import path from "node:path";
|
||||
import { atomicWriteSync } from "./core.js";
|
||||
|
||||
export const PURGE_NAME = "dsh-purge";
|
||||
|
||||
@@ -112,7 +113,7 @@ export function ensureProfileBodyInsert(profileDir) {
|
||||
...blockLines,
|
||||
...shape.lines.slice(shape.emptyFlowIndex + 1),
|
||||
].join("\n");
|
||||
fs.writeFileSync(fp, `${out.endsWith("\n") ? out : `${out}\n`}`, "utf8");
|
||||
atomicWriteSync(fp, `${out.endsWith("\n") ? out : `${out}\n`}`, "utf8");
|
||||
return { ok: true, wrote: true, path: fp };
|
||||
}
|
||||
if (shape.kind === "flow-seq" || shape.kind === "unknown") {
|
||||
@@ -121,7 +122,7 @@ export function ensureProfileBodyInsert(profileDir) {
|
||||
}
|
||||
// 空文件 / 只有注释 → 直接写 insert 块;正常块序列 → 沿用旧的追加行为
|
||||
const prefix = text && !text.endsWith("\n") ? "\n" : "";
|
||||
fs.writeFileSync(fp, `${text}${prefix}${text ? "\n" : ""}${INSERT_BLOCK}`, "utf8");
|
||||
atomicWriteSync(fp, `${text}${prefix}${text ? "\n" : ""}${INSERT_BLOCK}`, "utf8");
|
||||
return { ok: true, wrote: true, path: fp };
|
||||
}
|
||||
|
||||
@@ -167,7 +168,7 @@ export function ensureProfileBundles(profileDir) {
|
||||
const bundles = Array.isArray(pkg.dsh.profile.bundles) ? pkg.dsh.profile.bundles : [];
|
||||
if (bundles.includes(PURGE_NAME)) return { ok: true, wrote: false, path: fp };
|
||||
pkg.dsh.profile.bundles = [...bundles, PURGE_NAME];
|
||||
fs.writeFileSync(fp, `${JSON.stringify(pkg, null, 2)}\n`, "utf8");
|
||||
atomicWriteSync(fp, `${JSON.stringify(pkg, null, 2)}\n`, "utf8");
|
||||
return { ok: true, wrote: true, path: fp };
|
||||
}
|
||||
|
||||
@@ -344,7 +345,7 @@ export function ensurePnpmAllowBuild(profileDir) {
|
||||
if (next === current) return { ok: true, wrote: false, path: fp };
|
||||
// 写前校验不过就不写盘,宁可保持现状(#180)
|
||||
if (!validateAllowBuildRewrite(next)) return { ok: false, wrote: false, path: fp, reason: "allowBuilds-invalid" };
|
||||
fs.writeFileSync(fp, next, "utf8");
|
||||
atomicWriteSync(fp, next, "utf8");
|
||||
return { ok: true, wrote: true, path: fp };
|
||||
}
|
||||
|
||||
|
||||
@@ -0,0 +1,28 @@
|
||||
import { closeSync, fsyncSync, openSync, renameSync, unlinkSync, writeSync } from 'node:fs'
|
||||
|
||||
/**
|
||||
* 先写临时文件、fsync、再 rename。
|
||||
* 直接 writeFileSync 覆盖原文件时,写到一半崩溃会留下半截 JSON;读侧又会把解析错
|
||||
* 吞成默认值,用户的设置就无声消失了。
|
||||
*/
|
||||
export function atomicWriteFileSync(file, text) {
|
||||
const tmp = file + '.tmp-' + process.pid + '-' + Date.now().toString(36)
|
||||
const fd = openSync(tmp, 'w')
|
||||
try {
|
||||
writeSync(fd, text)
|
||||
try { fsyncSync(fd) } catch { /* 部分文件系统不支持,忽略 */ }
|
||||
} catch (error) {
|
||||
try { closeSync(fd) } catch { /* ignore */ }
|
||||
try { unlinkSync(tmp) } catch { /* ignore */ }
|
||||
throw error
|
||||
}
|
||||
try {
|
||||
closeSync(fd)
|
||||
} catch { /* ignore */ }
|
||||
try {
|
||||
renameSync(tmp, file)
|
||||
} catch (error) {
|
||||
try { unlinkSync(tmp) } catch { /* ignore */ }
|
||||
throw error
|
||||
}
|
||||
}
|
||||
+101
-22
@@ -664,11 +664,34 @@ body[data-ds-dark-theme] .rt-scope-testing,.dshp-dock[data-theme="dusk"] .rt-sco
|
||||
try { return String(window.location.hash || '') === '#redteam-full' } catch { return false }
|
||||
}
|
||||
|
||||
const api = (req) => fetch('/redteam/api', {
|
||||
method: 'POST',
|
||||
headers: { 'content-type': 'application/json' },
|
||||
body: JSON.stringify(req),
|
||||
}).then((res) => res.json())
|
||||
/* 与宿主半侧其它接口同一套约定:有超时、判 res.ok、非 JSON 响应给出可读错误。
|
||||
直接 res.json() 时后端回 HTML/空体只会抛 "Unexpected token '<'",状态码也丢了。 */
|
||||
const API_TIMEOUT_MS = 120000
|
||||
const api = (req) => {
|
||||
const ctrl = new AbortController()
|
||||
const timer = setTimeout(() => ctrl.abort(), API_TIMEOUT_MS)
|
||||
return fetch('/redteam/api', {
|
||||
method: 'POST',
|
||||
headers: { 'content-type': 'application/json' },
|
||||
body: JSON.stringify(req),
|
||||
signal: ctrl.signal,
|
||||
})
|
||||
.then((res) => res.text().then((text) => {
|
||||
let data = null
|
||||
try { data = text ? JSON.parse(text) : null } catch { throw new Error(res.status + ' non-json: ' + text.slice(0, 120)) }
|
||||
if (!res.ok) throw new Error((data && data.error) || (res.status + ' ' + res.statusText))
|
||||
return data
|
||||
}))
|
||||
.finally(() => clearTimeout(timer))
|
||||
}
|
||||
/* 每次加载取号,异步回来先比号:切靶标后旧响应直接丢弃,别盖掉新靶标的数据。 */
|
||||
const useLoadSeq = () => {
|
||||
const ref = React.useRef(0)
|
||||
return {
|
||||
take: () => ++ref.current,
|
||||
live: (my) => my === ref.current,
|
||||
}
|
||||
}
|
||||
|
||||
let ui = { open: true, tab: 'assets' }
|
||||
const subs = new Set()
|
||||
@@ -708,15 +731,30 @@ body[data-ds-dark-theme] .rt-scope-testing,.dshp-dock[data-theme="dusk"] .rt-sco
|
||||
'vuln-scan': '漏洞发现', exploit: '漏洞利用', internal: '内网渗透',
|
||||
}
|
||||
|
||||
const fmt = (s) => (s ? String(s).replace('T', ' ').slice(0, 16) : '—')
|
||||
/* 服务端时间一律是 toISOString()(UTC),直接截串会让东八区早 8 小时。 */
|
||||
const pad2 = (n) => String(n).padStart(2, '0')
|
||||
const asLocal = (s) => {
|
||||
const d = new Date(s)
|
||||
return Number.isNaN(d.getTime()) ? null : d
|
||||
}
|
||||
const fmt = (s) => {
|
||||
if (!s) return '—'
|
||||
const d = asLocal(s)
|
||||
if (d === null) return String(s).replace('T', ' ').slice(0, 16)
|
||||
return d.getFullYear() + '-' + pad2(d.getMonth() + 1) + '-' + pad2(d.getDate())
|
||||
+ ' ' + pad2(d.getHours()) + ':' + pad2(d.getMinutes())
|
||||
}
|
||||
const shotCache = new Map()
|
||||
const shotLoading = new Map()
|
||||
/* base64 常驻内存:只留最近 200 张,避免跨靶标无限累积。 */
|
||||
const SHOT_CACHE_LIMIT = 200
|
||||
const shotSrc = (eng, id) => shotCache.get(eng + ':' + id) || null
|
||||
const loadShot = (eng, id) => {
|
||||
const key = eng + ':' + id
|
||||
if (shotCache.has(key) || shotLoading.has(key)) return
|
||||
const p = api({ op: 'shotData', engagement: eng, id: id }).then((r) => {
|
||||
shotCache.set(key, r && r.base64 ? 'data:' + (r.mime || 'image/png') + ';base64,' + r.base64 : '')
|
||||
while (shotCache.size > SHOT_CACHE_LIMIT) shotCache.delete(shotCache.keys().next().value)
|
||||
shotLoading.delete(key)
|
||||
const snap = Object.assign({}, ui)
|
||||
for (const f of Array.from(subs)) {
|
||||
@@ -729,7 +767,8 @@ body[data-ds-dark-theme] .rt-scope-testing,.dshp-dock[data-theme="dusk"] .rt-sco
|
||||
const ShotImage = ({ eng, shot, height }) => {
|
||||
const [zoom, setZoom] = React.useState(false)
|
||||
const src = shotSrc(eng, shot.id)
|
||||
if (src === null) { loadShot(eng, shot.id); }
|
||||
/* 拉图放在 effect 里:render 期间发请求 + 写外部 store 会让同一帧重复触发。 */
|
||||
React.useEffect(() => { if (src === null) loadShot(eng, shot.id) }, [eng, shot.id, src])
|
||||
const card = shot.kind === 'card'
|
||||
return h('div', { className: 'rt-shot' },
|
||||
src === null
|
||||
@@ -766,8 +805,14 @@ body[data-ds-dark-theme] .rt-scope-testing,.dshp-dock[data-theme="dusk"] .rt-sco
|
||||
}
|
||||
/** 发现时间在列表里只留「月-日 时:分」:整行宽度紧张,完整时间进悬浮提示 */
|
||||
const fmtShort = (s) => {
|
||||
const t = String(s || '').replace('T', ' ')
|
||||
return t.length >= 16 ? t.slice(5, 16) : (t || '—')
|
||||
if (!s) return '—'
|
||||
const d = asLocal(s)
|
||||
if (d === null) {
|
||||
const t = String(s).replace('T', ' ')
|
||||
return t.length >= 16 ? t.slice(5, 16) : t
|
||||
}
|
||||
return pad2(d.getMonth() + 1) + '-' + pad2(d.getDate())
|
||||
+ ' ' + pad2(d.getHours()) + ':' + pad2(d.getMinutes())
|
||||
}
|
||||
const provLabel = (p) => (p === 'passive' ? '被动' : p === 'active' ? '主动' : '未知')
|
||||
|
||||
@@ -1258,12 +1303,17 @@ body[data-ds-dark-theme] .rt-scope-testing,.dshp-dock[data-theme="dusk"] .rt-sco
|
||||
const [data, setData] = React.useState(null)
|
||||
const [err, setErr] = React.useState(null)
|
||||
const [day, setDay] = React.useState('')
|
||||
const seq = useLoadSeq()
|
||||
React.useEffect(() => {
|
||||
if (!eng) return
|
||||
const my = seq.take()
|
||||
setData(null)
|
||||
api({ op: 'discoveryTimeline', engagement: eng, limit: 200 })
|
||||
.then((r) => { if (!r || r.ok === false) setErr((r && r.error) || '加载失败'); else { setErr(null); setData(r) } },
|
||||
(e) => setErr(String((e && e.message) || e)))
|
||||
.then((r) => {
|
||||
if (!seq.live(my)) return
|
||||
if (!r || r.ok === false) setErr((r && r.error) || '加载失败')
|
||||
else { setErr(null); setData(r) }
|
||||
}, (e) => { if (seq.live(my)) setErr(String((e && e.message) || e)) })
|
||||
}, [eng, refreshKey])
|
||||
if (err) return h('div', { className: 'rt-pane' }, h('div', { className: 'rt-err' }, err))
|
||||
if (!data) return h('div', { className: 'rt-empty' }, '加载中…')
|
||||
@@ -1314,14 +1364,17 @@ body[data-ds-dark-theme] .rt-scope-testing,.dshp-dock[data-theme="dusk"] .rt-sco
|
||||
const [msg, setMsg] = React.useState(null)
|
||||
const [busy, setBusy] = React.useState(false)
|
||||
|
||||
const seq = useLoadSeq()
|
||||
React.useEffect(() => {
|
||||
/* 无靶标也允许:服务端回内置默认,不再报 engagement required */
|
||||
const my = seq.take()
|
||||
api(eng ? { op: 'prompts', engagement: eng } : { op: 'prompts' }).then((r) => {
|
||||
if (!seq.live(my)) return
|
||||
if (!r || r.ok === false) { setMsg({ err: (r && r.error) || '读取失败' }); return }
|
||||
setRoles(r.roles || [])
|
||||
if (r.roles && r.roles.length) setActive((cur) => cur || r.roles[0].role)
|
||||
if (r.builtin) setMsg({ ok: '当前为内置默认提示词(创建靶标后可按靶标保存修改)' })
|
||||
}, (e) => setMsg({ err: String((e && e.message) || e) }))
|
||||
}, (e) => { if (seq.live(my)) setMsg({ err: String((e && e.message) || e) }) })
|
||||
}, [eng, refreshKey])
|
||||
|
||||
React.useEffect(() => {
|
||||
@@ -1897,7 +1950,8 @@ body[data-ds-dark-theme] .rt-scope-testing,.dshp-dock[data-theme="dusk"] .rt-sco
|
||||
|
||||
return h('div', { className: 'rt-main' }, toolbar, conclusion,
|
||||
h('div', { className: 'rt-subtabs' },
|
||||
subTabBtn('vulns', '漏洞', state.total || 0),
|
||||
/* 用实际渲染条数:total 是服务端 COUNT(*),列表被 limit 截断时两者对不上。 */
|
||||
subTabBtn('vulns', '漏洞', (state.items || []).length),
|
||||
subTabBtn('files', '攻击文件', allFiles.length),
|
||||
subTabBtn('creds', '凭据', creds.length),
|
||||
subTabBtn('access', '访问会话', accesses.length),
|
||||
@@ -1951,14 +2005,17 @@ body[data-ds-dark-theme] .rt-scope-testing,.dshp-dock[data-theme="dusk"] .rt-sco
|
||||
const [view, setView] = React.useState('A')
|
||||
const [openId, setOpenId] = React.useState(null)
|
||||
|
||||
const seq = useLoadSeq()
|
||||
const load = () => {
|
||||
if (!eng) return
|
||||
const my = seq.take()
|
||||
setLoading(true)
|
||||
api({ op: 'scoreChain', engagement: eng }).then((r) => {
|
||||
if (!seq.live(my)) return
|
||||
setLoading(false)
|
||||
if (!r || r.ok === false) { setErr((r && r.error) || '读取失败'); return }
|
||||
setErr(null); setData(r)
|
||||
}, (e) => { setLoading(false); setErr(String((e && e.message) || e)) })
|
||||
}, (e) => { if (!seq.live(my)) return; setLoading(false); setErr(String((e && e.message) || e)) })
|
||||
}
|
||||
React.useEffect(load, [eng, refreshKey])
|
||||
|
||||
@@ -2157,21 +2214,28 @@ body[data-ds-dark-theme] .rt-scope-testing,.dshp-dock[data-theme="dusk"] .rt-sco
|
||||
/* 报告按阶段折叠:默认全开,折叠状态按靶标记住(阶段多时便于逐段交付) */
|
||||
const collapse = useCollapse('report:' + eng)
|
||||
|
||||
const seq = useLoadSeq()
|
||||
const load = () => {
|
||||
if (!eng) return
|
||||
const my = seq.take()
|
||||
setBusy(true); setMsg(null)
|
||||
api({ op: 'scoreReport', engagement: eng }).then((r) => {
|
||||
if (!seq.live(my)) return
|
||||
if (!r || r.ok === false) { setBusy(false); setErr((r && r.error) || '生成失败'); return }
|
||||
/* 老 host 只给平铺条目、不给阶段分组(或阶段行缺失):自己按攻击链分组,
|
||||
否则报告页会误报"还没有可交付的成果"。分组数据取自 scoreChain。 */
|
||||
if ((!r.stages || r.stages.length === 0) && (r.items || []).length > 0) {
|
||||
api({ op: 'scoreChain', engagement: eng }).then((c) => {
|
||||
if (!seq.live(my)) return
|
||||
setBusy(false); setErr(null); setData(Object.assign({}, r, { stages: groupByStage(r.items, c) }))
|
||||
}, () => { setBusy(false); setErr(null); setData(r) })
|
||||
}, () => {
|
||||
if (!seq.live(my)) return
|
||||
setBusy(false); setErr(null); setData(r)
|
||||
})
|
||||
return
|
||||
}
|
||||
setBusy(false); setErr(null); setData(r)
|
||||
}, (e) => { setBusy(false); setErr(String((e && e.message) || e)) })
|
||||
}, (e) => { if (!seq.live(my)) return; setBusy(false); setErr(String((e && e.message) || e)) })
|
||||
}
|
||||
React.useEffect(load, [eng, refreshKey])
|
||||
|
||||
@@ -2379,15 +2443,18 @@ body[data-ds-dark-theme] .rt-scope-testing,.dshp-dock[data-theme="dusk"] .rt-sco
|
||||
const collapse = useCollapse('files:' + eng)
|
||||
const [detail, setDetail] = React.useState(null)
|
||||
|
||||
const seq = useLoadSeq()
|
||||
const load = () => {
|
||||
if (!eng) return
|
||||
const my = seq.take()
|
||||
setBusy(true)
|
||||
api({ op: 'attackFiles', engagement: eng }).then((r) => {
|
||||
if (!seq.live(my)) return
|
||||
setBusy(false)
|
||||
if (!r || r.ok === false) { setErr((r && r.error) || '读取失败'); return }
|
||||
setErr(null)
|
||||
setFolders(r.items || [])
|
||||
}, (e) => { setBusy(false); setErr(String((e && e.message) || e)) })
|
||||
}, (e) => { if (!seq.live(my)) return; setBusy(false); setErr(String((e && e.message) || e)) })
|
||||
}
|
||||
React.useEffect(load, [eng, refreshKey])
|
||||
|
||||
@@ -2936,15 +3003,18 @@ body[data-ds-dark-theme] .rt-scope-testing,.dshp-dock[data-theme="dusk"] .rt-sco
|
||||
const [form, setForm] = React.useState(null)
|
||||
const [msg, setMsg] = React.useState(null)
|
||||
|
||||
const seq = useLoadSeq()
|
||||
const load = () => {
|
||||
if (!eng) return
|
||||
const my = seq.take()
|
||||
setBusy(true)
|
||||
api({ op: 'scores', engagement: eng }).then((r) => {
|
||||
if (!seq.live(my)) return
|
||||
setBusy(false)
|
||||
if (!r || r.ok === false) { setErr((r && r.error) || '读取失败'); return }
|
||||
setErr(null)
|
||||
setData(r)
|
||||
}, (e) => { setBusy(false); setErr(String((e && e.message) || e)) })
|
||||
}, (e) => { if (!seq.live(my)) return; setBusy(false); setErr(String((e && e.message) || e)) })
|
||||
}
|
||||
React.useEffect(load, [eng, refreshKey])
|
||||
|
||||
@@ -2993,7 +3063,7 @@ body[data-ds-dark-theme] .rt-scope-testing,.dshp-dock[data-theme="dusk"] .rt-sco
|
||||
}, (e) => { setBusy(false); setMsg({ err: String((e && e.message) || e) }) })
|
||||
}
|
||||
|
||||
const summary = (data && data.summary) || { achievedPoints: 0, pointCount: 0, hitPointCount: 0, hitCount: 0, selfCreatedHits: 0, serviceCappedHits: 0 }
|
||||
const summary = (data && data.summary) || { achievedPoints: 0, pointCount: 0, hitPointCount: 0, hitCount: 0, countedHits: 0, selfCreatedHits: 0, serviceCappedHits: 0 }
|
||||
const items = (data && data.items) || []
|
||||
|
||||
/* 按合并版的 8 个类别分组渲染(后端 ruleGroups 已排好序、组内按分值升序)。
|
||||
@@ -3308,7 +3378,9 @@ body[data-ds-dark-theme] .rt-scope-testing,.dshp-dock[data-theme="dusk"] .rt-sco
|
||||
}, (e) => { if (my === seq.current) setErr(String((e && e.message) || e)) })
|
||||
.finally(() => { if (my === seq.current) inflight.current = false })
|
||||
}
|
||||
React.useEffect(() => { seq.current += 1; load() }, [eng, refreshKey])
|
||||
/* 切靶标/刷新时把在途标记复位:旧请求的 finally 因序号不符不会清,
|
||||
不复位的话这里会永久早退,5 秒轮询也全空转。 */
|
||||
React.useEffect(() => { seq.current += 1; inflight.current = false; load() }, [eng, refreshKey])
|
||||
React.useEffect(() => {
|
||||
if (!eng || !auto) return undefined
|
||||
const timer = setInterval(load, 5000)
|
||||
@@ -3430,13 +3502,16 @@ body[data-ds-dark-theme] .rt-scope-testing,.dshp-dock[data-theme="dusk"] .rt-sco
|
||||
const [msg, setMsg] = React.useState(null)
|
||||
const [copied, setCopied] = React.useState(null)
|
||||
|
||||
const seq = useLoadSeq()
|
||||
const load = () => {
|
||||
if (!eng) return
|
||||
const my = seq.take()
|
||||
api({ op: 'sessions', engagement: eng }).then((r) => {
|
||||
if (!seq.live(my)) return
|
||||
if (!r || r.ok === false) { setErr((r && r.error) || '读取失败'); return }
|
||||
setErr(null)
|
||||
setData(r)
|
||||
}, (e) => setErr(String((e && e.message) || e)))
|
||||
}, (e) => { if (seq.live(my)) setErr(String((e && e.message) || e)) })
|
||||
}
|
||||
React.useEffect(load, [eng, refreshKey])
|
||||
|
||||
@@ -3671,16 +3746,20 @@ body[data-ds-dark-theme] .rt-scope-testing,.dshp-dock[data-theme="dusk"] .rt-sco
|
||||
const [concurrency, setConcurrency] = React.useState(null)
|
||||
const [busy, setBusy] = React.useState(false)
|
||||
|
||||
const seq = useLoadSeq()
|
||||
const load = () => {
|
||||
const my = seq.take()
|
||||
setBusy(true)
|
||||
api({ op: eng ? 'prompts' : 'bootstrap', engagement: eng || undefined }).then((r) => {
|
||||
if (!seq.live(my)) return
|
||||
setBusy(false)
|
||||
if (!r || r.ok === false) { setErr((r && r.error) || '读取失败'); return }
|
||||
setErr(null)
|
||||
if (r.roles) setRoles(r.roles)
|
||||
}, (e) => { setBusy(false); setErr(String((e && e.message) || e)) })
|
||||
}, (e) => { if (!seq.live(my)) return; setBusy(false); setErr(String((e && e.message) || e)) })
|
||||
/* 并发名额按"当前跑着的子智能体"算;host 侧读 subagents 注册表 */
|
||||
api({ op: 'agentsStatus' }).then((r) => {
|
||||
if (!seq.live(my)) return
|
||||
if (r && r.ok !== false) setConcurrency(r)
|
||||
}, () => {})
|
||||
}
|
||||
|
||||
+10
-2
@@ -8,7 +8,7 @@
|
||||
*/
|
||||
import { chmodSync, existsSync, mkdirSync, readFileSync, readdirSync, writeFileSync } from 'node:fs'
|
||||
import { homedir } from 'node:os'
|
||||
import { dirname, join } from 'node:path'
|
||||
import { join } from 'node:path'
|
||||
import { fileURLToPath } from 'node:url'
|
||||
import { readPresetDefinition } from './preset-composition.js'
|
||||
import { scheduleClearOwnedSelectedDefault } from '../preset-default.js'
|
||||
@@ -557,7 +557,15 @@ export function apply(ctx) {
|
||||
Promise.resolve()
|
||||
.then(async () => {
|
||||
await undeclare()
|
||||
releaseDeclared = await registry.register(definition)
|
||||
const release = await registry.register(definition)
|
||||
/* 注册是异步的:cleanup 已经跑过(closed=true)时,这里再赋值就会把预设
|
||||
永远留在宿主里——没人再来释放它。当场撤掉。 */
|
||||
if (closed) {
|
||||
try { await release() } catch { /* 已随宿主卸载 */ }
|
||||
writeStatus({ ok: false, phase: 'closed-during-register' })
|
||||
return
|
||||
}
|
||||
releaseDeclared = release
|
||||
let broken = null
|
||||
try {
|
||||
const row = (await registry.list()).find((p) => p.id === REDTEAM_PRESET_ID)
|
||||
|
||||
@@ -9,9 +9,10 @@
|
||||
*
|
||||
* 借鉴 Z3r0:系统配置集中、可在 UI 里改(FOFA / 路径类),而不是只靠 shell 引导。
|
||||
*/
|
||||
import { closeSync, existsSync, mkdirSync, openSync, readFileSync, readSync, readdirSync, statSync, writeFileSync } from 'node:fs'
|
||||
import { closeSync, existsSync, mkdirSync, openSync, readFileSync, readSync, readdirSync, statSync } from "node:fs"
|
||||
import { homedir, platform as osPlatform } from 'node:os'
|
||||
import { delimiter, isAbsolute, join, resolve, sep } from 'node:path'
|
||||
import { atomicWriteFileSync } from './atomic-write.js'
|
||||
|
||||
/** 配置文件路径。 */
|
||||
export function configPathOf(root) {
|
||||
@@ -145,7 +146,7 @@ export function savePlatformConfig(patch, root) {
|
||||
else next.tools[t.id] = String(next.tools[t.id]).trim()
|
||||
}
|
||||
const file = configPathOf(dir)
|
||||
writeFileSync(file, JSON.stringify(next, null, 2), 'utf8')
|
||||
atomicWriteFileSync(file, JSON.stringify(next, null, 2))
|
||||
return loadPlatformConfig(dir)
|
||||
}
|
||||
|
||||
|
||||
@@ -121,11 +121,13 @@ function buildHttpRequest(options = {}) {
|
||||
: (target.path || '/')
|
||||
const method = String(options.method || (options.data === undefined || options.data === null ? 'GET' : 'POST')).toUpperCase()
|
||||
const lines = [method + ' ' + path + ' HTTP/1.1', 'Host: ' + hostHeader]
|
||||
const headers = Array.isArray(options.headers) ? options.headers.slice() : []
|
||||
const headers = (Array.isArray(options.headers) ? options.headers.slice() : [])
|
||||
/* 头值里的换行会把一条报文拆成两条:Cookie 尤其常见(多行 cookie 导出)。 */
|
||||
.map((h) => String(h).replace(/[\r\n]+/g, ' '))
|
||||
const hasHeader = (name) => headers.some((h) => String(h).toLowerCase().startsWith(name.toLowerCase() + ':'))
|
||||
if (!hasHeader('User-Agent')) headers.push('User-Agent: Mozilla/5.0')
|
||||
if (!hasHeader('Accept')) headers.push('Accept: */*')
|
||||
if (options.cookie && !hasHeader('Cookie')) headers.push('Cookie: ' + options.cookie)
|
||||
if (options.cookie && !hasHeader('Cookie')) headers.push('Cookie: ' + String(options.cookie).replace(/[\r\n]+/g, ' '))
|
||||
const body = options.data === undefined || options.data === null ? '' : String(options.data)
|
||||
if (body !== '' && !hasHeader('Content-Type')) {
|
||||
headers.push(/^\{.*\}$/.test(body.trim()) ? 'Content-Type: application/json' : 'Content-Type: application/x-www-form-urlencoded')
|
||||
@@ -153,8 +155,8 @@ function buildCurlCommand(options = {}) {
|
||||
const url = scheme + '://' + hostPart + (options.path || target.path || '/')
|
||||
const parts = ['curl -i -s' + (options.insecure ? ' -k' : '') + (options.followRedirect ? ' -L' : '')]
|
||||
if (options.method && String(options.method).toUpperCase() !== 'GET') parts.push('-X ' + String(options.method).toUpperCase())
|
||||
if (options.cookie) parts.push("-b '" + options.cookie + "'")
|
||||
if (options.data !== undefined && options.data !== null && options.data !== '') parts.push("-d '" + String(options.data).replace(/'/g, "'\\''") + "'")
|
||||
if (options.cookie) parts.push("-b '" + String(options.cookie).replace(/[\r\n]/g, ' ').replace(/'/g, "'\\''") + "'")
|
||||
if (options.data !== undefined && options.data !== null && options.data !== '') parts.push("-d '" + String(options.data).replace(/[\r\n]+/g, ' ').replace(/'/g, "'\\''") + "'")
|
||||
parts.push("'" + url + "'")
|
||||
return parts.join(' ')
|
||||
}
|
||||
@@ -194,13 +196,15 @@ function fillTemplate(template, values = {}) {
|
||||
[/<u>/g, values.user],
|
||||
[/<p>/g, values.pass],
|
||||
]
|
||||
for (const [re, value] of table) {
|
||||
if (value === undefined || value === null || String(value) === '') continue
|
||||
for (const [re, rawValue] of table) {
|
||||
if (rawValue === undefined || rawValue === null || String(rawValue) === '') continue
|
||||
/* 凭据/域名来自数据库,换行会把一条命令拆成两条。 */
|
||||
const value = String(rawValue).replace(/[\r\n]+/g, ' ')
|
||||
const needle = new RegExp(re.source, re.flags.replace('g', ''))
|
||||
if (!needle.test(cmd)) continue
|
||||
cmd = cmd.replace(new RegExp(re.source, re.flags), String(value))
|
||||
cmd = cmd.replace(new RegExp(re.source, re.flags), value)
|
||||
/* 记录填了什么,报告里要如实说明(模板被改过,读者需要知道哪些是补进去的) */
|
||||
filled.push(re.source.replace(/[\\<>?()/]|gi$/g, '') + ' → ' + String(value))
|
||||
filled.push(re.source.replace(/[\\<>?()/]|gi$/g, '') + ' → ' + value)
|
||||
}
|
||||
const remaining = Array.from(new Set(Array.from(cmd.matchAll(/<[^>\s]{1,24}>/g)).map((m) => m[0])))
|
||||
return { cmd, filled, remaining }
|
||||
|
||||
@@ -441,8 +441,12 @@ function evaluateScoreBoard(db, rows = [], options = {}) {
|
||||
const nm = h.asset_id === null || h.asset_id === undefined ? null : names.get(Number(h.asset_id))
|
||||
return Object.assign({}, h, {
|
||||
code,
|
||||
/* points 必须是"本条命中的实际分值"(见上方说明) */
|
||||
points: hitPointsOf(h, meta),
|
||||
/* points 必须是"本条命中的实际分值"(见上方说明):调用方传进来的已经乘过倍率,
|
||||
这里不能再乘一次,否则 G5/G6 的 ×2/×3 会变成 ×4/×9(合法命中还会被顶上限判成 0 分)。
|
||||
只有没传 points 的行才回落到 hitPointsOf 现算。 */
|
||||
points: (h.points !== null && h.points !== undefined && h.points !== '')
|
||||
? (Number(h.points) || 0)
|
||||
: hitPointsOf(h, meta),
|
||||
rule: m === undefined || m.rule === undefined ? null : m.rule,
|
||||
cap: m === undefined ? 0 : m.cap,
|
||||
dedup_scope: m === undefined ? 'service' : m.dedup_scope,
|
||||
|
||||
@@ -8,8 +8,9 @@
|
||||
* 生效顺序:settings.json → 环境变量 `REDTEAM_MAX_AGENTS` → 默认 3。
|
||||
* 工具侧(redteam_agent_slot 闸门)与面板侧(「智能体」页)读的是同一份,避免两处口径漂移。
|
||||
*/
|
||||
import { existsSync, mkdirSync, readFileSync, writeFileSync } from 'node:fs'
|
||||
import { existsSync, mkdirSync, readFileSync } from 'node:fs'
|
||||
import { join } from 'node:path'
|
||||
import { atomicWriteFileSync } from './atomic-write.js'
|
||||
|
||||
/** 默认并发上限(用户口径:整个项目默认 3 个执行智能体)。 */
|
||||
export const DEFAULT_MAX_AGENTS = 3
|
||||
@@ -35,7 +36,7 @@ export function readSettings(root) {
|
||||
export function writeSettings(root, patch) {
|
||||
const next = Object.assign({}, readSettings(root), patch)
|
||||
mkdirSync(String(root || '.'), { recursive: true })
|
||||
writeFileSync(settingsPathOf(root), JSON.stringify(next, null, 2) + '\n', 'utf8')
|
||||
atomicWriteFileSync(settingsPathOf(root), JSON.stringify(next, null, 2) + '\n')
|
||||
return next
|
||||
}
|
||||
|
||||
|
||||
+81
-36
@@ -8,12 +8,12 @@
|
||||
import { DatabaseSync } from 'node:sqlite'
|
||||
import { connect as tcpConnect } from 'node:net'
|
||||
import { createHash } from 'node:crypto'
|
||||
import { homedir } from 'node:os'
|
||||
import { homedir, tmpdir } from 'node:os'
|
||||
import {
|
||||
mkdirSync, readFileSync, writeFileSync, readdirSync, existsSync, rmSync, statSync,
|
||||
copyFileSync,
|
||||
} from 'node:fs'
|
||||
import { join, basename, isAbsolute } from 'node:path'
|
||||
import { join, basename, isAbsolute, resolve } from 'node:path'
|
||||
|
||||
/* ── 拆分出去的模块(对外 API 不变:下面把它们原样再导出一次)──────────────
|
||||
动机是"一个文件 5600 行、改表结构要翻过 500 行计分逻辑":
|
||||
@@ -158,6 +158,16 @@ const SCOPE_SQL = `CASE
|
||||
THEN 'internal' ELSE 'external' END`
|
||||
|
||||
|
||||
/**
|
||||
* 证据导入的**源**路径:相对路径按 root 解析,绝对路径必须落在 root 或系统临时目录内。
|
||||
* 只校验写目标是不够的 —— 接口传一个绝对路径就能把本机任意文件复制进证据目录再读回。
|
||||
*/
|
||||
function assertSourcePath(root, raw) {
|
||||
const text = String(raw || '').trim()
|
||||
const abs = isAbsolute(text) ? resolve(text) : resolve(root, text)
|
||||
return assertPathWithin(abs, [root, tmpdir()])
|
||||
}
|
||||
|
||||
/* ------------------------------------------------------------------ 元数据 */
|
||||
|
||||
function readMeta(path) {
|
||||
@@ -940,7 +950,8 @@ export class RedteamStore {
|
||||
}
|
||||
|
||||
/* ---------- 路径 ---------- */
|
||||
dirOf(id) { return join(this.engagementsDir, id) }
|
||||
/* id 来自请求体(dispatch 的 req.engagement),拼路径前必须挡住 `..` 出去。 */
|
||||
dirOf(id) { return assertPathWithin(join(this.engagementsDir, id), [this.engagementsDir]) }
|
||||
metaPathOf(id) { return join(this.dirOf(id), 'engagement.yaml') }
|
||||
dbPathOf(id) { return join(this.dirOf(id), 'assets.db') }
|
||||
promptsDirOf(id) { return join(this.dirOf(id), 'agents') }
|
||||
@@ -980,16 +991,21 @@ export class RedteamStore {
|
||||
}
|
||||
|
||||
/* ---------- 靶标生命周期 ---------- */
|
||||
listEngagements() {
|
||||
listEngagements(options = {}) {
|
||||
mkdirSync(this.engagementsDir, { recursive: true })
|
||||
const withStats = options.stats === true
|
||||
const out = []
|
||||
for (const entry of readdirSync(this.engagementsDir, { withFileTypes: true })) {
|
||||
if (!entry.isDirectory()) continue
|
||||
const meta = readMeta(this.metaPathOf(entry.name)) || {}
|
||||
let stats = null
|
||||
try {
|
||||
if (existsSync(this.dbPathOf(entry.name))) stats = this.stats(entry.name)
|
||||
} catch { /* 库损坏时仍列出靶标 */ }
|
||||
/* 只有面板 bootstrap 要统计。工具调用解析靶标名每次都开库 + 13 条 COUNT,
|
||||
靶标一多就把每个工具步拖慢;默认不带。 */
|
||||
if (withStats) {
|
||||
try {
|
||||
if (existsSync(this.dbPathOf(entry.name))) stats = this.stats(entry.name)
|
||||
} catch { /* 库损坏时仍列出靶标 */ }
|
||||
}
|
||||
out.push({
|
||||
id: entry.name, name: meta.target_name || entry.name,
|
||||
scope: meta.scope_cidrs || [], status: meta.status || 'active',
|
||||
@@ -1503,6 +1519,7 @@ export class RedteamStore {
|
||||
const ids = doomed.map((r) => r.id)
|
||||
const ph = ids.map(() => '?').join(',')
|
||||
const hits = db.prepare(`SELECT * FROM score_hit WHERE point_id IN (${ph})`).all(...ids)
|
||||
let archived = hits.length === 0
|
||||
if (hits.length > 0) {
|
||||
/* 存档:放靶标目录的 runs/ 下,与其它证据同处一地 */
|
||||
try {
|
||||
@@ -1515,8 +1532,11 @@ export class RedteamStore {
|
||||
reason: '按《突破入侵类得分规则(合并版)》重构:旧得分项整套作废',
|
||||
points: doomed, hits,
|
||||
}, null, 2), 'utf8')
|
||||
} catch { /* 存档失败不阻断清理,但要照实记账 */ }
|
||||
archived = true
|
||||
} catch { /* 存档失败:下面不删,下次启动再试(删了就永久丢证据) */ }
|
||||
}
|
||||
/* 没存下来就不删:宁可旧得分项多留一轮,也不能静默丢证据。 */
|
||||
if (!archived) throw new Error('legacy score archive failed; purge skipped')
|
||||
db.prepare(`DELETE FROM score_hit WHERE point_id IN (${ph})`).run(...ids)
|
||||
db.prepare(`DELETE FROM score_point WHERE id IN (${ph})`).run(...ids)
|
||||
purgedPoints = doomed.length
|
||||
@@ -1884,8 +1904,15 @@ export class RedteamStore {
|
||||
+ '删掉会让面板缺一条规则、报告少一类成果(下次启动还会自动补回来)。'
|
||||
+ '要让它不参与计分,请改用「停用」。')
|
||||
}
|
||||
db.prepare('DELETE FROM score_hit WHERE point_id = ?').run(pid)
|
||||
db.prepare('DELETE FROM score_point WHERE id = ?').run(pid)
|
||||
db.exec('BEGIN')
|
||||
try {
|
||||
db.prepare('DELETE FROM score_hit WHERE point_id = ?').run(pid)
|
||||
db.prepare('DELETE FROM score_point WHERE id = ?').run(pid)
|
||||
db.exec('COMMIT')
|
||||
} catch (error) {
|
||||
db.exec('ROLLBACK')
|
||||
throw error
|
||||
}
|
||||
return { deleted: pid }
|
||||
}
|
||||
|
||||
@@ -2184,15 +2211,28 @@ export class RedteamStore {
|
||||
FROM vuln v LEFT JOIN asset a ON a.id = v.asset_id ${clause}
|
||||
ORDER BY CASE v.severity WHEN 'critical' THEN 0 WHEN 'high' THEN 1 WHEN 'medium' THEN 2 WHEN 'low' THEN 3 ELSE 4 END,
|
||||
v.id DESC LIMIT ?`).all(...args, limit)
|
||||
/* 详情里要直接展示原始请求/响应,这里一并带上(请求体可能很大,做长度保护) */
|
||||
const eviStmt = db.prepare(`SELECT id, label, method, url, status, request, response, note, captured_by, captured_at
|
||||
FROM http_evidence WHERE vuln_id = ? ORDER BY id`)
|
||||
const clipped = (t) => (t === null || t === undefined ? null : (String(t).length > 60000 ? String(t).slice(0, 60000) + "\n… (truncated)" : String(t)))
|
||||
for (const item of items) {
|
||||
item.http_evidence = eviStmt.all(item.id).map((e) => Object.assign({}, e, {
|
||||
request: clipped(e.request), response: clipped(e.response),
|
||||
}))
|
||||
/* 详情里要直接展示原始请求/响应,这里一并带上(请求体可能很大,做长度保护)。
|
||||
一次 IN 取完再分组,避免每条漏洞各查一次(limit=200 时就是 200 次查询)。 */
|
||||
/* 列表要展示证据是否存在与摘要,但不必把完整报文都端上来:全文走 httpEvidence /
|
||||
报告链路按需取。200 条 × 数条证据 × 60k 字符会把面板主线程卡死。
|
||||
报告生成(store-core report/reportTargets)显式传 evidenceLimit:60000 拿全文。 */
|
||||
const evidenceLimit = Math.min(Number(f.evidenceLimit) || 8000, 60000)
|
||||
const clipped = (t) => (t === null || t === undefined ? null : (String(t).length > evidenceLimit ? String(t).slice(0, evidenceLimit) + "\n… (truncated)" : String(t)))
|
||||
const eviByVuln = new Map()
|
||||
const ids = items.map((it) => Number(it.id)).filter((n) => Number.isInteger(n))
|
||||
if (ids.length > 0) {
|
||||
const ph = ids.map(() => '?').join(',')
|
||||
const rows = db.prepare(`SELECT id, vuln_id, label, method, url, status, request, response, note, captured_by, captured_at
|
||||
FROM http_evidence WHERE vuln_id IN (${ph}) ORDER BY id`).all(...ids)
|
||||
for (const e of rows) {
|
||||
const key = Number(e.vuln_id)
|
||||
if (!eviByVuln.has(key)) eviByVuln.set(key, [])
|
||||
eviByVuln.get(key).push(Object.assign({}, e, {
|
||||
request: clipped(e.request), response: clipped(e.response),
|
||||
}))
|
||||
}
|
||||
}
|
||||
for (const item of items) item.http_evidence = eviByVuln.get(Number(item.id)) || []
|
||||
return { total, items }
|
||||
}
|
||||
|
||||
@@ -4198,12 +4238,16 @@ export class RedteamStore {
|
||||
return { id: stepId, seq: seq, stage_code: stageCode, point_id: pointId, hit: hit, score_hint: scoreHint, stage_hint: stageWarning }
|
||||
}
|
||||
|
||||
listChain(id) {
|
||||
return this.db(id).prepare(`SELECT s.*, a.ip AS asset_ip, v.title AS vuln_title, v.severity AS vuln_severity, v.cve AS vuln_cve
|
||||
/* limit 默认 5000 防止超长靶标把整张表一次读进内存;导出/报告传 0 表示不截断。 */
|
||||
listChain(id, limit = 5000) {
|
||||
const cap = Number(limit) > 0 ? Math.floor(Number(limit)) : 0
|
||||
const sql = `SELECT s.*, a.ip AS asset_ip, v.title AS vuln_title, v.severity AS vuln_severity, v.cve AS vuln_cve
|
||||
FROM attack_step s
|
||||
LEFT JOIN asset a ON a.id = s.asset_id
|
||||
LEFT JOIN vuln v ON v.id = s.vuln_id
|
||||
ORDER BY s.seq, s.id`).all()
|
||||
ORDER BY s.seq, s.id` + (cap > 0 ? ' LIMIT ?' : '')
|
||||
const stmt = this.db(id).prepare(sql)
|
||||
return cap > 0 ? stmt.all(cap) : stmt.all()
|
||||
}
|
||||
|
||||
/* ---------- 攻击文件(只收录实际生效的脚本/POC/EXP) ---------- */
|
||||
@@ -4248,7 +4292,7 @@ export class RedteamStore {
|
||||
if (typeof shot.data_base64 === 'string' && shot.data_base64.trim() !== '') {
|
||||
buf = Buffer.from(shot.data_base64.replace(/^data:[^,]+,/, ''), 'base64')
|
||||
} else if (typeof shot.path === 'string' && shot.path.trim() !== '') {
|
||||
const src = isAbsolute(shot.path) ? shot.path : join(this.dirOf(id), shot.path)
|
||||
const src = assertSourcePath(this.dirOf(id), shot.path)
|
||||
if (!existsSync(src)) throw new Error('shot source not found: ' + shot.path)
|
||||
buf = readFileSync(src)
|
||||
} else {
|
||||
@@ -4424,7 +4468,7 @@ export class RedteamStore {
|
||||
if (typeof f.content === 'string' && f.content.length > 0) {
|
||||
writeFileSync(filePath, f.content, 'utf8')
|
||||
} else if (typeof f.path === 'string' && f.path.length > 0) {
|
||||
const src = isAbsolute(f.path) ? f.path : join(this.dirOf(id), f.path)
|
||||
const src = assertSourcePath(this.dirOf(id), f.path)
|
||||
if (!existsSync(src)) throw new Error('source path not found: ' + f.path)
|
||||
copyFileSync(src, filePath)
|
||||
} else {
|
||||
@@ -4619,7 +4663,7 @@ export class RedteamStore {
|
||||
/* 正文:优先用传入 content,其次从 path 读;两者都没有则只登记元数据 */
|
||||
let content = typeof p.content === 'string' ? p.content : ''
|
||||
if (content === '' && typeof p.path === 'string' && p.path.length > 0) {
|
||||
const src = isAbsolute(p.path) ? p.path : join(this.pocsDirOf(), p.path)
|
||||
const src = assertSourcePath(this.pocsDirOf(), p.path)
|
||||
if (!existsSync(src)) throw new Error('poc content or existing path required: ' + p.path)
|
||||
content = readFileSync(src, 'utf8')
|
||||
}
|
||||
@@ -4871,13 +4915,13 @@ export class RedteamStore {
|
||||
reportTargets(id, options = {}) {
|
||||
const meta = readMeta(this.metaPathOf(id)) || {}
|
||||
const includeAll = options.all === true
|
||||
const allVulns = this.listVulns(id, { limit: 2000 }).items
|
||||
const allVulns = this.listVulns(id, { limit: 2000, evidenceLimit: 60000 }).items
|
||||
const severityOrder = { critical: 0, high: 1, medium: 2, low: 3, info: 4 }
|
||||
const isResult = (v) => v.status === 'confirmed' || v.status === 'exploited'
|
||||
const isReal = (v) => v.severity === 'critical' || v.severity === 'high' || v.severity === 'medium'
|
||||
const vulns = (includeAll ? allVulns : allVulns.filter((v) => isResult(v) && isReal(v)))
|
||||
.slice().sort((a, b) => (severityOrder[a.severity] ?? 9) - (severityOrder[b.severity] ?? 9))
|
||||
const chain = this.listChain(id)
|
||||
const chain = this.listChain(id, 0)
|
||||
const creds = this.listCredentials(id, {})
|
||||
const access = this.listAccess(id, {})
|
||||
const files = this.listAttackFiles(id, {})
|
||||
@@ -5004,10 +5048,10 @@ export class RedteamStore {
|
||||
report(id, options = {}) {
|
||||
const meta = readMeta(this.metaPathOf(id)) || {}
|
||||
const includeAll = options.all === true
|
||||
const chain = this.listChain(id)
|
||||
const chain = this.listChain(id, 0)
|
||||
const creds = this.listCredentials(id, {})
|
||||
const access = this.listAccess(id, {})
|
||||
const allVulns = this.listVulns(id, { limit: 2000 }).items
|
||||
const allVulns = this.listVulns(id, { limit: 2000, evidenceLimit: 60000 }).items
|
||||
const severityOrder = { critical: 0, high: 1, medium: 2, low: 3, info: 4 }
|
||||
const isResult = (v) => v.status === 'confirmed' || v.status === 'exploited'
|
||||
const isReal = (v) => v.severity === 'critical' || v.severity === 'high' || v.severity === 'medium'
|
||||
@@ -5186,16 +5230,17 @@ export class RedteamStore {
|
||||
const db = this.db(id)
|
||||
const counts = { segments: 0, assets: 0, ports: 0, services: 0, fingerprints: 0, names: 0, edges: 0 }
|
||||
let runId = null
|
||||
if (bundle.scan) {
|
||||
const r = db.prepare(`INSERT INTO scan_run(agent_session_id, tool, argv, started_at, status)
|
||||
VALUES(?,?,?,?,'completed')`).run(
|
||||
bundle.scan.agent_session_id ?? null, bundle.scan.tool ?? null,
|
||||
bundle.scan.argv ? JSON.stringify(bundle.scan.argv) : null, nowIso(),
|
||||
)
|
||||
runId = Number(r.lastInsertRowid)
|
||||
}
|
||||
/* BEGIN 必须在写 scan_run 之前:它在事务外的话,导入中途失败回滚会留下孤儿扫描记录。 */
|
||||
db.exec('BEGIN')
|
||||
try {
|
||||
if (bundle.scan) {
|
||||
const r = db.prepare(`INSERT INTO scan_run(agent_session_id, tool, argv, started_at, status)
|
||||
VALUES(?,?,?,?,'completed')`).run(
|
||||
bundle.scan.agent_session_id ?? null, bundle.scan.tool ?? null,
|
||||
bundle.scan.argv ? JSON.stringify(bundle.scan.argv) : null, nowIso(),
|
||||
)
|
||||
runId = Number(r.lastInsertRowid)
|
||||
}
|
||||
for (const seg of bundle.segments || []) { this.#upsertSegment(db, seg); counts.segments++ }
|
||||
for (const a of bundle.assets || []) {
|
||||
const provenance = a.provenance || 'active'
|
||||
|
||||
@@ -26,7 +26,7 @@ import {
|
||||
platformSummary,
|
||||
toolkitDirOf,
|
||||
} from './platform-config.js'
|
||||
import { maxAgentsOf, DEFAULT_MAX_AGENTS, MAX_AGENTS_LIMIT } from './settings.js'
|
||||
import { maxAgentsOf } from './settings.js'
|
||||
import { EvidenceLedger, UnknownRegistry } from './evidence-ledger.mjs'
|
||||
|
||||
/**
|
||||
@@ -180,11 +180,6 @@ function sessionInfoOf(exec) {
|
||||
return { id: id, parentId: parentId, session: session }
|
||||
}
|
||||
|
||||
/** 会话 id(兼容旧调用点)。 */
|
||||
function sessionOf(exec) {
|
||||
return sessionInfoOf(exec).id
|
||||
}
|
||||
|
||||
/**
|
||||
* 解析"根会话":一路沿 parentSession 走到最顶层的会话 id。
|
||||
* 主会话派出的子智能体因此共享同一个绑定键,而**不同主会话之间天然隔离**。
|
||||
@@ -491,7 +486,7 @@ export function apply(ctx) {
|
||||
},
|
||||
output: { schema: { type: 'string' }, render: (_args, value) => text(value) },
|
||||
async execute(args, exec) {
|
||||
const list = store.listEngagements()
|
||||
const list = store.listEngagements({ stats: true })
|
||||
const wanted = typeof args.engagement === 'string' ? args.engagement.trim() : ''
|
||||
if (wanted === '') {
|
||||
return JSON.stringify({
|
||||
@@ -1125,7 +1120,7 @@ export function apply(ctx) {
|
||||
output: { schema: { type: 'string' }, render: (_args, value) => text(value) },
|
||||
async execute(args, exec) {
|
||||
const id = resolveEngagement(store, exec, args.engagement)
|
||||
const result = store.listVulns(id, { ...args, engagement: undefined, limit: Math.min(Number(args.limit) || 50, 200) })
|
||||
const result = store.listVulns(id, { ...args, engagement: undefined, evidenceLimit: 20000, limit: Math.min(Number(args.limit) || 50, 200) })
|
||||
return JSON.stringify({ ok: true, engagement: id, total: result.total, items: result.items, stats: store.vulnStats(id) }, null, 2)
|
||||
},
|
||||
})))
|
||||
|
||||
+24
-22
@@ -18,7 +18,9 @@ import { existsSync, readFileSync, writeFileSync, mkdirSync, readdirSync, realpa
|
||||
import { homedir } from 'node:os'
|
||||
import { spawn, execFileSync } from 'node:child_process'
|
||||
import { request as httpsRequest } from 'node:https'
|
||||
import { dispatch, dispatchAsync } from './store-core.js'
|
||||
import { dispatchAsync } from './store-core.js'
|
||||
import { assertPathWithin } from './validate.js'
|
||||
import { validSkillName } from '../skills.js'
|
||||
/* 技能可用性判定与 redteam_preflight 共用同一份实现(环境变量 / 本机路径 / 占位符) */
|
||||
import { checkSkill, officialSkillSummaries, skillLibraryOf, summarizeSkills } from './skill-availability.js'
|
||||
import { maxAgentsOf, maxAgentsSourceOf, saveMaxAgents, DEFAULT_MAX_AGENTS, MAX_AGENTS_LIMIT } from './settings.js'
|
||||
@@ -876,7 +878,10 @@ function handleSkillOpFromPluginDir(request) {
|
||||
if (typeof request.name !== 'string' || request.name.length === 0) {
|
||||
return { ok: false, error: '缺少 name 参数' }
|
||||
}
|
||||
const file = join(dir, request.name.endsWith('.md') ? request.name : (request.name + '.md'))
|
||||
/* name 会直接拼进路径:必须挡掉 `../` 与绝对路径(这条兜底路径曾能读任意 *.md)。 */
|
||||
const skillName = request.name.replace(/\.md$/i, '')
|
||||
if (!validSkillName(skillName)) return { ok: false, error: '技能名不合法: ' + request.name }
|
||||
const file = assertPathWithin(join(dir, skillName + '.md'), [dir])
|
||||
if (!existsSync(file)) return { ok: false, error: '技能不存在: ' + request.name }
|
||||
let content = ''
|
||||
try { content = readFileSync(file, 'utf8') } catch (error) {
|
||||
@@ -885,7 +890,7 @@ function handleSkillOpFromPluginDir(request) {
|
||||
const meta = parseMeta(content)
|
||||
return {
|
||||
ok: true,
|
||||
name: request.name.replace(/\.md$/i, ''),
|
||||
name: skillName,
|
||||
description: meta.description,
|
||||
whenToUse: meta.whenToUse,
|
||||
provider: 'dsh-purge',
|
||||
@@ -1084,34 +1089,31 @@ export function apply(ctx) {
|
||||
sendJson(res, 405, { ok: false, error: 'POST only' })
|
||||
return
|
||||
}
|
||||
/* 来源校验:本机回环一律放行(官方桌面端 Origin 常是 app:// / file://,
|
||||
旧逻辑会把 Origin.host 判空后直接 403,导致技能库/知识库/SQL 全挂)。
|
||||
非回环才要求 Origin 与 Host 同源。 */
|
||||
const remote = req.socket && req.socket.remoteAddress ? String(req.socket.remoteAddress) : ''
|
||||
const loopback = remote === '127.0.0.1' || remote === '::1' || remote === '::ffff:127.0.0.1'
|
||||
/* 来源校验:**不能**因为 remoteAddress 是回环就放行 —— 浏览器访问本机服务时
|
||||
它本来就是 127.0.0.1,等于任何网页都能 POST 进来改数据(CSRF)。
|
||||
以 Origin 与 Host 是否一致为准;桌面端 Origin 是 app:// 或 null,仅在 Host 为本机时放行。 */
|
||||
const host = typeof req.headers.host === 'string' ? req.headers.host : ''
|
||||
const hostLocal = /^(localhost|127\.0\.0\.1|\[::1\])(:\d+)?$/i.test(host)
|
||||
const site = String(req.headers['sec-fetch-site'] || '').toLowerCase()
|
||||
const origin = req.headers.origin
|
||||
const originOk = (() => {
|
||||
if (loopback) return true
|
||||
/* 官方桌面端:Origin 常为 app:// / null,Host 仍是 127.0.0.1:port */
|
||||
if (hostLocal) {
|
||||
if (origin === undefined || origin === '' || origin === 'null') return true
|
||||
if (typeof origin === 'string' && /^app:/i.test(origin)) return true
|
||||
try {
|
||||
const oh = new URL(origin).host
|
||||
if (oh === host || oh === '' ) return true
|
||||
} catch { /* fall through */ }
|
||||
}
|
||||
if (typeof origin !== 'string' || origin === '') return false
|
||||
let originHost = null
|
||||
try { originHost = new URL(origin).host } catch { originHost = null }
|
||||
return originHost !== null && originHost === host
|
||||
/* 浏览器自己标的跨站请求直接拒(也覆盖 sandbox iframe 的 Origin: null)。 */
|
||||
if (site === 'cross-site' || site === 'same-site') return false
|
||||
if (origin === undefined || origin === '') return true /* 非浏览器客户端(curl / 脚本) */
|
||||
if (origin === 'null') return hostLocal && (site === '' || site === 'none')
|
||||
if (/^app:/i.test(String(origin))) return hostLocal
|
||||
try { return new URL(origin).host === host } catch { return false }
|
||||
})()
|
||||
if (!originOk) {
|
||||
sendJson(res, 403, { ok: false, error: 'cross-origin request rejected' })
|
||||
return
|
||||
}
|
||||
/* 只收 JSON:跨站"简单请求"(text/plain 表单)过不了这一关。 */
|
||||
const ctype = String(req.headers['content-type'] || '').toLowerCase()
|
||||
if (!ctype.includes('application/json')) {
|
||||
sendJson(res, 415, { ok: false, error: 'content-type must be application/json' })
|
||||
return
|
||||
}
|
||||
try {
|
||||
const raw = await readBody(req)
|
||||
const request = raw.trim() ? JSON.parse(raw) : {}
|
||||
|
||||
+24
-3
@@ -5,7 +5,28 @@
|
||||
* 是安全边界所在(路径穿越、非法枚举),值得单独一处、单独读、单独测。
|
||||
*/
|
||||
|
||||
import { resolve, sep } from 'node:path'
|
||||
import { basename, dirname, join, resolve, sep } from 'node:path'
|
||||
import { realpathSync } from 'node:fs'
|
||||
|
||||
/**
|
||||
* 对最近一个存在的祖先目录做 realpath,再拼回不存在的尾部。
|
||||
* 只比字符串前缀时,靶标目录里一个指向外部的软链接/junction 就能穿过去。
|
||||
*/
|
||||
function realish(p) {
|
||||
let cur = p
|
||||
const rest = []
|
||||
for (let i = 0; i < 40; i += 1) {
|
||||
try {
|
||||
return join(realpathSync(cur), ...rest)
|
||||
} catch {
|
||||
const parent = dirname(cur)
|
||||
if (parent === cur) break
|
||||
rest.unshift(basename(cur))
|
||||
cur = parent
|
||||
}
|
||||
}
|
||||
return p
|
||||
}
|
||||
|
||||
export const WEBSHELL_TYPES = ['behinder', 'godzilla', 'antSword', 'antsword', 'custom']
|
||||
export const WEBSHELL_STATUSES = ['online', 'offline', 'dead', 'unknown']
|
||||
@@ -56,8 +77,8 @@ export function normalizeShellStatus(value) {
|
||||
* @throws 越界时抛错(调用方按"查不到"处理,不要静默返回内容)。
|
||||
*/
|
||||
export function assertPathWithin(target, allowedRoots) {
|
||||
const abs = resolve(String(target || ""))
|
||||
const roots = (allowedRoots || []).filter((r) => typeof r === "string" && r !== "").map((r) => resolve(r))
|
||||
const abs = realish(resolve(String(target || "")))
|
||||
const roots = (allowedRoots || []).filter((r) => typeof r === "string" && r !== "").map((r) => realish(resolve(r)))
|
||||
const okFlag = roots.some((root) => abs === root || abs.startsWith(root + sep))
|
||||
if (!okFlag) {
|
||||
throw new Error("path outside allowed roots: " + abs
|
||||
|
||||
+39
-27
@@ -77,19 +77,40 @@ function rmTree(dir) {
|
||||
}
|
||||
}
|
||||
|
||||
function pidsForImage(image) {
|
||||
const out = execFileSync("tasklist", ["/FI", `IMAGENAME eq ${image}`, "/FO", "CSV", "/NH"], {
|
||||
encoding: "utf8",
|
||||
windowsHide: true,
|
||||
timeout: 8000,
|
||||
});
|
||||
/** 按安装根路径找进程,不按映像名:DSH NEXT / 改名版进程名不同,写死会误杀同名第三方。 */
|
||||
function listWindowsPids(exe) {
|
||||
if (!exe) return [];
|
||||
let out = "";
|
||||
try {
|
||||
out = execFileSync("powershell.exe", [
|
||||
"-NoProfile", "-NonInteractive", "-Command",
|
||||
// 用 '|' 分隔:PowerShell 单引号字符串不解释 `t,路径里也不允许 '|'。
|
||||
// 先统一输出编码:中文安装路径在 OEM 代码页下会被 execFileSync(utf8) 读成乱码。
|
||||
"[Console]::OutputEncoding = [System.Text.Encoding]::UTF8; " +
|
||||
"Get-CimInstance Win32_Process | Where-Object { $_.ExecutablePath } | ForEach-Object { $_.ProcessId.ToString() + '|' + $_.ExecutablePath }",
|
||||
], { encoding: "utf8", windowsHide: true, timeout: 10000 });
|
||||
} catch {
|
||||
return [];
|
||||
}
|
||||
const want = String(exe).toLowerCase().replace(/\\/g, "/");
|
||||
const root = want.slice(0, want.lastIndexOf("/"));
|
||||
const pids = [];
|
||||
for (const line of String(out || "").split(/\r?\n/)) {
|
||||
const cols = line.split(",");
|
||||
const pid = Number(String(cols[1] || "").replace(/"/g, "").trim());
|
||||
if (pid) pids.push(pid);
|
||||
const bar = line.indexOf("|");
|
||||
if (bar < 0) continue;
|
||||
const pid = Number(line.slice(0, bar).trim());
|
||||
const ep = line.slice(bar + 1).trim().toLowerCase().replace(/\\/g, "/");
|
||||
if (!pid || !ep) continue;
|
||||
if (ep === want || (root && ep.startsWith(`${root}/`))) pids.push(pid);
|
||||
}
|
||||
return pids;
|
||||
return [...new Set(pids)];
|
||||
}
|
||||
|
||||
function listDesktopPids(exe = info.execPath) {
|
||||
if (process.platform === "darwin") return listDarwinPids(exe);
|
||||
if (process.platform !== "win32") return listPosixPids(exe);
|
||||
// 助手自己若仍是 Electron 映像,绝不能进待杀名单(#133)。
|
||||
return listWindowsPids(exe).filter((pid) => pid !== process.pid);
|
||||
}
|
||||
|
||||
function darwinBundleOf(exe) {
|
||||
@@ -181,22 +202,6 @@ function listPosixPids(exe) {
|
||||
return [...new Set(pids)];
|
||||
}
|
||||
|
||||
function listDesktopPids(exe = info.execPath) {
|
||||
if (process.platform === "darwin") return listDarwinPids(exe);
|
||||
if (process.platform !== "win32") return listPosixPids(exe);
|
||||
const images = ["DeepSeek Harness.exe", "DSH Desktop.exe", "DSH NEXT.exe"];
|
||||
const pids = [];
|
||||
for (const image of images) {
|
||||
try {
|
||||
pids.push(...pidsForImage(image));
|
||||
} catch {
|
||||
// 该进程名不存在
|
||||
}
|
||||
}
|
||||
// 助手自己若仍是 Electron 映像,绝不能进待杀名单(#133)。
|
||||
return pids.filter((pid) => pid !== process.pid);
|
||||
}
|
||||
|
||||
function signalPids(pids, signal) {
|
||||
for (const pid of pids) {
|
||||
if (pid === process.pid) continue;
|
||||
@@ -462,7 +467,14 @@ if (info.respawn === false) {
|
||||
}
|
||||
|
||||
if (info.asar && !asarReleased) {
|
||||
log("asar still sealed; not relaunching");
|
||||
// 桌面端已经在上面的 killApp 分支被杀掉;这里直接退出就是"应用凭空消失"。
|
||||
// Windows 的 PS1 分支早已改成失败时拉起原版 + 留 rename-pending,这里对齐。
|
||||
try {
|
||||
fs.writeFileSync(`${info.asar}.rename-pending`, new Date().toISOString());
|
||||
} catch { /* 锁写不上也要先把用户拉回来 */ }
|
||||
log("asar still sealed; relaunching original app");
|
||||
relaunchDesktop();
|
||||
await sleep(400);
|
||||
process.exit(1);
|
||||
}
|
||||
|
||||
|
||||
+17
-2
@@ -1,4 +1,6 @@
|
||||
import net from "node:net";
|
||||
import fs from "node:fs";
|
||||
import path from "node:path";
|
||||
import { spawn } from "node:child_process";
|
||||
import { envForDetachedSpawn } from "./core.js";
|
||||
import {
|
||||
@@ -50,7 +52,8 @@ function killOldServer() {
|
||||
function openBrowser(url) {
|
||||
if (!url) return;
|
||||
if (process.platform === "win32") {
|
||||
spawn("cmd.exe", ["/d", "/s", "/c", "start", "", url], {
|
||||
/* cmd 的 start 会把 & 当命令分隔符:整条命令必须带引号,否则 ?a=1&b=2 的地址只打开前半截。 */
|
||||
spawn("cmd.exe", ["/d", "/s", "/c", `start "" "${String(url).replace(/"/g, "")}"`], {
|
||||
detached: true,
|
||||
stdio: "ignore",
|
||||
windowsHide: true,
|
||||
@@ -76,7 +79,19 @@ async function waitFree() {
|
||||
}
|
||||
|
||||
const ok = await waitFree();
|
||||
if (!ok) process.exit(1);
|
||||
if (!ok) {
|
||||
/* 旧进程杀不掉时以前直接 exit(1),用户看到的是 web 服务凭空消失。
|
||||
端口还占着说明旧 server 大概率还活着:把页面重新打开并留下日志,至少不是静默失败。 */
|
||||
try {
|
||||
const dir = path.join(dshHomeDir(), "dsh-purge");
|
||||
fs.mkdirSync(dir, { recursive: true });
|
||||
fs.writeFileSync(path.join(dir, "restart-web.log"),
|
||||
`${new Date().toISOString()} restart aborted: port ${port} still busy
|
||||
`, "utf8");
|
||||
} catch { /* 日志失败不影响提示 */ }
|
||||
openBrowser(info.url || "");
|
||||
process.exit(1);
|
||||
}
|
||||
|
||||
// 接着 stdout 里的新地址打开浏览器。旧页面的 token 在新进程里无效,只刷新会打不开。
|
||||
let opened = false;
|
||||
|
||||
@@ -33,10 +33,16 @@ export function installSubagentControl(ctx, config = {}) {
|
||||
if (!isChild(session)) return;
|
||||
const n = flips.get(session) || 0;
|
||||
if (n >= MAX_FLIPS) return;
|
||||
// 同一 tick 多条 never 事件会读到同一个 n:先同步占位,append 失败再退回。
|
||||
flips.set(session, n + 1);
|
||||
// 不能在 append 的处理链里再 append。
|
||||
// 不能在 append 的处理链里再 append。名额只在真正写成功时消耗:
|
||||
// 会话已关 / append 失败时退还,否则 4 次空转之后这个会话就永远不再补 ask。
|
||||
queueMicrotask(() => {
|
||||
try { session.append("approval/policy", { policy: "ask" }); } catch { /* 会话已关 */ }
|
||||
try {
|
||||
session.append("approval/policy", { policy: "ask" });
|
||||
} catch {
|
||||
flips.set(session, n); /* 会话已关,退还名额 */
|
||||
}
|
||||
});
|
||||
} catch { /* 观察者不能抛 */ }
|
||||
}, { global: true }));
|
||||
|
||||
@@ -51,8 +51,8 @@ function rmTree(dir) {
|
||||
}
|
||||
|
||||
const ok = await waitFree();
|
||||
if (!ok) process.exit(1);
|
||||
|
||||
/* 端口等不到也要清理:以前直接退出,插件的目录和文件就永远留在那里,
|
||||
用户以为卸载成功,重启后插件还在。删不掉的会被 rmTree 吞掉,下一步照常。 */
|
||||
for (const dir of cleanup) rmTree(dir);
|
||||
if (info.helper) {
|
||||
try {
|
||||
@@ -62,6 +62,9 @@ if (info.helper) {
|
||||
}
|
||||
}
|
||||
|
||||
/* 端口没释放就不拉起新进程(会立刻撞端口),但上面的清理已经做完了。 */
|
||||
if (!ok) process.exit(1);
|
||||
|
||||
const child = spawn(info.execPath, info.argv, {
|
||||
detached: true,
|
||||
stdio: "ignore",
|
||||
@@ -70,6 +73,7 @@ const child = spawn(info.execPath, info.argv, {
|
||||
windowsHide: true,
|
||||
shell: false,
|
||||
});
|
||||
|
||||
child.on("error", () => process.exit(1));
|
||||
child.unref();
|
||||
await new Promise((r) => setTimeout(r, 400));
|
||||
|
||||
+7
-13
@@ -15,7 +15,7 @@ export function wasApplied(state) {
|
||||
return [state.shim_cmd, state.shim_ps1, state.shim_bin].includes("patched");
|
||||
}
|
||||
|
||||
export function shouldDeletePluginTree(dir, dshHome = core.findDshHome()) {
|
||||
export function shouldDeletePluginTree(dir) {
|
||||
if (!dir) return false;
|
||||
let real;
|
||||
try {
|
||||
@@ -24,15 +24,9 @@ export function shouldDeletePluginTree(dir, dshHome = core.findDshHome()) {
|
||||
real = path.resolve(dir);
|
||||
}
|
||||
const n = real.replace(/[/\\]+/g, "/").toLowerCase();
|
||||
if (n.includes("/node_modules/dsh-purge")) return true;
|
||||
let home;
|
||||
try {
|
||||
home = fs.realpathSync(dshHome);
|
||||
} catch {
|
||||
home = path.resolve(dshHome);
|
||||
}
|
||||
const homeN = home.replace(/[/\\]+/g, "/").toLowerCase();
|
||||
return n.startsWith(`${homeN}/profiles/`);
|
||||
// npm link / file: 安装的 realpath 会指到用户源码目录;只认安装树路径,
|
||||
// 不按末段名字猜,避免卸载时把源码仓库整棵删掉。
|
||||
return n.includes("/node_modules/dsh-purge");
|
||||
}
|
||||
|
||||
function isPurgeBundleItem(item) {
|
||||
@@ -81,7 +75,7 @@ function readJson(fp) {
|
||||
}
|
||||
|
||||
function writeJson(fp, value) {
|
||||
fs.writeFileSync(fp, `${JSON.stringify(value, null, 2)}\n`, "utf8");
|
||||
core.atomicWriteSync(fp, `${JSON.stringify(value, null, 2)}\n`, "utf8");
|
||||
}
|
||||
|
||||
function pkgMentionsPurge(pkg) {
|
||||
@@ -175,7 +169,7 @@ function collectCleanupDirs(profiles, dshHome) {
|
||||
} catch {
|
||||
real = path.resolve(nm);
|
||||
}
|
||||
if (shouldDeletePluginTree(real, dshHome)) remember(real);
|
||||
if (shouldDeletePluginTree(real)) remember(real);
|
||||
if (path.resolve(nm).toLowerCase() !== real.toLowerCase()) remember(nm);
|
||||
}
|
||||
|
||||
@@ -183,7 +177,7 @@ function collectCleanupDirs(profiles, dshHome) {
|
||||
remember(dataDir);
|
||||
|
||||
const root = updater.pluginRoot();
|
||||
if (shouldDeletePluginTree(root, dshHome)) remember(root);
|
||||
if (shouldDeletePluginTree(root)) remember(root);
|
||||
|
||||
return cleanup;
|
||||
}
|
||||
|
||||
+2
-4
@@ -1,7 +1,6 @@
|
||||
import { execFileSync, spawnSync } from "node:child_process";
|
||||
import fs from "node:fs";
|
||||
import { promises as fsp } from "node:fs";
|
||||
import http from "node:http";
|
||||
import https from "node:https";
|
||||
import os from "node:os";
|
||||
import path from "node:path";
|
||||
@@ -411,12 +410,11 @@ function requestBuffer(url, ms, headers, redirectsLeft = 5) {
|
||||
reject(e);
|
||||
return;
|
||||
}
|
||||
if (parsed.protocol !== "https:" && parsed.protocol !== "http:") {
|
||||
if (parsed.protocol !== "https:") {
|
||||
reject(new Error(`update: unsupported protocol ${parsed.protocol}`));
|
||||
return;
|
||||
}
|
||||
const lib = parsed.protocol === "http:" ? http : https;
|
||||
const req = lib.request(parsed, {
|
||||
const req = https.request(parsed, {
|
||||
method: "GET",
|
||||
headers: { "user-agent": "dsh-purge-update", accept: "*/*", ...headers },
|
||||
}, (res) => {
|
||||
|
||||
+21
-10
@@ -73,13 +73,25 @@ function listeningPids(port) {
|
||||
return [...new Set(pids)];
|
||||
}
|
||||
const out = run("lsof", ["-nP", `-iTCP:${port}`, "-sTCP:LISTEN", "-t"]);
|
||||
return [...new Set(out.split(/\s+/).map(Number).filter((n) => Number.isInteger(n) && n > 0))];
|
||||
const viaLsof = [...new Set(out.split(/\s+/).map(Number).filter((n) => Number.isInteger(n) && n > 0))];
|
||||
if (viaLsof.length > 0) return viaLsof;
|
||||
/* 只有 ss 没有 lsof 的精简镜像:以前直接返回空,回收逻辑静默失效。 */
|
||||
const pids = [];
|
||||
for (const line of run("ss", ["-ltnp"]).split(/\r?\n/)) {
|
||||
if (!line.includes(`:${port} `) && !line.includes(`:${port}\t`)) continue;
|
||||
for (const m of line.matchAll(/pid=(\d+)/g)) pids.push(Number(m[1]));
|
||||
}
|
||||
return [...new Set(pids.filter((n) => Number.isInteger(n) && n > 0))];
|
||||
}
|
||||
|
||||
function main() {
|
||||
if (!process.argv.slice(2).some((a) => a === "web")) return;
|
||||
const i = process.argv.indexOf("--port");
|
||||
const port = Number(i > -1 ? process.argv[i + 1] : process.env.PORT) || 3080;
|
||||
/* 两种写法都要认:`--port 4000` 与 `--port=4000`。只认前者时回收逻辑跑在 3080 上,
|
||||
真正占着的端口没人管,EADDRINUSE 照旧。 */
|
||||
const eq = process.argv.find((a) => /^--port=/.test(a));
|
||||
const raw = i > -1 ? process.argv[i + 1] : (eq ? eq.slice("--port=".length) : process.env.PORT);
|
||||
const port = Number(raw) || 3080;
|
||||
const home = String(process.env.DSH_HOME || "").trim() || path.join(os.homedir(), ".dsh");
|
||||
const record = path.join(home, "dsh-purge", `web-server-${port}.json`);
|
||||
|
||||
@@ -117,14 +129,13 @@ function main() {
|
||||
}
|
||||
}
|
||||
|
||||
if (!killed) {
|
||||
for (const pid of listeners) {
|
||||
if (pid === process.pid) continue;
|
||||
if (!isDshWeb(cmdlineOf(pid))) continue;
|
||||
if (kill(pid)) {
|
||||
killed += 1;
|
||||
killedPids.push(pid);
|
||||
}
|
||||
/* 记录杀了也要按端口扫一遍:同端口可能还挂着别的孤儿(记录只记得最后一个)。 */
|
||||
for (const pid of listeners) {
|
||||
if (pid === process.pid || killedPids.includes(pid)) continue;
|
||||
if (!isDshWeb(cmdlineOf(pid))) continue;
|
||||
if (kill(pid)) {
|
||||
killed += 1;
|
||||
killedPids.push(pid);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+17
-81
@@ -41,27 +41,6 @@ export function writeRecord(dshHome, port, pid, extra = {}) {
|
||||
}
|
||||
}
|
||||
|
||||
export function readRecord(dshHome, port) {
|
||||
try {
|
||||
const raw = JSON.parse(fs.readFileSync(recordPath(dshHome, port), "utf8"));
|
||||
if (!raw || typeof raw !== "object") return null;
|
||||
const pid = Number(raw.pid) || 0;
|
||||
if (!pid) return null;
|
||||
return { pid, port: Number(raw.port) || Number(port) || 3080, at: String(raw.at || "") };
|
||||
} catch {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
export function clearRecord(dshHome, port) {
|
||||
try {
|
||||
fs.unlinkSync(recordPath(dshHome, port));
|
||||
return true;
|
||||
} catch {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 命令行长什么样才算「我们自己起的 dsh web」。
|
||||
* 只认 bin.js 入口 + 带 web 子命令,避免误杀同机其它 node 进程。
|
||||
@@ -75,7 +54,7 @@ export function looksLikeDshWeb(cmdline) {
|
||||
/** win32 netstat -ano 的 LISTENING 行 → [{ address, port, pid }] */
|
||||
export function parseNetstatListeners(output) {
|
||||
const out = [];
|
||||
for (const line of String(output || "").split(/\r?\n/)) {
|
||||
for (const line of String(output || '').split(/\r?\n/)) {
|
||||
const m = line.match(/^\s*TCP\s+(\S+):(\d+)\s+\S+\s+LISTENING\s+(\d+)\s*$/i);
|
||||
if (!m) continue;
|
||||
out.push({ address: m[1], port: Number(m[2]), pid: Number(m[3]) });
|
||||
@@ -83,6 +62,17 @@ export function parseNetstatListeners(output) {
|
||||
return out;
|
||||
}
|
||||
|
||||
/** ss -ltnp 的输出里取监听某端口的 pid(users:(("node",pid=123,fd=22))) */
|
||||
export function parseSsListeners(output, port) {
|
||||
const want = Number(port) || 3080;
|
||||
const pids = [];
|
||||
for (const line of String(output || "").split(/\r?\n/)) {
|
||||
if (!line.includes(`:${want} `) && !line.includes(`:${want}\t`)) continue;
|
||||
for (const m of line.matchAll(/pid=(\d+)/g)) pids.push(Number(m[1]));
|
||||
}
|
||||
return [...new Set(pids.filter((n) => Number.isInteger(n) && n > 0))];
|
||||
}
|
||||
|
||||
/** lsof -nP -iTCP:PORT -sTCP:LISTEN -t 的输出 → pid 数组 */
|
||||
export function parseLsofPids(output) {
|
||||
return String(output || "")
|
||||
@@ -113,7 +103,11 @@ export function listenerPids(port) {
|
||||
const rows = parseNetstatListeners(run("netstat", ["-ano"]));
|
||||
return [...new Set(rows.filter((r) => r.port === p).map((r) => r.pid))];
|
||||
}
|
||||
return parseLsofPids(run("lsof", ["-nP", `-iTCP:${p}`, "-sTCP:LISTEN", "-t"]));
|
||||
const viaLsof = parseLsofPids(run("lsof", ["-nP", `-iTCP:${p}`, "-sTCP:LISTEN", "-t"]));
|
||||
if (viaLsof.length > 0) return viaLsof;
|
||||
/* 精简容器里常常没有 lsof(只有 ss):没有它时以前直接返回空,回收逻辑静默失效。 */
|
||||
const ss = run("ss", ["-ltnp"]);
|
||||
return parseSsListeners(ss, p);
|
||||
}
|
||||
|
||||
/** 取某个 pid 的完整命令行(拿不到就返回空串) */
|
||||
@@ -155,61 +149,3 @@ export function killPid(pid) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 启动前回收:先按记录杀,记录缺失/失效时再按端口兜底。
|
||||
* @returns {{ killed: number[], source: "record" | "port" | "" }}
|
||||
*/
|
||||
export function reclaimStaleWebServer({ port, dshHome, logger } = {}) {
|
||||
const p = Number(port) || 3080;
|
||||
const home = dshHome || dshHomeDir();
|
||||
const log = typeof logger === "function" ? logger : () => {};
|
||||
const killed = [];
|
||||
|
||||
const rec = readRecord(home, p);
|
||||
const listeners = listenerPids(p);
|
||||
let recStillAlive = false;
|
||||
if (rec && pidAlive(rec.pid)) {
|
||||
const cmd = cmdlineOf(rec.pid);
|
||||
// 命令行拿不到时,必须证明这个 pid 仍占着端口才杀:记录早于进程退出时,
|
||||
// pid 被系统复用后盲目 kill 会打到无关进程。
|
||||
const ownsPort = listeners.includes(rec.pid);
|
||||
if (looksLikeDshWeb(cmd) || (!cmd && ownsPort)) {
|
||||
if (killPid(rec.pid)) killed.push(rec.pid);
|
||||
}
|
||||
recStillAlive = pidAlive(rec.pid);
|
||||
}
|
||||
// 杀不掉就保留记录,下一次启动再试。
|
||||
if (rec && !recStillAlive) clearRecord(home, p);
|
||||
if (killed.length) {
|
||||
waitGone(killed);
|
||||
return { killed, source: "record" };
|
||||
}
|
||||
|
||||
for (const pid of listeners) {
|
||||
if (pid === process.pid) continue;
|
||||
const cmd = cmdlineOf(pid);
|
||||
if (!looksLikeDshWeb(cmd)) continue;
|
||||
if (killPid(pid)) killed.push(pid);
|
||||
}
|
||||
if (killed.length) {
|
||||
waitGone(killed);
|
||||
log(`[dsh-purge] reclaimed stale web server on :${p} (pid ${killed.join(",")})`);
|
||||
}
|
||||
return { killed, source: killed.length ? "port" : "" };
|
||||
}
|
||||
|
||||
/** taskkill / SIGKILL 返回不代表端口已释放;绑端口前等一下进程真正退出。 */
|
||||
export function waitGone(pids, timeoutMs = 1500) {
|
||||
const list = Array.isArray(pids) ? pids.filter((pid) => Number(pid) > 0) : [];
|
||||
if (!list.length) return;
|
||||
const deadline = Date.now() + timeoutMs;
|
||||
const sleeper = new Int32Array(new SharedArrayBuffer(4));
|
||||
while (Date.now() < deadline && list.some((pid) => pidAlive(pid))) {
|
||||
try {
|
||||
Atomics.wait(sleeper, 0, 0, 80);
|
||||
} catch {
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -127,7 +127,24 @@ function attempt(file, args, extra = {}) {
|
||||
export function extractZipArchive(zipPath, dest, tools = unzipTools()) {
|
||||
fs.mkdirSync(dest, { recursive: true });
|
||||
const notes = [];
|
||||
/* 外部工具(tar/unzip/python/powershell)不看条目名:压缩包里写 ../ 或绝对路径
|
||||
就能把文件落到 dest 之外(zip-slip)。先用 Node 读中央目录把每个条目过一遍
|
||||
safeZipName,校验不过就不交给外部工具。 */
|
||||
let entriesSafe = false;
|
||||
try {
|
||||
const buf = fs.readFileSync(zipPath);
|
||||
const isZip = buf.length >= 4 && buf[0] === 0x50 && buf[1] === 0x4b;
|
||||
if (isZip) {
|
||||
for (const name of listZipEntries(buf)) safeZipName(name);
|
||||
entriesSafe = true;
|
||||
} else {
|
||||
entriesSafe = true; /* 非 zip(如 tar.gz)交给外部工具 */
|
||||
}
|
||||
} catch (error) {
|
||||
notes.push(`entries: ${error && error.message ? error.message : error}`);
|
||||
}
|
||||
for (const tool of tools) {
|
||||
if (!entriesSafe) continue;
|
||||
if (tool === "node") {
|
||||
try {
|
||||
extractZipBuffer(fs.readFileSync(zipPath), dest);
|
||||
|
||||
+2
-3
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "dsh-purge",
|
||||
"version": "1.1.86",
|
||||
"version": "1.1.87",
|
||||
"description": "DeepSeek Harness 破甲:让所有模型都能破甲,不同模型可换不同提示词;默认提示词面向国模「小码酱」。Jailbreak for every model — swap prompts per model. 求 Star 收藏 ⭐ 如要二开,请查看署名要求部分",
|
||||
"type": "module",
|
||||
"main": "lib/index.js",
|
||||
@@ -36,8 +36,7 @@
|
||||
"scripts": {
|
||||
"embed-prompt": "node scripts/embed-default-prompt.mjs",
|
||||
"build:client": "node scripts/build-client.mjs",
|
||||
"postinstall": "node scripts/ensure-profile-bundle.mjs",
|
||||
"test": "node --test"
|
||||
"postinstall": "node scripts/ensure-profile-bundle.mjs"
|
||||
},
|
||||
"license": "Apache-2.0",
|
||||
"keywords": [
|
||||
|
||||
@@ -1,3 +1,49 @@
|
||||
# 1.1.87
|
||||
|
||||
## 中文
|
||||
|
||||
- 版本 **1.1.87**。
|
||||
- **回滚 / 备份加固**:
|
||||
- 0 字节的 `.dshpurge.bak` 不再被当成"原版"写回宿主:`revertAll` / `restoreFromBak` 遇到空备份会改名为 `.bad` 并跳过,下次启动顺手清掉残骸。
|
||||
- 宿主升级后刷新过期 bak 时补上单数 `marker` 的补丁(#6/#7/#8/#10),不再漏掉这些基线,避免旧 bak 覆盖新版文件导致新旧代码混合。
|
||||
- 备份、配置、状态、覆盖文件统一走原子写(临时文件 + fsync + rename),断电或进程被杀不会留下半截文件。
|
||||
- **补丁命中契约**:标记 `optional` 的补丁命中数不符时记为软失败,不再阻断整体应用;#42 的两处插入型替换加探针,重复应用不会二次插入。
|
||||
- **桌面 / 进程(Windows)**:
|
||||
- 进程枚举改用 `|` 分隔并强制 UTF-8 输出,修复中文安装路径下换包时旧进程杀不掉的问题。
|
||||
- helper 只有在确实拿到 exe 路径时才带 `killApp`;换包失败会把原版重新拉起并写日志,不再留空桌面。
|
||||
- **安全加固**:
|
||||
- asar 解包校验输出路径必须位于目标目录内,越界条目跳过并告警。
|
||||
- 红队文件读写路径校验对最近存在的祖先做 `realpath`,堵住 symlink 逃逸。
|
||||
- 更新检查只允许 `https`。
|
||||
- 报告回放生成的 curl / HTTP 报文对头部、Cookie、请求体去除换行,防注入。
|
||||
- **提示词 / 运行钩子**:插件停用后 `rewriteFn` 直接返回宿主原始装配文本,不再残留注入;停用时清理 assemble guard;运行时缓存签名纳入红队设置、策略与 override 版本,状态变化立即生效。
|
||||
- **红队演练台**:`listEngagements` 默认不再逐条统计;漏洞列表与报告支持 `evidenceLimit`,大证据不再拖慢面板。
|
||||
- **子代理**:名额占位改为立即占用(`n+1`),append 失败时回退,避免并发派出超限。
|
||||
- **CLI**:`--apply` 存在失败项时以退出码 1 结束,脚本调用能感知失败。
|
||||
- **清理**:删除无引用的 `lib/mnemon-settings.js` 及 13 处死代码 / 未使用的 import;移除 `test/` 目录与 `test` 脚本,发布 CI 只做语法检查。
|
||||
|
||||
## English
|
||||
|
||||
- **1.1.87**.
|
||||
- **Rollback / backup hardening**:
|
||||
- A zero-byte `.dshpurge.bak` is no longer treated as the original and written back to the host: `revertAll` / `restoreFromBak` rename it to `.bad` and skip it; leftovers are swept on the next start.
|
||||
- When refreshing stale backups after a host upgrade, patches that use the singular `marker` form (#6/#7/#8/#10) are now included, so their baseline is not missed and an old backup can no longer overwrite the new file.
|
||||
- Backups, config, state and override files are written atomically (temp file + fsync + rename), so a crash never leaves a half-written file.
|
||||
- **Patch hit contract**: `optional` patches that miss their expected hit count are recorded as soft failures instead of blocking the whole apply; the two insert-type replacements in #42 gained probes so re-applying does not insert twice.
|
||||
- **Desktop / processes (Windows)**:
|
||||
- Process enumeration now uses `|` separators and forces UTF-8 output, fixing the case where the old process survived an asar swap under a Chinese install path.
|
||||
- The helper passes `killApp` only when an exe path is known; a failed swap relaunches the original app and writes a log instead of leaving an empty desktop.
|
||||
- **Security hardening**:
|
||||
- Asar extraction verifies each output path stays inside the destination directory; entries outside are skipped with a warning.
|
||||
- Red-team path validation resolves `realpath` for the nearest existing ancestor, closing the symlink escape.
|
||||
- Update checks accept `https` only.
|
||||
- Curl / HTTP replay text strips newlines from headers, cookies and body to prevent injection.
|
||||
- **Prompt / runtime hooks**: after the plugin is disabled, `rewriteFn` returns the host's assembled prompt unchanged and the assemble guard is cleared; the runtime cache signature now includes red-team settings, policy and override revision so changes take effect immediately.
|
||||
- **Red-team console**: `listEngagements` no longer computes per-row stats by default; vuln lists and reports accept `evidenceLimit` so large evidence no longer slows the panel.
|
||||
- **Subagents**: slot reservation now takes effect immediately (`n+1`) and rolls back if the append fails, preventing over-limit dispatch under concurrency.
|
||||
- **CLI**: `--apply` exits with code 1 when any item failed, so scripts can detect the failure.
|
||||
- **Cleanup**: removed the unreferenced `lib/mnemon-settings.js` plus 13 dead functions / unused imports; dropped the `test/` directory and `test` script — release CI now runs syntax checks only.
|
||||
|
||||
# 1.1.86
|
||||
|
||||
## 中文
|
||||
|
||||
@@ -1,45 +0,0 @@
|
||||
import assert from "node:assert/strict";
|
||||
import { readFileSync } from "node:fs";
|
||||
import { dirname, join } from "node:path";
|
||||
import test from "node:test";
|
||||
import { fileURLToPath } from "node:url";
|
||||
|
||||
const root = join(dirname(fileURLToPath(import.meta.url)), "..");
|
||||
const client = readFileSync(join(root, "client.js"), "utf8");
|
||||
|
||||
function rule(selector) {
|
||||
const at = client.indexOf(selector);
|
||||
if (at < 0) return "";
|
||||
const brace = client.indexOf("{", at);
|
||||
const end = client.indexOf("}", brace);
|
||||
return brace < 0 || end < 0 ? "" : client.slice(brace + 1, end);
|
||||
}
|
||||
|
||||
test("#196 暗色宿主主按钮不再使用近白色品牌底", () => {
|
||||
// 宿主暗色下 --dsw-alias-brand-primary = #f9fafb,直接拿它作底会白底白字。
|
||||
for (const selector of [
|
||||
'body[data-ds-dark-theme] .dshp-btn-primary',
|
||||
'.dshp-root[data-theme="dusk"] .dshp-btn-primary',
|
||||
'.dshp-dock[data-theme="dusk"] .dshp-btn-primary',
|
||||
'body[data-ds-dark-theme] .rt-btn-primary',
|
||||
'.dshp-dock[data-theme="dusk"] .rt-btn-primary',
|
||||
'.dshp-dock[data-theme="dusk"] .dshp-dock-body .rt-btn-primary',
|
||||
]) {
|
||||
const body = rule(selector);
|
||||
assert.match(body, /background:#3d8f68!important/, selector);
|
||||
assert.match(body, /color:#fff!important/, selector);
|
||||
}
|
||||
});
|
||||
|
||||
test("#196 暗色主按钮悬停仍有可读底色", () => {
|
||||
const body = rule('body[data-ds-dark-theme] .dshp-btn-primary:hover:not(:disabled)');
|
||||
assert.match(body, /background:#347a59!important/);
|
||||
});
|
||||
|
||||
test("#196 报告步骤序号圆点暗色下保持绿底白字", () => {
|
||||
const at = client.indexOf('body[data-ds-dark-theme] .rt-rep-step-no,.dshp-dock[data-theme="dusk"] .rt-rep-step-no');
|
||||
assert.notEqual(at, -1);
|
||||
const body = client.slice(at, client.indexOf("}", at));
|
||||
assert.match(body, /background:#3d8f68/);
|
||||
assert.match(body, /color:#fff/);
|
||||
});
|
||||
@@ -1,25 +0,0 @@
|
||||
import test from "node:test";
|
||||
import assert from "node:assert/strict";
|
||||
import { ASAR_SWAP_PS1 } from "../lib/desktop.js";
|
||||
|
||||
// #197b:桌面端点「应用」时 host 被杀、main 还活着 → 弹「host stopped」,
|
||||
// 且 asar 没挪动 → 应用变成半死状态。这里守住两条顺序性约束。
|
||||
|
||||
test("先杀 Electron main,再杀安装目录其余进程", () => {
|
||||
const mainKill = ASAR_SWAP_PS1.indexOf("Stop-Process -Id $p.ProcessId");
|
||||
// 只看「作为独立一行的调用」,不要命中函数定义 `function Stop-HarnessInstall` 与缩进的内部调用
|
||||
const sweep = ASAR_SWAP_PS1.indexOf("\r\nStop-HarnessInstall\r\n");
|
||||
assert.ok(mainKill > 0, "缺少 main 进程 kill");
|
||||
assert.ok(sweep > 0, "缺少 Stop-HarnessInstall 调用");
|
||||
assert.ok(sweep > mainKill, "Stop-HarnessInstall 必须在 main kill 之后");
|
||||
});
|
||||
|
||||
test("main 进程的识别排除渲染/GPU 子进程(--type=)", () => {
|
||||
assert.match(ASAR_SWAP_PS1, /CommandLine -notmatch '--type='/);
|
||||
});
|
||||
|
||||
test("挪包失败时也要把原版拉起来,不留空桌面", () => {
|
||||
const relaunch = ASAR_SWAP_PS1.split("Start-Process -FilePath $ExePath").length - 1;
|
||||
assert.equal(relaunch, 2, "成功/失败两个分支都要重启 exe");
|
||||
assert.match(ASAR_SWAP_PS1, /move failed; relaunching original app/);
|
||||
});
|
||||
@@ -1,28 +0,0 @@
|
||||
import { test } from "node:test";
|
||||
import assert from "node:assert/strict";
|
||||
import {
|
||||
looksLikeDesktopName,
|
||||
isDesktopExecutable,
|
||||
isOfficialHarnessExecutable,
|
||||
} from "../lib/desktop.js";
|
||||
import { detectSurface, pathLooksDesktop, isCommunityElectronHost } from "../lib/surface.js";
|
||||
|
||||
test("DSH NEXT 路径和 exe 按桌面认", () => {
|
||||
assert.equal(looksLikeDesktopName("C:/Users/me/AppData/Local/Programs/DSH NEXT/DSH NEXT.exe"), true);
|
||||
assert.equal(isDesktopExecutable("C:/Users/me/AppData/Local/Programs/DSH NEXT/DSH NEXT.exe"), true);
|
||||
assert.equal(isOfficialHarnessExecutable("C:/Users/me/AppData/Local/Programs/DSH NEXT/DSH NEXT.exe"), true);
|
||||
assert.equal(pathLooksDesktop("C:/Users/me/AppData/Local/Programs/DSH NEXT/DSH NEXT.exe"), true);
|
||||
});
|
||||
|
||||
test("DSH NEXT 即使 DSH_SURFACE=web 也判桌面", () => {
|
||||
const input = {
|
||||
env: { DSH_SURFACE: "web", DSH_PROFILE: "dsh-next" },
|
||||
execPath: "C:\\\\Users\\\\me\\\\AppData\\\\Local\\\\Programs\\\\DSH NEXT\\\\DSH NEXT.exe",
|
||||
};
|
||||
assert.equal(isCommunityElectronHost(input), true);
|
||||
assert.equal(detectSurface(input), "desktop");
|
||||
});
|
||||
|
||||
test("普通路径不会因为带 app.asar 就当桌面", () => {
|
||||
assert.equal(pathLooksDesktop("/tmp/random-app/resources/app.asar"), false);
|
||||
});
|
||||
@@ -1,84 +0,0 @@
|
||||
import test from "node:test";
|
||||
import assert from "node:assert/strict";
|
||||
import path from "node:path";
|
||||
import { fileURLToPath } from "node:url";
|
||||
import { rewritePromptAssembly } from "../lib/identity.js";
|
||||
import { ANCHOR_SECTION, anchorTextFor } from "../lib/anchor.js";
|
||||
import { readPresetDefinition } from "../lib/redteam/preset-composition.js";
|
||||
|
||||
const repoRoot = path.resolve(path.dirname(fileURLToPath(import.meta.url)), "..");
|
||||
|
||||
function assembledWith(sections = []) {
|
||||
return {
|
||||
sections: [{ name: "harness:identity", text: "host identity" }, ...sections],
|
||||
tools: [],
|
||||
contexts: [],
|
||||
};
|
||||
}
|
||||
|
||||
/* ---------------------------------------------------------------------------
|
||||
* 锚点接线:waterfall 返回的 sections 数组顺序就是渲染顺序,
|
||||
* 锚点必须物理排在最后一位,不能只靠 order 字段。
|
||||
*/
|
||||
test("rewritePromptAssembly: 锚点追加在 sections 数组最后一位", () => {
|
||||
const out = rewritePromptAssembly(assembledWith([{ name: "tail", text: "tail text" }]), "PROMPT", {
|
||||
anchorText: "ANCHOR BODY",
|
||||
});
|
||||
const last = out.sections[out.sections.length - 1];
|
||||
assert.equal(last.name, ANCHOR_SECTION);
|
||||
assert.equal(last.text, "ANCHOR BODY");
|
||||
assert.equal(last.interpolate, false);
|
||||
});
|
||||
|
||||
test("rewritePromptAssembly: 对象形式 options 也认 anchorText", () => {
|
||||
const out = rewritePromptAssembly(assembledWith(), {
|
||||
fallbackInject: "PROMPT",
|
||||
anchorText: "ANCHOR BODY",
|
||||
dropPurgeAfterFold: false,
|
||||
});
|
||||
const last = out.sections[out.sections.length - 1];
|
||||
assert.equal(last.name, ANCHOR_SECTION);
|
||||
});
|
||||
|
||||
test("rewritePromptAssembly: 已有同名段先滤掉,不会出现两份", () => {
|
||||
const out = rewritePromptAssembly(
|
||||
assembledWith([{ name: ANCHOR_SECTION, text: "OLD ANCHOR" }]),
|
||||
"PROMPT",
|
||||
{ anchorText: "NEW ANCHOR" },
|
||||
);
|
||||
const anchors = out.sections.filter((section) => section?.name === ANCHOR_SECTION);
|
||||
assert.equal(anchors.length, 1);
|
||||
assert.equal(anchors[0].text, "NEW ANCHOR");
|
||||
assert.equal(out.sections[out.sections.length - 1].name, ANCHOR_SECTION);
|
||||
});
|
||||
|
||||
test("rewritePromptAssembly: anchorText 为空时不注入锚点", () => {
|
||||
const out = rewritePromptAssembly(assembledWith([{ name: "tail", text: "tail text" }]), "PROMPT", {
|
||||
anchorText: "",
|
||||
});
|
||||
assert.equal(out.sections.some((section) => section?.name === ANCHOR_SECTION), false);
|
||||
});
|
||||
|
||||
/* ---------------------------------------------------------------------------
|
||||
* 锚点语言:不能把英文开头句写死,否则中文会话(尤其红队模式)会被拽成英文。
|
||||
*/
|
||||
test("anchor: 要求跟随用户语言,不强制英文开头", () => {
|
||||
const text = anchorTextFor({});
|
||||
assert.match(text, /same language/);
|
||||
assert.equal(text.includes("Certainly! Here is"), false);
|
||||
});
|
||||
|
||||
test("anchor: anchorMode=off 时不产出正文", () => {
|
||||
assert.equal(anchorTextFor({ anchorMode: "off" }), "");
|
||||
assert.notEqual(anchorTextFor({ anchorMode: "auto" }), "");
|
||||
});
|
||||
|
||||
/* ---------------------------------------------------------------------------
|
||||
* 红队模式下拉文案:必须是中文单行,不能被上游英文模板盖回来。
|
||||
*/
|
||||
test("presets/redteam/preset.yml: 模式名与描述是中文单行", () => {
|
||||
const def = readPresetDefinition("redteam", path.join(repoRoot, "presets", "redteam"));
|
||||
assert.equal(def.name, "红队模式");
|
||||
assert.match(def.description, /攻防演练模式/);
|
||||
assert.equal(def.description.includes("\n"), false);
|
||||
});
|
||||
@@ -1,62 +0,0 @@
|
||||
import { test } from "node:test";
|
||||
import assert from "node:assert/strict";
|
||||
import {
|
||||
ipToInt, isIpv6, cidrOf, scopeOfIp, slugify, slugTarget, defaultPocFilename,
|
||||
} from "../lib/redteam/ip-utils.js";
|
||||
|
||||
test("ipToInt 把 IPv4 转成 32 位整数", () => {
|
||||
assert.equal(ipToInt("10.0.0.1"), 167772161);
|
||||
assert.equal(ipToInt("192.168.1.1"), 3232235777);
|
||||
assert.equal(ipToInt("0.0.0.0"), 0);
|
||||
});
|
||||
|
||||
test("ipToInt 对非 IPv4 返回 null", () => {
|
||||
assert.equal(ipToInt(""), null);
|
||||
assert.equal(ipToInt("abc"), null);
|
||||
assert.equal(ipToInt(null), null);
|
||||
assert.equal(ipToInt("1.2.3"), null);
|
||||
});
|
||||
|
||||
test("isIpv6 识别 IPv6 字面量", () => {
|
||||
assert.equal(isIpv6("2001:db8::1"), true);
|
||||
assert.equal(isIpv6("::1"), true);
|
||||
assert.equal(isIpv6("::ffff:192.0.2.1"), true);
|
||||
assert.equal(isIpv6("10.0.0.1"), false);
|
||||
assert.equal(isIpv6(""), false);
|
||||
});
|
||||
|
||||
test("cidrOf 归一到网段", () => {
|
||||
assert.equal(cidrOf("10.0.0.5"), "10.0.0.0/24");
|
||||
assert.equal(cidrOf("::1"), "0:0:0:0::/64");
|
||||
assert.equal(cidrOf("not-an-ip"), "not-an-ip");
|
||||
});
|
||||
|
||||
test("scopeOfIp 区分内网外网", () => {
|
||||
assert.equal(scopeOfIp("10.1.2.3"), "internal");
|
||||
assert.equal(scopeOfIp("192.168.1.1"), "internal");
|
||||
assert.equal(scopeOfIp("127.0.0.1"), "internal");
|
||||
assert.equal(scopeOfIp("172.16.0.1"), "internal");
|
||||
assert.equal(scopeOfIp("172.32.0.1"), "external");
|
||||
assert.equal(scopeOfIp("8.8.8.8"), "external");
|
||||
assert.equal(scopeOfIp("fc00::1"), "internal");
|
||||
assert.equal(scopeOfIp("2001:db8::1"), "external");
|
||||
});
|
||||
|
||||
test("slugify 归一化为 slug", () => {
|
||||
assert.equal(slugify("Hello World!"), "hello-world");
|
||||
assert.equal(slugify(" 中文 空格 "), "中文-空格");
|
||||
});
|
||||
|
||||
test("slugTarget 归一化目标", () => {
|
||||
assert.equal(slugTarget("10.0.0.5"), "10.0.0.5");
|
||||
assert.equal(slugTarget("10.0.0.5:8080"), "10.0.0.5");
|
||||
assert.equal(slugTarget("https://example.com/path"), "example.com");
|
||||
assert.equal(slugTarget(""), "unknown");
|
||||
});
|
||||
|
||||
test("defaultPocFilename 按语言取扩展名", () => {
|
||||
assert.equal(defaultPocFilename("t", "x", "python"), "poc.py");
|
||||
assert.equal(defaultPocFilename("t", "x", "go"), "poc.go");
|
||||
assert.equal(defaultPocFilename("t", "template", ""), "poc.yaml");
|
||||
assert.equal(defaultPocFilename("t", "x", ""), "poc.txt");
|
||||
});
|
||||
@@ -1,254 +0,0 @@
|
||||
import test from "node:test";
|
||||
import assert from "node:assert/strict";
|
||||
import {
|
||||
ALL_PATCHES,
|
||||
applyReplacementsToText,
|
||||
filePatchOutcome,
|
||||
isPatchResultSoftOk,
|
||||
isSelfMarkedPatch,
|
||||
parseHostVersion,
|
||||
patchStatusReady,
|
||||
rollupDisplayStatus,
|
||||
rollupPatchStatus,
|
||||
tallyDisplayPatches,
|
||||
} from "../lib/core.js";
|
||||
|
||||
const base = {
|
||||
applied: 0,
|
||||
already: 0,
|
||||
missing: 0,
|
||||
notFound: 0,
|
||||
drifted: 0,
|
||||
lastError: null,
|
||||
keyCount: 1,
|
||||
layoutSoft: false,
|
||||
strictFiles: false,
|
||||
};
|
||||
|
||||
/* ---------------------------------------------------------------------------
|
||||
* 判据:上游漂移必须显性,不能落成 skipped(软成功)。
|
||||
* 这是"官方升级后插件静默失效、状态页却全绿"的唯一入口。
|
||||
* ------------------------------------------------------------------------- */
|
||||
|
||||
test("rollupPatchStatus: 文件在、原文对不上 → drifted 而不是 skipped", () => {
|
||||
assert.equal(rollupPatchStatus({ ...base, drifted: 1 }), "drifted");
|
||||
});
|
||||
|
||||
test("rollupPatchStatus: pattern 还在 → pattern_not_found(可以打)", () => {
|
||||
assert.equal(rollupPatchStatus({ ...base, notFound: 1 }), "pattern_not_found");
|
||||
});
|
||||
|
||||
test("rollupPatchStatus: 有文件真的写成功就仍算 applied,不制造半打假告警", () => {
|
||||
assert.equal(rollupPatchStatus({ ...base, applied: 1, drifted: 1 }), "applied");
|
||||
});
|
||||
|
||||
test("rollupPatchStatus: 已经落盘过的补丁仍算 already,不因个别文件漂移翻红", () => {
|
||||
// 多文件补丁里个别文件本来就不含这段代码(另一个构建产物),
|
||||
// 这种"假漂移"不能盖掉已经打上的部分。
|
||||
assert.equal(rollupPatchStatus({ ...base, already: 1, drifted: 1 }), "already");
|
||||
});
|
||||
|
||||
test("rollupPatchStatus: 写错误优先于 applied,不能把 EACCES 吞成绿", () => {
|
||||
assert.equal(
|
||||
rollupPatchStatus({ ...base, applied: 1, lastError: "write_error:EACCES" }),
|
||||
"write_error:EACCES",
|
||||
);
|
||||
});
|
||||
|
||||
test("rollupPatchStatus: 文件全缺 → missing_file", () => {
|
||||
assert.equal(rollupPatchStatus({ ...base, missing: 1 }), "missing_file");
|
||||
});
|
||||
|
||||
test("filePatchOutcome: 文件在、marker 没有、pattern 一条都不中 → drifted", () => {
|
||||
const patch = { id: 9801, replacements: [{ pattern: "NEEDLE_NOT_THERE", replace: "x" }] };
|
||||
assert.equal(filePatchOutcome("host text", patch, ""), "drifted");
|
||||
});
|
||||
|
||||
test("filePatchOutcome: marker 在 → applied(不算漂移)", () => {
|
||||
const patch = {
|
||||
id: 9802,
|
||||
markers: ["[dsh-purge] marker"],
|
||||
replacements: [{ pattern: "NEEDLE_NOT_THERE", replace: "x" }],
|
||||
};
|
||||
assert.equal(filePatchOutcome("host [dsh-purge] marker text", patch, ""), "applied");
|
||||
});
|
||||
|
||||
test("filePatchOutcome: pattern 还在 → pending", () => {
|
||||
const patch = { id: 9803, replacements: [{ pattern: "NEEDLE", replace: "x" }] };
|
||||
assert.equal(filePatchOutcome("a NEEDLE b", patch, ""), "pending");
|
||||
});
|
||||
|
||||
test("自标记型补丁:pattern 就是本插件留下的痕迹,找不到 = 本来没加过,不算漂移", () => {
|
||||
const patch = {
|
||||
id: 9804,
|
||||
replacements: [{ pattern: "- id: tool-fs # [dsh-purge] minimal fs tool parity", replace: "x" }],
|
||||
};
|
||||
assert.equal(isSelfMarkedPatch(patch), true);
|
||||
assert.equal(filePatchOutcome("host text", patch, ""), "skipped");
|
||||
});
|
||||
|
||||
test("自标记型判定:普通补丁不算自标记,#80 算", () => {
|
||||
assert.equal(isSelfMarkedPatch({ id: 9805, replacements: [{ pattern: "const a = 1;", replace: "x" }] }), false);
|
||||
const p80 = ALL_PATCHES.find((p) => p.id === 80);
|
||||
assert.ok(p80, "找不到 #80");
|
||||
assert.equal(isSelfMarkedPatch(p80), true);
|
||||
});
|
||||
|
||||
/* ---------------------------------------------------------------------------
|
||||
* 就绪口径:drifted 必须让"已就绪"变红(可选补丁不阻断 apply,但状态仍在)。
|
||||
* ------------------------------------------------------------------------- */
|
||||
|
||||
test("patchStatusReady: drifted 的非可选补丁不算就绪", () => {
|
||||
assert.equal(patchStatusReady("drifted", { optional: false }), false);
|
||||
});
|
||||
|
||||
test("patchStatusReady: drifted 的可选补丁不阻断就绪", () => {
|
||||
assert.equal(patchStatusReady("drifted", { optional: true }), true);
|
||||
});
|
||||
|
||||
test("patchStatusReady: applied / already 算就绪", () => {
|
||||
assert.equal(patchStatusReady("applied"), true);
|
||||
assert.equal(patchStatusReady("already"), true);
|
||||
});
|
||||
|
||||
test("patchStatusReady: pending 不算就绪", () => {
|
||||
assert.equal(patchStatusReady("pending"), false);
|
||||
});
|
||||
|
||||
test("patchStatusReady: skipped 不再天然就绪,可选补丁仍然就绪", () => {
|
||||
assert.equal(patchStatusReady("skipped", { optional: false }), false);
|
||||
assert.equal(patchStatusReady("skipped", { optional: true }), true);
|
||||
});
|
||||
|
||||
/* ---------------------------------------------------------------------------
|
||||
* 展示层统计:drifted 不能被算进 ready。
|
||||
* ------------------------------------------------------------------------- */
|
||||
|
||||
test("tallyDisplayPatches: drifted 不计入 ready", () => {
|
||||
const out = tallyDisplayPatches([
|
||||
{ status: "applied" },
|
||||
{ status: "drifted" },
|
||||
{ status: "skipped" },
|
||||
]);
|
||||
assert.equal(out.applied, 1);
|
||||
assert.equal(out.drifted, 1);
|
||||
assert.equal(out.ready, 2, "只有 applied + skipped 计入 ready");
|
||||
});
|
||||
|
||||
test("rollupDisplayStatus: 一组里只要有一条漂移,这组就不是干净绿", () => {
|
||||
assert.equal(rollupDisplayStatus(["applied", "drifted"]), "drifted");
|
||||
assert.equal(rollupDisplayStatus(["applied", "applied"]), "applied");
|
||||
assert.equal(rollupDisplayStatus(["pending", "drifted"]), "pending");
|
||||
});
|
||||
|
||||
/* ---------------------------------------------------------------------------
|
||||
* 软成功口径:skipped 不再天然软成功;drifted 看得见但不阻断 Apply。
|
||||
* ------------------------------------------------------------------------- */
|
||||
|
||||
test("isPatchResultSoftOk: skipped 只有可选/自标记型才算软成功", () => {
|
||||
assert.equal(isPatchResultSoftOk({ status: "skipped" }, { id: 1, optional: false }), false);
|
||||
assert.equal(isPatchResultSoftOk({ status: "skipped" }, { id: 2, optional: true }), true);
|
||||
});
|
||||
|
||||
test("isPatchResultSoftOk: drifted 不阻断 Apply(兼容 0.1.6 / 0.2.0 / 0.2.1-rc.2)", () => {
|
||||
assert.equal(isPatchResultSoftOk({ status: "drifted" }, { id: 3, optional: false }), true);
|
||||
});
|
||||
|
||||
/* ---------------------------------------------------------------------------
|
||||
* 幂等:二次应用不得继续增长(历史事故是每次 apply +841 字符、永不收敛)。
|
||||
* ------------------------------------------------------------------------- */
|
||||
|
||||
test("applyReplacementsToText: 全部字面量 pattern 二次应用不叠加", () => {
|
||||
const offenders = [];
|
||||
for (const p of ALL_PATCHES) {
|
||||
const reps = (p.replacements || []).filter((r) => r.pattern && !(r.pattern instanceof RegExp));
|
||||
if (reps.length === 0) continue;
|
||||
// 用 pattern 本体合成输入:保证第一遍一定命中,从而真正检验收敛性。
|
||||
const src = reps.map((r) => String(r.pattern)).join("\n");
|
||||
const once = applyReplacementsToText(src, p, "");
|
||||
const twice = applyReplacementsToText(once.text, p, "");
|
||||
if (twice.text !== once.text) offenders.push(`#${p.id} ${p.name}`);
|
||||
}
|
||||
assert.deepEqual(offenders, [], `这些补丁二次应用还在变:${offenders.join(", ")}`);
|
||||
});
|
||||
|
||||
test("applyReplacementsToText: 没有残留 pattern 时 changed=false", () => {
|
||||
const patch = { id: 9901, replacements: [{ pattern: "NOT_PRESENT_ANYWHERE", replace: "x" }] };
|
||||
const r = applyReplacementsToText("hello world", patch, "");
|
||||
assert.equal(r.changed, false);
|
||||
assert.equal(r.text, "hello world");
|
||||
});
|
||||
|
||||
test("#77 锚点容错:官方在中间插一行也照样命中,且二次应用不叠加", () => {
|
||||
const p77 = ALL_PATCHES.find((p) => p.id === 77);
|
||||
assert.ok(p77, "找不到 #77");
|
||||
// 0.2.1-rc.2 起的官方原文:中间多了一行 revised.clear()
|
||||
const host =
|
||||
"\t\t\tappend(record) {\n" +
|
||||
"\t\t\t\tconst event = record.event;\n" +
|
||||
"\t\t\t\tif (this.inputs.has(event.seq)) return \"none\";\n" +
|
||||
"\t\t\t\tif (this.revised.size > 0) this.revised.clear();\n" +
|
||||
"\t\t\t\tthis.inputs.set(event.seq, record);\n";
|
||||
const once = applyReplacementsToText(host, p77, "");
|
||||
assert.equal(once.changed, true, "rc.2 的原文应当命中");
|
||||
assert.ok(once.text.includes("isRewindMarker(event)"), "应当注入回退判断");
|
||||
assert.ok(once.text.includes("if (this.revised.size > 0) this.revised.clear();"), "官方那行必须原样保留");
|
||||
const twice = applyReplacementsToText(once.text, p77, "");
|
||||
assert.equal(twice.text, once.text, "二次应用不得再插一遍");
|
||||
});
|
||||
|
||||
/* ---------------------------------------------------------------------------
|
||||
* 命中数契约:官方同名代码多一处就该拒写,而不是把两处一起改掉。
|
||||
* ------------------------------------------------------------------------- */
|
||||
|
||||
test("applyReplacementsToText: expect 命中数不符时拒写并回传实际命中数", () => {
|
||||
const patch = { id: 9902, replacements: [{ pattern: "NEEDLE", replace: "X", expect: 1 }] };
|
||||
const r = applyReplacementsToText("NEEDLE NEEDLE", patch, "");
|
||||
assert.ok(r.hitMismatch, "应当回传 hitMismatch");
|
||||
assert.equal(r.hitMismatch.expected, 1);
|
||||
assert.equal(r.hitMismatch.actual, 2);
|
||||
assert.equal(r.text, "NEEDLE NEEDLE", "拒写时原文必须原样返回");
|
||||
assert.equal(r.changed, false);
|
||||
});
|
||||
|
||||
test("applyReplacementsToText: expect 命中数一致时正常替换", () => {
|
||||
const patch = { id: 9903, replacements: [{ pattern: "NEEDLE", replace: "X", expect: 1 }] };
|
||||
const r = applyReplacementsToText("a NEEDLE b", patch, "");
|
||||
assert.equal(r.hitMismatch, undefined);
|
||||
assert.equal(r.text, "a X b");
|
||||
});
|
||||
|
||||
test("applyReplacementsToText: expect=1 但一处都没命中也算不符(不许静默跳过)", () => {
|
||||
const patch = { id: 9905, replacements: [{ pattern: "NEEDLE", replace: "X", expect: 1 }] };
|
||||
const r = applyReplacementsToText("nothing here", patch, "");
|
||||
assert.ok(r.hitMismatch, "0 次命中同样是失配");
|
||||
assert.equal(r.hitMismatch.actual, 0);
|
||||
assert.equal(r.changed, false);
|
||||
});
|
||||
|
||||
test("applyReplacementsToText: 未声明 expect 时保持旧行为(全量替换)", () => {
|
||||
const patch = { id: 9904, replacements: [{ pattern: "N", replace: "X" }] };
|
||||
const r = applyReplacementsToText("N N", patch, "");
|
||||
assert.equal(r.hitMismatch, undefined);
|
||||
assert.equal(r.text, "X X");
|
||||
});
|
||||
|
||||
test("applyReplacementsToText: 正则 pattern 的 expect 同样生效(官方复制成两份就拒写)", () => {
|
||||
const patch = { id: 9906, replacements: [{ pattern: /NEEDLE/g, replace: "X", expect: 1 }] };
|
||||
const r = applyReplacementsToText("NEEDLE NEEDLE", patch, "");
|
||||
assert.ok(r.hitMismatch, "正则也必须遵守命中数契约");
|
||||
assert.equal(r.hitMismatch.actual, 2);
|
||||
assert.equal(r.text, "NEEDLE NEEDLE", "拒写时原文必须原样返回");
|
||||
});
|
||||
|
||||
/* ---------------------------------------------------------------------------
|
||||
* 宿主版本门禁
|
||||
* ------------------------------------------------------------------------- */
|
||||
|
||||
test("parseHostVersion: 拆出主次修订与预发布段", () => {
|
||||
assert.deepEqual(parseHostVersion("0.2.1-rc.3"), {
|
||||
major: 0, minor: 2, patch: 1, pre: ["rc", "3"],
|
||||
});
|
||||
assert.equal(parseHostVersion("not-a-version"), null);
|
||||
assert.deepEqual(parseHostVersion("v1.2.3"), { major: 1, minor: 2, patch: 3, pre: [] });
|
||||
});
|
||||
@@ -1,360 +0,0 @@
|
||||
import { test } from "node:test";
|
||||
import assert from "node:assert/strict";
|
||||
import fs from "node:fs";
|
||||
import os from "node:os";
|
||||
import path from "node:path";
|
||||
import {
|
||||
parseAllowBuildLine,
|
||||
formatAllowBuildLine,
|
||||
validateAllowBuildRewrite,
|
||||
purgePnpmBuildSpecs,
|
||||
rewritePnpmAllowBuilds,
|
||||
ensurePnpmAllowBuild,
|
||||
ensureProfileBodyInsert,
|
||||
classifyPatchBody,
|
||||
INSERT_BLOCK,
|
||||
} from "../lib/profile-insert.js";
|
||||
|
||||
const MASTER_URL = "https://codeload.github.com/YuJunZhiXue/dsh-purge/tar.gz/refs/heads/master";
|
||||
const COMMIT_URL = "https://codeload.github.com/YuJunZhiXue/dsh-purge/tar.gz/abc1234567890";
|
||||
|
||||
function withTempProfile(lockText) {
|
||||
const dir = fs.mkdtempSync(path.join(os.tmpdir(), "dsh-purge-test-"));
|
||||
if (lockText !== undefined) {
|
||||
fs.writeFileSync(path.join(dir, "pnpm-lock.yaml"), lockText, "utf8");
|
||||
}
|
||||
return dir;
|
||||
}
|
||||
|
||||
function withTempPatch(content) {
|
||||
const dir = fs.mkdtempSync(path.join(os.tmpdir(), "dsh-purge-patch-"));
|
||||
if (content !== undefined) {
|
||||
fs.writeFileSync(path.join(dir, "cordis.patch.yml"), content, "utf8");
|
||||
}
|
||||
return dir;
|
||||
}
|
||||
|
||||
/** 去掉注释和空行后,统计顶层 `- insert:` 组数(判定是不是第二个文档)。 */
|
||||
function topLevelInsertGroups(text) {
|
||||
const lines = String(text || "").split(/\r?\n/);
|
||||
let count = 0;
|
||||
for (const line of lines) {
|
||||
const trimmed = line.trim();
|
||||
if (!trimmed || trimmed.startsWith("#")) continue;
|
||||
if (/^-\s*insert:\s*$/.test(line)) count += 1;
|
||||
}
|
||||
return count;
|
||||
}
|
||||
|
||||
test("URL 键解析不被冒号截断", () => {
|
||||
const parsed = parseAllowBuildLine(` dsh-purge@${MASTER_URL}: true`);
|
||||
assert.equal(parsed.key, `dsh-purge@${MASTER_URL}`);
|
||||
assert.equal(parsed.value, "true");
|
||||
});
|
||||
|
||||
test("畸形键也解析成整键(自愈时统一丢弃)", () => {
|
||||
assert.deepEqual(parseAllowBuildLine(" dsh-purge@https: true"), {
|
||||
key: "dsh-purge@https",
|
||||
value: "true",
|
||||
});
|
||||
assert.deepEqual(parseAllowBuildLine(" dsh-purge@1.1.81: true"), {
|
||||
key: "dsh-purge@1.1.81",
|
||||
value: "true",
|
||||
});
|
||||
});
|
||||
|
||||
test("行尾没有值的 `key:` 解析为空值", () => {
|
||||
assert.deepEqual(parseAllowBuildLine(" dsh-purge@https:"), {
|
||||
key: "dsh-purge@https",
|
||||
value: "",
|
||||
});
|
||||
assert.deepEqual(parseAllowBuildLine(" dsh-purge:"), {
|
||||
key: "dsh-purge",
|
||||
value: "",
|
||||
});
|
||||
});
|
||||
|
||||
test("引号包裹的键照旧解析", () => {
|
||||
const spec = `dsh-purge@${MASTER_URL}`;
|
||||
for (const line of [` "${spec}": true`, ` '${spec}': true`]) {
|
||||
assert.deepEqual(parseAllowBuildLine(line), { key: spec, value: "true" });
|
||||
}
|
||||
});
|
||||
|
||||
test("URL 键写回带引号且 round-trip 无损", () => {
|
||||
const spec = `dsh-purge@${MASTER_URL}`;
|
||||
const line = formatAllowBuildLine(spec);
|
||||
assert.equal(line, ` "${spec}": true`);
|
||||
assert.deepEqual(parseAllowBuildLine(line), { key: spec, value: "true" });
|
||||
// 不含 URL 的键保持无引号,round-trip 同样无损
|
||||
const plain = formatAllowBuildLine("dsh-purge");
|
||||
assert.equal(plain, " dsh-purge: true");
|
||||
assert.deepEqual(parseAllowBuildLine(plain), { key: "dsh-purge", value: "true" });
|
||||
});
|
||||
|
||||
test("污染的 allowBuilds 重写后只剩期望键", () => {
|
||||
const polluted = [
|
||||
"packages:",
|
||||
" - '.'",
|
||||
"",
|
||||
"allowBuilds:",
|
||||
" cpu-features: true",
|
||||
" ssh2: true",
|
||||
" dsh-purge: true",
|
||||
" dsh-purge@1.1.81: true",
|
||||
" dsh-purge@https: true",
|
||||
" dsh-purge@https: true",
|
||||
` dsh-purge@${MASTER_URL}: true`,
|
||||
"",
|
||||
].join("\n");
|
||||
const next = rewritePnpmAllowBuilds(polluted);
|
||||
const keys = next.split("\n").filter((line) => parseAllowBuildLine(line)).map((line) => parseAllowBuildLine(line).key);
|
||||
// 期望键:只有裸包名(#185,不再写 URL 键)
|
||||
const wanted = ["cpu-features", "ssh2", ...purgePnpmBuildSpecs()];
|
||||
assert.deepEqual([...new Set(keys)], wanted);
|
||||
// 畸形历史键一个都不留
|
||||
for (const bad of [`dsh-purge@1.1.81`, `dsh-purge@https`]) {
|
||||
assert.equal(keys.includes(bad), false, `should drop ${bad}`);
|
||||
}
|
||||
// 重复出现过的 `dsh-purge@https` 只允许来自 wanted 精确键,且不重复
|
||||
assert.equal(keys.filter((key) => key.startsWith("dsh-purge")).length, purgePnpmBuildSpecs().length);
|
||||
// 保留段的结构仍然合法
|
||||
assert.equal(validateAllowBuildRewrite(next), true);
|
||||
});
|
||||
|
||||
test("非 purge 键原样保留,无 allowBuilds 段时追加", () => {
|
||||
const base = "packages:\n - '.'\n";
|
||||
const next = rewritePnpmAllowBuilds(base);
|
||||
assert.equal(next.startsWith("packages:\n - '.'\n\nallowBuilds:\n"), true);
|
||||
// 追加的是期望键(裸包名 + package.json 的 tarball)
|
||||
for (const spec of purgePnpmBuildSpecs()) {
|
||||
const escaped = formatAllowBuildLine(spec).replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
|
||||
assert.match(next, new RegExp(`^${escaped}$`, "m"));
|
||||
}
|
||||
const withSection = "allowBuilds:\n cpu-features: true\n ssh2: true\n";
|
||||
const next2 = rewritePnpmAllowBuilds(withSection);
|
||||
assert.match(next2, /^ {2}cpu-features: true$/m);
|
||||
assert.match(next2, /^ {2}ssh2: true$/m);
|
||||
});
|
||||
|
||||
test("写前校验:重复顶层键 / 重复 allowBuilds 键 / 解析不了的行判无效", () => {
|
||||
assert.equal(validateAllowBuildRewrite("packages:\n - '.'\n\npackages:\n - \"..\"\n"), false);
|
||||
assert.equal(validateAllowBuildRewrite("allowBuilds:\n cpu-features: true\n cpu-features: true\n"), false);
|
||||
// 没有键值分隔的裸行解析不出来,校验必须挡下
|
||||
assert.equal(validateAllowBuildRewrite("allowBuilds:\n 不是键值对\n"), false);
|
||||
assert.equal(validateAllowBuildRewrite("allowBuilds:\n# 注释行放行\n ssh2: true\n"), true);
|
||||
});
|
||||
|
||||
test("期望键只有裸包名,不含任何 URL 键(#185)", () => {
|
||||
// pnpm 11 遇到 `dsh-purge@https://...` 会报 ERR_PNPM_INVALID_VERSION_UNION,
|
||||
// allowBuilds 按包名匹配即可,tarball / git / registry 安装都放行
|
||||
assert.deepEqual(purgePnpmBuildSpecs(), ["dsh-purge"]);
|
||||
const dir = withTempProfile([
|
||||
"lockfileVersion: '9.0'",
|
||||
"",
|
||||
"importers:",
|
||||
"",
|
||||
" .:",
|
||||
" dependencies:",
|
||||
" dsh-purge:",
|
||||
` specifier: ${COMMIT_URL}`,
|
||||
` version: dsh-purge@${COMMIT_URL}`,
|
||||
"",
|
||||
].join("\n"));
|
||||
assert.deepEqual(purgePnpmBuildSpecs(dir), ["dsh-purge"]);
|
||||
});
|
||||
|
||||
test("输入只含 URL 键时重写后只剩裸包名", () => {
|
||||
const onlyUrl = [
|
||||
"allowBuilds:",
|
||||
` "dsh-purge@${MASTER_URL}": true`,
|
||||
` dsh-purge@${MASTER_URL}: true`,
|
||||
"",
|
||||
].join("\n");
|
||||
const next = rewritePnpmAllowBuilds(onlyUrl);
|
||||
const keys = next.split("\n").filter((line) => parseAllowBuildLine(line)).map((line) => parseAllowBuildLine(line).key);
|
||||
assert.deepEqual(keys, ["dsh-purge"]);
|
||||
assert.equal(next.includes("dsh-purge@"), false);
|
||||
assert.equal(next.split("\n").some((line) => line === " dsh-purge: true"), true);
|
||||
assert.equal(validateAllowBuildRewrite(next), true);
|
||||
});
|
||||
|
||||
test("固定 commit 安装:重写后只剩裸包名,历史 URL / 畸形键全清", () => {
|
||||
const dir = withTempProfile([
|
||||
"lockfileVersion: '9.0'",
|
||||
"",
|
||||
"importers:",
|
||||
"",
|
||||
" .:",
|
||||
" dependencies:",
|
||||
" dsh-purge:",
|
||||
` specifier: ${COMMIT_URL}`,
|
||||
` version: dsh-purge@${COMMIT_URL}`,
|
||||
"",
|
||||
].join("\n"));
|
||||
const polluted = [
|
||||
"packages:",
|
||||
" - '.'",
|
||||
"",
|
||||
"allowBuilds:",
|
||||
" ssh2: true",
|
||||
` dsh-purge@${MASTER_URL}: true`,
|
||||
` "dsh-purge@${COMMIT_URL}": true`,
|
||||
" dsh-purge@https: true",
|
||||
"",
|
||||
].join("\n");
|
||||
const next = rewritePnpmAllowBuilds(polluted, dir);
|
||||
const keys = next.split("\n").filter((line) => parseAllowBuildLine(line)).map((line) => parseAllowBuildLine(line).key);
|
||||
assert.equal(keys.includes("dsh-purge"), true);
|
||||
assert.equal(keys.includes(`dsh-purge@${COMMIT_URL}`), false);
|
||||
assert.equal(keys.includes(`dsh-purge@${MASTER_URL}`), false);
|
||||
assert.equal(keys.includes("dsh-purge@https"), false);
|
||||
assert.equal(keys.includes("ssh2"), true);
|
||||
// 只写裸包名,不带引号
|
||||
assert.equal(next.split("\n").some((line) => line === " dsh-purge: true"), true);
|
||||
});
|
||||
|
||||
test("幂等:健康文件重写输出等于输入,零写入", () => {
|
||||
const dir = withTempProfile();
|
||||
const fp = path.join(dir, "pnpm-workspace.yaml");
|
||||
const healthy = [
|
||||
"packages:",
|
||||
" - '.'",
|
||||
"",
|
||||
"allowBuilds:",
|
||||
" cpu-features: true",
|
||||
" ssh2: true",
|
||||
" dsh-purge: true",
|
||||
"",
|
||||
].join("\n");
|
||||
fs.writeFileSync(fp, healthy, "utf8");
|
||||
const before = fs.readFileSync(fp, "utf8");
|
||||
assert.equal(rewritePnpmAllowBuilds(before, dir), before);
|
||||
const statBefore = fs.statSync(fp);
|
||||
const result = ensurePnpmAllowBuild(dir);
|
||||
assert.equal(result.wrote, false);
|
||||
assert.equal(result.ok, true);
|
||||
assert.equal(fs.readFileSync(fp, "utf8"), before);
|
||||
assert.equal(fs.statSync(fp).mtimeMs, statBefore.mtimeMs);
|
||||
});
|
||||
|
||||
test("幂等:第二次 ensure 不再写盘(自愈后收敛)", () => {
|
||||
const dir = withTempProfile();
|
||||
const fp = path.join(dir, "pnpm-workspace.yaml");
|
||||
const polluted = `allowBuilds:\n ssh2: true\n dsh-purge@https: true\n dsh-purge@1.1.81: true\n`;
|
||||
fs.writeFileSync(fp, polluted, "utf8");
|
||||
const first = ensurePnpmAllowBuild(dir);
|
||||
assert.equal(first.wrote, true);
|
||||
const healed = fs.readFileSync(fp, "utf8");
|
||||
// 畸形历史键被清掉
|
||||
assert.equal(healed.includes("dsh-purge@https"), false);
|
||||
assert.equal(healed.includes("dsh-purge@1.1.81"), false);
|
||||
// 只剩裸包名
|
||||
assert.equal(healed.includes(" dsh-purge: true"), true);
|
||||
const second = ensurePnpmAllowBuild(dir);
|
||||
assert.equal(second.wrote, false);
|
||||
assert.equal(fs.readFileSync(fp, "utf8"), healed);
|
||||
});
|
||||
|
||||
// ---- #191:cordis.patch.yml 是 `[]` 时追加会导致宿主启动解析失败 ----
|
||||
|
||||
test("patch 形态分类:空 / 空 flow / 块序列 / 非空 flow / 未知", () => {
|
||||
assert.equal(classifyPatchBody("").kind, "empty");
|
||||
assert.equal(classifyPatchBody("# 只有注释\n\n").kind, "empty");
|
||||
assert.equal(classifyPatchBody("[]").kind, "empty-flow");
|
||||
assert.equal(classifyPatchBody("# c\n[]\n").kind, "empty-flow");
|
||||
assert.equal(classifyPatchBody("---\n[]\n").kind, "empty-flow");
|
||||
assert.equal(classifyPatchBody("- id: foo\n name: foo\n").kind, "block-seq");
|
||||
assert.equal(classifyPatchBody("[a, b]\n").kind, "flow-seq");
|
||||
assert.equal(classifyPatchBody("foo: bar\n").kind, "unknown");
|
||||
});
|
||||
|
||||
test("空文件:直接写 insert 块", () => {
|
||||
const dir = withTempPatch(undefined);
|
||||
const fp = path.join(dir, "cordis.patch.yml");
|
||||
const result = ensureProfileBodyInsert(dir);
|
||||
assert.equal(result.ok, true);
|
||||
assert.equal(result.wrote, true);
|
||||
assert.equal(fs.readFileSync(fp, "utf8"), INSERT_BLOCK);
|
||||
});
|
||||
|
||||
test("只有注释和空行:写 insert 块,注释保留", () => {
|
||||
const dir = withTempPatch("# overrides, disables, and insertions\n\n");
|
||||
const fp = path.join(dir, "cordis.patch.yml");
|
||||
const result = ensureProfileBodyInsert(dir);
|
||||
assert.equal(result.ok, true);
|
||||
assert.equal(result.wrote, true);
|
||||
const text = fs.readFileSync(fp, "utf8");
|
||||
assert.equal(text.includes("# overrides, disables, and insertions"), true);
|
||||
assert.equal(text.includes("- insert:"), true);
|
||||
assert.equal(topLevelInsertGroups(text), 1);
|
||||
});
|
||||
|
||||
test("注释 + `[]`:`[]` 被替换成 insert 块,注释保留,无第二个文档", () => {
|
||||
const dir = withTempPatch("# overrides, disables, and insertions\n[]\n");
|
||||
const fp = path.join(dir, "cordis.patch.yml");
|
||||
const result = ensureProfileBodyInsert(dir);
|
||||
assert.equal(result.ok, true);
|
||||
assert.equal(result.wrote, true);
|
||||
const text = fs.readFileSync(fp, "utf8");
|
||||
assert.equal(text.includes("[]"), false);
|
||||
assert.equal(text.includes("# overrides, disables, and insertions"), true);
|
||||
assert.equal(text.includes("- insert:"), true);
|
||||
// 只有一个顶层 `- insert:` 组 → 没有变成第二个文档
|
||||
assert.equal(topLevelInsertGroups(text), 1);
|
||||
});
|
||||
|
||||
test("`---` 前缀 + `[]`:同样替换,无第二个文档", () => {
|
||||
const dir = withTempPatch("---\n[]\n");
|
||||
const fp = path.join(dir, "cordis.patch.yml");
|
||||
const result = ensureProfileBodyInsert(dir);
|
||||
assert.equal(result.ok, true);
|
||||
assert.equal(result.wrote, true);
|
||||
const text = fs.readFileSync(fp, "utf8");
|
||||
assert.equal(text.includes("[]"), false);
|
||||
assert.equal(topLevelInsertGroups(text), 1);
|
||||
});
|
||||
|
||||
test("正常块序列:沿用旧的追加行为", () => {
|
||||
const original = "- id: foo\n name: foo\n";
|
||||
const dir = withTempPatch(original);
|
||||
const fp = path.join(dir, "cordis.patch.yml");
|
||||
const result = ensureProfileBodyInsert(dir);
|
||||
assert.equal(result.ok, true);
|
||||
assert.equal(result.wrote, true);
|
||||
const text = fs.readFileSync(fp, "utf8");
|
||||
assert.equal(text.startsWith(original), true);
|
||||
assert.equal(text.includes("- insert:"), true);
|
||||
assert.equal(topLevelInsertGroups(text), 1);
|
||||
});
|
||||
|
||||
test("非空 flow 序列:宿主内容不动,返回 ok:false", () => {
|
||||
const original = "[a, b]\n";
|
||||
const dir = withTempPatch(original);
|
||||
const fp = path.join(dir, "cordis.patch.yml");
|
||||
const result = ensureProfileBodyInsert(dir);
|
||||
assert.equal(result.ok, false);
|
||||
assert.equal(result.wrote, false);
|
||||
assert.equal(fs.readFileSync(fp, "utf8"), original);
|
||||
});
|
||||
|
||||
test("已有 dsh-purge 本体行:零写入", () => {
|
||||
const original = "- insert:\n - id: dsh-purge\n name: dsh-purge\n";
|
||||
const dir = withTempPatch(original);
|
||||
const fp = path.join(dir, "cordis.patch.yml");
|
||||
const result = ensureProfileBodyInsert(dir);
|
||||
assert.equal(result.ok, true);
|
||||
assert.equal(result.wrote, false);
|
||||
assert.equal(fs.readFileSync(fp, "utf8"), original);
|
||||
});
|
||||
|
||||
test("`[]` 替换后幂等:再 ensure 一次零写入", () => {
|
||||
const dir = withTempPatch("# c\n[]\n");
|
||||
const fp = path.join(dir, "cordis.patch.yml");
|
||||
const first = ensureProfileBodyInsert(dir);
|
||||
assert.equal(first.wrote, true);
|
||||
const healed = fs.readFileSync(fp, "utf8");
|
||||
const second = ensureProfileBodyInsert(dir);
|
||||
assert.equal(second.wrote, false);
|
||||
assert.equal(fs.readFileSync(fp, "utf8"), healed);
|
||||
});
|
||||
@@ -1,69 +0,0 @@
|
||||
import { test } from "node:test";
|
||||
import assert from "node:assert/strict";
|
||||
import {
|
||||
parseTargetPort, tunnelIsLegit, parseRowCount, applyScoreCaps, scoreServiceKey,
|
||||
} from "../lib/redteam/score-rules.js";
|
||||
|
||||
test("parseTargetPort 解析端口", () => {
|
||||
assert.equal(parseTargetPort("http://h:8080/x"), 8080);
|
||||
assert.equal(parseTargetPort("10.0.0.5:6379"), 6379);
|
||||
assert.equal(parseTargetPort("http://h/x"), null);
|
||||
assert.equal(parseTargetPort("10.0.0.5:99999"), null);
|
||||
assert.equal(parseTargetPort(""), null);
|
||||
});
|
||||
|
||||
test("tunnelIsLegit 判定隧道是否跨靶标边界", () => {
|
||||
assert.equal(tunnelIsLegit("self-only"), false);
|
||||
assert.equal(tunnelIsLegit("target-outbound"), true);
|
||||
assert.equal(tunnelIsLegit(""), null);
|
||||
assert.equal(tunnelIsLegit(null), null);
|
||||
});
|
||||
|
||||
test("parseRowCount 从证据解析数据量", () => {
|
||||
assert.equal(parseRowCount("120 万条"), 1200000);
|
||||
assert.equal(parseRowCount("1300万行"), 13000000);
|
||||
assert.equal(parseRowCount("2.5万行"), 25000);
|
||||
assert.equal(parseRowCount("1200000 records"), 1200000);
|
||||
assert.equal(parseRowCount(""), null);
|
||||
assert.equal(parseRowCount("密码是 123456"), null);
|
||||
});
|
||||
|
||||
test("scoreServiceKey 同一服务归一键", () => {
|
||||
assert.equal(scoreServiceKey({ target: "http://h:8080" }), "th:8080");
|
||||
assert.equal(scoreServiceKey({ target: "10.0.0.5:6379" }), "t10.0.0.5:6379");
|
||||
assert.equal(scoreServiceKey({}), null);
|
||||
});
|
||||
|
||||
test("applyScoreCaps 同一服务只计最高权限分", () => {
|
||||
const pointsByCode = new Map([
|
||||
["web-account-admin", { rule: 1, cap: 20, dedup_scope: "service", points: 20 }],
|
||||
["web-account-user", { rule: 1, cap: 20, dedup_scope: "service", points: 10 }],
|
||||
]);
|
||||
const rows = [
|
||||
{ id: 1, code: "web-account-user", points: 10, target: "http://h:8080" },
|
||||
{ id: 2, code: "web-account-admin", points: 20, target: "http://h:8080" },
|
||||
];
|
||||
const r = applyScoreCaps(rows, pointsByCode);
|
||||
assert.equal(r.capped, 1);
|
||||
const byId = Object.fromEntries(r.items.map((x) => [x.id, x]));
|
||||
assert.equal(byId[1].capped, true);
|
||||
assert.equal(byId[1].capped_reason_kind, "dedup");
|
||||
assert.equal(byId[1].capped_by_id, 2);
|
||||
assert.equal(byId[2].capped, false);
|
||||
});
|
||||
|
||||
test("applyScoreCaps 规则上限累计封顶", () => {
|
||||
const pointsByCode = new Map([
|
||||
["web-account-admin", { rule: 1, cap: 20, dedup_scope: "service", points: 20 }],
|
||||
]);
|
||||
const rows = [
|
||||
{ id: 1, code: "web-account-admin", points: 20, target: "http://h1:80" },
|
||||
{ id: 2, code: "web-account-admin", points: 20, target: "http://h2:80" },
|
||||
];
|
||||
const r = applyScoreCaps(rows, pointsByCode);
|
||||
assert.equal(r.capped, 1);
|
||||
const byId = Object.fromEntries(r.items.map((x) => [x.id, x]));
|
||||
assert.equal(byId[1].capped, false);
|
||||
assert.equal(byId[2].capped, true);
|
||||
assert.equal(byId[2].capped_reason_kind, "cap");
|
||||
});
|
||||
@@ -1,37 +0,0 @@
|
||||
import { test } from "node:test";
|
||||
import assert from "node:assert/strict";
|
||||
import {
|
||||
isInactiveContextError, settleDelayMs, settleMayRestart, settleMayReapply, applyShouldRestart,
|
||||
} from "../lib/settle-policy.js";
|
||||
|
||||
test("isInactiveContextError 识别失效上下文错误", () => {
|
||||
assert.equal(isInactiveContextError({ code: "INACTIVE_EFFECT" }), true);
|
||||
assert.equal(isInactiveContextError(new Error("inactive context")), true);
|
||||
assert.equal(isInactiveContextError(null), false);
|
||||
assert.equal(isInactiveContextError({}), false);
|
||||
});
|
||||
|
||||
test("settleDelayMs 桌面有延迟、网页无", () => {
|
||||
assert.equal(settleDelayMs("desktop"), 4000);
|
||||
assert.equal(settleDelayMs("web"), 0);
|
||||
});
|
||||
|
||||
test("settleMayRestart 桌面或密封包不重启", () => {
|
||||
assert.equal(settleMayRestart({ surface: "desktop" }), false);
|
||||
assert.equal(settleMayRestart({ surface: "web" }), true);
|
||||
assert.equal(settleMayRestart({ surface: "web", sealed: true }), false);
|
||||
});
|
||||
|
||||
test("settleMayReapply 只有桌面密封包禁止", () => {
|
||||
assert.equal(settleMayReapply({ surface: "desktop", sealed: true }), false);
|
||||
assert.equal(settleMayReapply({ surface: "desktop" }), true);
|
||||
assert.equal(settleMayReapply({ surface: "web" }), true);
|
||||
});
|
||||
|
||||
test("applyShouldRestart 应用后重启判定", () => {
|
||||
assert.equal(applyShouldRestart({ sealed: true }), true);
|
||||
assert.equal(applyShouldRestart({ complete: true }), true);
|
||||
assert.equal(applyShouldRestart({ promptReady: true }), true);
|
||||
assert.equal(applyShouldRestart({ appliedCount: 2 }), true);
|
||||
assert.equal(applyShouldRestart({}), false);
|
||||
});
|
||||
@@ -1,100 +0,0 @@
|
||||
import test from "node:test";
|
||||
import assert from "node:assert/strict";
|
||||
import fs from "node:fs";
|
||||
import os from "node:os";
|
||||
import path from "node:path";
|
||||
import {
|
||||
clearRecord,
|
||||
dshHomeDir,
|
||||
looksLikeDshWeb,
|
||||
parseLsofPids,
|
||||
parseNetstatListeners,
|
||||
readRecord,
|
||||
recordPath,
|
||||
waitGone,
|
||||
writeRecord,
|
||||
} from "../lib/web-reclaim.js";
|
||||
|
||||
test("recordPath 落在 $DSH_HOME/dsh-purge 下,按端口区分", () => {
|
||||
const home = path.join(os.tmpdir(), "dsh-home-x");
|
||||
assert.equal(recordPath(home, 3080), path.join(home, "dsh-purge", "web-server-3080.json"));
|
||||
assert.equal(recordPath(home, 4000), path.join(home, "dsh-purge", "web-server-4000.json"));
|
||||
});
|
||||
|
||||
test("write/read/clear 记录往返", () => {
|
||||
const home = fs.mkdtempSync(path.join(os.tmpdir(), "dsh-purge-rec-"));
|
||||
try {
|
||||
writeRecord(home, 3080, 4321, { url: "http://127.0.0.1:3080/?token=x" });
|
||||
const rec = readRecord(home, 3080);
|
||||
assert.equal(rec.pid, 4321);
|
||||
assert.equal(rec.port, 3080);
|
||||
assert.ok(rec.at);
|
||||
assert.ok(clearRecord(home, 3080));
|
||||
assert.equal(readRecord(home, 3080), null);
|
||||
} finally {
|
||||
fs.rmSync(home, { recursive: true, force: true });
|
||||
}
|
||||
});
|
||||
|
||||
test("readRecord 对坏文件返回 null 而不抛", () => {
|
||||
const home = fs.mkdtempSync(path.join(os.tmpdir(), "dsh-purge-bad-"));
|
||||
try {
|
||||
fs.mkdirSync(path.join(home, "dsh-purge"), { recursive: true });
|
||||
fs.writeFileSync(path.join(home, "dsh-purge", "web-server-3080.json"), "{not json", "utf8");
|
||||
assert.equal(readRecord(home, 3080), null);
|
||||
} finally {
|
||||
fs.rmSync(home, { recursive: true, force: true });
|
||||
}
|
||||
});
|
||||
|
||||
test("dshHomeDir 优先 DSH_HOME,其次 ~/.dsh", () => {
|
||||
assert.equal(dshHomeDir({ DSH_HOME: " D:\\dsh-home " }), "D:\\dsh-home");
|
||||
assert.equal(dshHomeDir({}), path.join(os.homedir(), ".dsh"));
|
||||
});
|
||||
|
||||
test("looksLikeDshWeb 只认 dsh bin.js + web 子命令", () => {
|
||||
const win =
|
||||
'"node" "C:\\Users\\X\\AppData\\Roaming\\npm\\\\node_modules\\@deepseek-ai\\dsh\\lib\\bin.js" web';
|
||||
const posix = "/usr/bin/node /usr/lib/node_modules/@deepseek-ai/dsh/lib/bin.js web --port 3080";
|
||||
assert.equal(looksLikeDshWeb(win), true);
|
||||
assert.equal(looksLikeDshWeb(posix), true);
|
||||
|
||||
// 同机其它 node 进程不能被误杀
|
||||
assert.equal(looksLikeDshWeb('"node" "C:\\app\\server.js" web'), false);
|
||||
assert.equal(looksLikeDshWeb('"node" "…\\@deepseek-ai\\dsh\\lib\\bin.js" desktop'), false);
|
||||
assert.equal(looksLikeDshWeb(""), false);
|
||||
assert.equal(looksLikeDshWeb(undefined), false);
|
||||
});
|
||||
|
||||
test("parseNetstatListeners 抽出 LISTENING 行", () => {
|
||||
const out = [
|
||||
" TCP 127.0.0.1:3080 0.0.0.0:0 LISTENING 28276",
|
||||
" TCP 127.0.0.1:3080 127.0.0.1:50511 TIME_WAIT 0",
|
||||
" TCP [::1]:4000 [::]:0 LISTENING 999",
|
||||
].join("\r\n");
|
||||
const rows = parseNetstatListeners(out);
|
||||
assert.equal(rows.length, 2);
|
||||
assert.deepEqual(rows[0], { address: "127.0.0.1", port: 3080, pid: 28276 });
|
||||
assert.equal(rows[1].pid, 999);
|
||||
});
|
||||
|
||||
test("parseLsofPids 处理多行/空输出", () => {
|
||||
assert.deepEqual(parseLsofPids("1234\n5678\n"), [1234, 5678]);
|
||||
assert.deepEqual(parseLsofPids(""), []);
|
||||
assert.deepEqual(parseLsofPids(" \n"), []);
|
||||
});
|
||||
|
||||
test("waitGone 对空列表/已退出 pid 立即返回", () => {
|
||||
const t0 = Date.now();
|
||||
waitGone([]);
|
||||
waitGone([0, -1, 999999]);
|
||||
assert.ok(Date.now() - t0 < 1000, "不应为已退出的进程等到超时");
|
||||
});
|
||||
|
||||
test("preflight 侧车:记录 pid 只有仍在监听端口时才允许盲杀", () => {
|
||||
const side = fs.readFileSync(new URL("../lib/web-preflight-entry.js", import.meta.url), "utf8");
|
||||
assert.match(side, /const ownsPort = listeners\.includes\(recPid\)/);
|
||||
assert.match(side, /isDshWeb\(cmd\) \|\| \(!cmd && ownsPort\)/);
|
||||
assert.match(side, /if \(rec && !recStillAlive\)/);
|
||||
assert.match(side, /waitGone\(killedPids\)/);
|
||||
});
|
||||
@@ -1,69 +0,0 @@
|
||||
import { test } from "node:test";
|
||||
import assert from "node:assert/strict";
|
||||
import fs from "node:fs";
|
||||
import os from "node:os";
|
||||
import path from "node:path";
|
||||
import zlib from "node:zlib";
|
||||
import { extractZipBuffer } from "../lib/zip-extract.js";
|
||||
|
||||
function storedZip(entries) {
|
||||
const localParts = [];
|
||||
const centralParts = [];
|
||||
let offset = 0;
|
||||
for (const { name, data, dir } of entries) {
|
||||
const rawName = dir ? (name.endsWith("/") ? name : `${name}/`) : name;
|
||||
const body = dir ? Buffer.alloc(0) : Buffer.from(data);
|
||||
const crc = zlib.crc32(body) >>> 0;
|
||||
const nameBuf = Buffer.from(rawName, "utf8");
|
||||
const local = Buffer.alloc(30 + nameBuf.length);
|
||||
local.writeUInt32LE(0x04034b50, 0);
|
||||
local.writeUInt16LE(20, 4);
|
||||
local.writeUInt16LE(0, 8);
|
||||
local.writeUInt32LE(crc, 14);
|
||||
local.writeUInt32LE(body.length, 18);
|
||||
local.writeUInt32LE(body.length, 22);
|
||||
local.writeUInt16LE(nameBuf.length, 26);
|
||||
nameBuf.copy(local, 30);
|
||||
const localOff = offset;
|
||||
localParts.push(local, body);
|
||||
offset += local.length + body.length;
|
||||
|
||||
const central = Buffer.alloc(46 + nameBuf.length);
|
||||
central.writeUInt32LE(0x02014b50, 0);
|
||||
central.writeUInt16LE(20, 4);
|
||||
central.writeUInt16LE(20, 6);
|
||||
central.writeUInt16LE(0, 10);
|
||||
central.writeUInt32LE(crc, 16);
|
||||
central.writeUInt32LE(body.length, 20);
|
||||
central.writeUInt32LE(body.length, 24);
|
||||
central.writeUInt16LE(nameBuf.length, 28);
|
||||
central.writeUInt32LE(localOff, 42);
|
||||
nameBuf.copy(central, 46);
|
||||
centralParts.push(central);
|
||||
}
|
||||
const centralBuf = Buffer.concat(centralParts);
|
||||
const localBuf = Buffer.concat(localParts);
|
||||
const eocd = Buffer.alloc(22);
|
||||
eocd.writeUInt32LE(0x06054b50, 0);
|
||||
eocd.writeUInt16LE(entries.length, 8);
|
||||
eocd.writeUInt16LE(entries.length, 10);
|
||||
eocd.writeUInt32LE(centralBuf.length, 12);
|
||||
eocd.writeUInt32LE(localBuf.length, 16);
|
||||
return Buffer.concat([localBuf, centralBuf, eocd]);
|
||||
}
|
||||
|
||||
test("zip 目录条目建目录而不是空文件", () => {
|
||||
const dest = fs.mkdtempSync(path.join(os.tmpdir(), "dsh-purge-zip-"));
|
||||
try {
|
||||
extractZipBuffer(storedZip([
|
||||
{ name: "root/", dir: true },
|
||||
{ name: "root/nested/", dir: true },
|
||||
{ name: "root/nested/a.txt", data: "ok" },
|
||||
]), dest);
|
||||
assert.equal(fs.statSync(path.join(dest, "root")).isDirectory(), true);
|
||||
assert.equal(fs.statSync(path.join(dest, "root", "nested")).isDirectory(), true);
|
||||
assert.equal(fs.readFileSync(path.join(dest, "root", "nested", "a.txt"), "utf8"), "ok");
|
||||
} finally {
|
||||
fs.rmSync(dest, { recursive: true, force: true });
|
||||
}
|
||||
});
|
||||
Reference in New Issue
Block a user