vrr/openclaw
2
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-10-03 01:29:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 29

fix(release): preserve legacy gh log reads (#137016)

Browse source
This commit is contained in:
Vincent Koc 2026-09-03 19:16:18 +08:00 • committed by GitHub
parent a6dc9a7442
commit 8a718610bd
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 56 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

39
test/scripts/frv.test.ts
View file

@ -1164,6 +1164,13 @@ describe("FRV strict verifier", () => {
});
describe("FRV protected gh evidence reads", () => {
const jobLogArgs = [
"api",
`repos/${REPOSITORY}/actions/jobs/1/logs`,
"-H",
"Cache-Control: max-age=0",
];
it.each([
["getRun", ["101"], "actions/runs/101", { run_attempt: 2 }],
["getRunAttempt", ["101", 2], "actions/runs/101/attempts/2", { run_attempt: 2 }],
@ -1187,8 +1194,22 @@ describe("FRV protected gh evidence reads", () => {
expect(result.calls).toHaveLength(1);
});
it("falls back once when gh does not support the escape-sequence flag", () => {
const result = runProtectedFrv("getJobLog", [1], "actions/jobs/1/logs", "legacy-flag");
expect(result.status, result.stderr).toBe(0);
expect(JSON.parse(result.stdout)).toBe("job evidence");
expect(result.calls).toEqual([[...jobLogArgs, "--allow-escape-sequences"], jobLogArgs]);
});
it("does not fall back after an unrelated job-log error", () => {
const result = runProtectedFrv("getJobLog", [1], "actions/jobs/1/logs", "unrelated");
expect(result.status).toBe(23);
expect(result.stderr).toContain("unrelated log failure");
expect(result.calls).toEqual([[...jobLogArgs, "--allow-escape-sequences"]]);
});
it("preserves protected refusal status without retry or alternate execution", () => {
const result = runProtectedFrv("getRun", ["101"], "actions/runs/101", true);
const result = runProtectedFrv("getRun", ["101"], "actions/runs/101", "protected");
expect(result.status).toBe(19);
expect(result.stderr).toContain("protected refusal");
expect(result.calls).toHaveLength(1);
@ -1199,7 +1220,7 @@ function runProtectedFrv(
method: string,
args: Array<string | number>,
endpoint: string,
denied = false,
failure: "none" | "legacy-flag" | "protected" | "unrelated" = "none",
) {
const root = mkdtempSync(join(tmpdir(), "frv-protected-"));
const gh = join(root, "gh");
@ -1210,9 +1231,13 @@ const fs = require("node:fs");
const args = process.argv.slice(2);
fs.appendFileSync("calls.jsonl", JSON.stringify(args) + "\\n");
const fail = (message, code) => { console.error(message); process.exit(code); };
if (${denied}) fail("protected refusal", 19);
const failure = ${JSON.stringify(failure)};
if (failure === "protected") fail("protected refusal", 19);
if (args[0] !== "api" || !args.includes(${JSON.stringify(`repos/${REPOSITORY}/${endpoint}`)})) fail("unexpected request", 17);
if (!args.some((arg, i) => ["-H", "--header"].includes(arg) && args[i+1] === "Cache-Control: max-age=0")) fail("missing live header", 18);
if (${endpoint.endsWith("/logs")} && failure === "legacy-flag" && args.includes("--allow-escape-sequences")) fail("unknown flag: --allow-escape-sequences", 1);
if (${endpoint.endsWith("/logs")} && failure === "unrelated") fail("unrelated log failure", 23);
if (${endpoint.endsWith("/logs")} && failure === "none" && !args.includes("--allow-escape-sequences")) fail("missing escape-sequence flag", 20);
if (${endpoint.includes("/jobs?")}) {
if (!args.includes("--paginate") || !args.includes(".jobs[] | @json")) fail("missing pagination", 17);
console.log('{"id":1}\\n{"id":2}');
@ -1240,7 +1265,13 @@ if (${endpoint.includes("/jobs?")}) {
env: { HOME: root, PATH: `${root}${delimiter}${process.env.PATH ?? ""}` },
},
);
return { ...result, calls: readFileSync(join(root, "calls.jsonl"), "utf8").trim().split("\n") };
return {
...result,
calls: readFileSync(join(root, "calls.jsonl"), "utf8")
.trim()
.split("\n")
.map((line) => JSON.parse(line)),
};
} finally {
rmSync(root, { recursive: true, force: true });
}