Skip to content

Commit 88c0838

Browse files
committed
fix(api): 超限状态活过 error 分支;工作流权限按 job 断言
第二轮评审的三条:①readBody 的 error 路径 resolve("") 会把超限状态抹掉,调用点拿着空串继续写(PUT /persona 能把 "" 解析成 {} 覆盖设置)——改成 resolve(overflow ? null : ""),并补一条 error 分支的回归锁;②release.yml 的权限注释写错了(说 publish 要 contents: write,实际只有 release 要),改成与代码一致的说明;③workflow-guards 原本整个文件 grep id-token,把注释和被移到顶层的权限都放过——改成按 job 切块断言,并先剥掉注释行。
1 parent 7b1a772 commit 88c0838

7 files changed

Lines changed: 71 additions & 12 deletions

File tree

‎.github/workflows/release.yml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,11 @@ on:
2929
type: boolean
3030
default: false
3131

32-
# 权限按 job 发放:只有 publish 需要 contents: write(建 Release 前的 tag 校验)
33-
# 与 id-token: write(npm provenance 走 OIDC)。verify/test/notify 只读代码,
34-
# 工作流级给写权限等于把它们全变成可被依赖链利用的提权面(CWE-250)。
32+
# 权限按 job 发放,工作流级一律只读:
33+
# publish → id-token: write(npm provenance 走 OIDC,不需要长期 token)
34+
# release → contents: write(建/改 GitHub Release)
35+
# verify/test/notify 只读代码。工作流级给写权限等于把它们全变成可被依赖链
36+
# 利用的提权面(CWE-250)。
3537
permissions:
3638
contents: read
3739

‎dsh-mneme/lib/api-standalone.js‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,9 @@ function readBody(req, res) {
118118
body += chunk;
119119
});
120120
req.on("end", () => resolve(overflow ? null : body));
121-
req.on("error", () => resolve(""));
121+
// 超限后再来 transport error 也必须保留超限状态:否则调用点会拿着空串
122+
// 继续往 store 写(PUT /persona 把 "" 解析成 {},覆盖既有设置)。
123+
req.on("error", () => resolve(overflow ? null : ""));
122124
});
123125
}
124126

‎dsh-mneme/lib/api.js‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,9 @@ function readBody(req, res) {
119119
body += chunk;
120120
});
121121
req.on("end", () => resolve(overflow ? null : body));
122-
req.on("error", () => resolve(""));
122+
// 超限后再来 transport error 也必须保留超限状态:否则调用点会拿着空串
123+
// 继续往 store 写(PUT /persona 把 "" 解析成 {},覆盖既有设置)。
124+
req.on("error", () => resolve(overflow ? null : ""));
123125
});
124126
}
125127

‎dsh-mneme/src/api-standalone.js‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,9 @@ function readBody(req, res) {
118118
body += chunk;
119119
});
120120
req.on("end", () => resolve(overflow ? null : body));
121-
req.on("error", () => resolve(""));
121+
// 超限后再来 transport error 也必须保留超限状态:否则调用点会拿着空串
122+
// 继续往 store 写(PUT /persona 把 "" 解析成 {},覆盖既有设置)。
123+
req.on("error", () => resolve(overflow ? null : ""));
122124
});
123125
}
124126

‎dsh-mneme/src/api.js‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,9 @@ function readBody(req, res) {
119119
body += chunk;
120120
});
121121
req.on("end", () => resolve(overflow ? null : body));
122-
req.on("error", () => resolve(""));
122+
// 超限后再来 transport error 也必须保留超限状态:否则调用点会拿着空串
123+
// 继续往 store 写(PUT /persona 把 "" 解析成 {},覆盖既有设置)。
124+
req.on("error", () => resolve(overflow ? null : ""));
123125
});
124126
}
125127

‎dsh-mneme/test/api-hardening.test.js‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,25 @@ test("超大请求体回 413,且不落库", async () => {
135135
assert.equal(service.all().length, before, "超限请求不得留下任何记忆");
136136
});
137137

138+
test("超限后又来 transport error,仍回 413 且不写库", async () => {
139+
// readBody 的超限状态必须活过 error 分支:旧实现 error 时 resolve(""),
140+
// 调用点只认 null,于是拿着空串继续走 → PUT /persona 把 "" 解析成 {},
141+
// 覆盖既有设置。这条锁的就是「413 发出去了,但后面的写入还在跑」。
142+
const { routes, settings } = setup("secret-token");
143+
settings.setRules(["别丢"]);
144+
const huge = Buffer.from("x".repeat(5 * 1024 * 1024));
145+
const r = new EventEmitter();
146+
r.url = "/api/dsh-mneme/rules";
147+
r.method = "PUT";
148+
r.headers = { authorization: "Bearer secret-token" };
149+
const res = new FakeRes();
150+
const done = handler(routes, "/api/dsh-mneme/rules").handler(r, res);
151+
process.nextTick(() => { r.emit("data", huge); r.emit("error", new Error("boom")); });
152+
await done;
153+
assert.equal(res.statusCode, 413);
154+
assert.deepEqual(settings.getRules(), ["别丢"], "error 分支不得让空体落库");
155+
});
156+
138157
test("超大请求体不会清空画像/规则", async () => {
139158
// 这是最要命的一条:readBody 旧实现超限回空串 → parseBody 得到 {} →
140159
// setProfile("") / setRules([]) 把既有内容静默清掉。413 必须在碰 store 之前。

‎dsh-mneme/test/workflow-guards.test.js‎

Lines changed: 35 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
// 工作流配置的回归锁:安全扫描的姿态不能悄悄退回「只提醒」。
1+
// 工作流配置的回归锁:安全扫描与发布权限的姿态不能悄悄退回。
2+
// 这两条锁的都是「配置漂移」——CI 配置没有类型检查,改错了照样绿。
23
import test from "node:test";
34
import assert from "node:assert/strict";
45
import { readFileSync } from "node:fs";
@@ -15,10 +16,39 @@ test("security.yml 的 osv-scanner 保持 fail-on-vuln: true", () => {
1516
assert.doesNotMatch(yml, /fail-on-vuln:\s*false/, "不得退回只上传 SARIF 不拦的档位");
1617
});
1718

18-
test("release.yml 的 publish job 持有 id-token 权限(provenance 前提)", () => {
19-
// --provenance 没有 id-token: write 会直接失败;同时这条也钉住「权限只发给
20-
// publish」——工作流级 id-token 会让 verify/test 也拿到 OIDC 能力。
19+
// 剥掉整行注释再断言:注释里会**描述**「id-token: write 该发给谁」,
20+
// 直接对全文 grep 会被自己写的说明文字骗过(第一版就栽在这里)。
21+
function codeOnly(yml) {
22+
return yml.split(/\r?\n/).filter((l) => !/^\s*#/.test(l)).join("\n");
23+
}
24+
25+
// 按缩进切出单个 job 的文本块:工作流顶层是 0 缩进,job 名是 2 缩进。
26+
// 只做文本切片不做完整 YAML 解析——仓库零依赖,为一条断言引 yaml 解析器不划算。
27+
function jobBlock(yml, name) {
28+
const lines = codeOnly(yml).split(/\r?\n/);
29+
const start = lines.findIndex((l) => l === " " + name + ":");
30+
assert.ok(start >= 0, "找不到 job: " + name);
31+
let end = lines.length;
32+
for (let i = start + 1; i < lines.length; i++) {
33+
if (/^ [A-Za-z0-9_-]+:$/.test(lines[i])) { end = i; break; }
34+
}
35+
return lines.slice(start, end).join("\n");
36+
}
37+
38+
test("release.yml 的 provenance 权限只发给 publish,不发给工作流顶层", () => {
39+
// 三件事分开断言,因为「全文件 grep id-token: write」会被两种错误都骗过:
40+
// ①有人把 id-token 提到工作流顶层(verify/test 也拿到 OIDC 能力)
41+
// ②有人把 publish 的权限删了但别的 job 还有(provenance 会失败)
2142
const yml = readFileSync(path.join(repoRoot, ".github", "workflows", "release.yml"), "utf8");
2243
assert.match(yml, /npm publish[^\n]*--provenance/, "publish 必须带 --provenance");
23-
assert.match(yml, /id-token:\s*write/, "publish job 需要 id-token: write");
44+
45+
const head = codeOnly(yml).split(/\r?\n(?=jobs:)/)[0];
46+
assert.doesNotMatch(head, /id-token:/, "工作流顶层不得声明 id-token(会泄漏给所有 job)");
47+
48+
const publish = jobBlock(yml, "publish");
49+
assert.match(publish, /id-token:\s*write/, "publish job 需要 id-token: write");
50+
assert.doesNotMatch(publish, /contents:\s*write/, "publish 只读代码,不需要 contents: write");
51+
52+
const release = jobBlock(yml, "release");
53+
assert.match(release, /contents:\s*write/, "release job 建 Release 需要 contents: write");
2454
});

0 commit comments

Comments
 (0)