From 6e6d74a1f26ddfd581a59c353fcff05d313570de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20=C3=81ngel?= Date: Tue, 18 Aug 2026 17:01:29 +0000 Subject: [PATCH] test: harden blocked macOS pixel harness --- .../workflows/issue3329-macos-real-pixel.yml | 4 +- scripts/issue3329-artifact-safety.mjs | 26 +++++++++++ scripts/issue3329-macos-real-pixel.mjs | 9 ++-- scripts/issue3329-macos-real-pixel.test.mjs | 46 +++++++++++++++++++ 4 files changed, 80 insertions(+), 5 deletions(-) create mode 100644 scripts/issue3329-artifact-safety.mjs create mode 100644 scripts/issue3329-macos-real-pixel.test.mjs diff --git a/.github/workflows/issue3329-macos-real-pixel.yml b/.github/workflows/issue3329-macos-real-pixel.yml index 52da6dcb9d..d14fe8521d 100644 --- a/.github/workflows/issue3329-macos-real-pixel.yml +++ b/.github/workflows/issue3329-macos-real-pixel.yml @@ -35,12 +35,12 @@ jobs: bun run --filter '@hyperframes/{engine,producer,studio,cli}' build - name: Run real-pixel boundary matrix env: - HF_ISSUE3329_ARTIFACT_DIR: ${{ github.workspace }}/issue3329-macos-artifacts + HF_ISSUE3329_ARTIFACT_DIR: ${{ github.workspace }}/.artifacts/issue3329-macos run: node scripts/issue3329-macos-real-pixel.mjs - name: Upload boundary evidence if: always() uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 with: name: issue3329-macos-real-pixels-${{ runner.arch }} - path: issue3329-macos-artifacts + path: .artifacts/issue3329-macos if-no-files-found: error diff --git a/scripts/issue3329-artifact-safety.mjs b/scripts/issue3329-artifact-safety.mjs new file mode 100644 index 0000000000..6aa60bd299 --- /dev/null +++ b/scripts/issue3329-artifact-safety.mjs @@ -0,0 +1,26 @@ +import { homedir } from "node:os"; +import { isAbsolute, parse, relative, resolve, sep } from "node:path"; + +export function validateArtifactRoot(requestedPath, repoRoot) { + const repo = resolve(repoRoot); + const artifactSpace = resolve(repo, ".artifacts"); + const raw = String(requestedPath ?? ""); + if (raw.split(/[\\/]+/).includes("..")) { + throw new Error("Artifact root must not contain traversal segments"); + } + const target = resolve(repo, raw); + const rel = relative(artifactSpace, target); + const forbidden = new Set([parse(target).root, resolve(homedir()), repo, artifactSpace]); + if ( + forbidden.has(target) || + rel === "" || + rel === ".." || + rel.startsWith(`..${sep}`) || + isAbsolute(rel) + ) { + throw new Error( + "Artifact root must be a dedicated descendant of the repository artifact space", + ); + } + return target; +} diff --git a/scripts/issue3329-macos-real-pixel.mjs b/scripts/issue3329-macos-real-pixel.mjs index 7786b8d58e..1b0475ee96 100644 --- a/scripts/issue3329-macos-real-pixel.mjs +++ b/scripts/issue3329-macos-real-pixel.mjs @@ -1,11 +1,13 @@ import { createHash } from "node:crypto"; import { execFileSync, spawnSync } from "node:child_process"; import { copyFileSync, mkdirSync, readdirSync, readFileSync, rmSync, writeFileSync } from "node:fs"; -import { join, resolve } from "node:path"; +import { join } from "node:path"; +import { validateArtifactRoot } from "./issue3329-artifact-safety.mjs"; const repo = process.cwd(); -const artifactRoot = resolve( - process.env.HF_ISSUE3329_ARTIFACT_DIR ?? join(repo, ".artifacts", "issue3329-macos"), +const artifactRoot = validateArtifactRoot( + process.env.HF_ISSUE3329_ARTIFACT_DIR ?? join(".artifacts", "issue3329-macos"), + repo, ); const projectsRoot = join(artifactRoot, "projects"); const outputsRoot = join(artifactRoot, "outputs"); @@ -106,6 +108,7 @@ function ffprobe(path) { "stream=codec_name,codec_tag_string,pix_fmt,color_space,color_transfer,color_primaries", "-of", "json", + "--", path, ], { encoding: "utf8" }, diff --git a/scripts/issue3329-macos-real-pixel.test.mjs b/scripts/issue3329-macos-real-pixel.test.mjs new file mode 100644 index 0000000000..cbd5564c57 --- /dev/null +++ b/scripts/issue3329-macos-real-pixel.test.mjs @@ -0,0 +1,46 @@ +import assert from "node:assert/strict"; +import { mkdtempSync, readFileSync, realpathSync } from "node:fs"; +import { homedir, tmpdir } from "node:os"; +import { dirname, join, parse, resolve } from "node:path"; +import test from "node:test"; +import { fileURLToPath } from "node:url"; + +const scriptsDir = dirname(fileURLToPath(import.meta.url)); +const repo = realpathSync(resolve(scriptsDir, "..")); + +let safetyModule = null; +try { + safetyModule = await import("./issue3329-artifact-safety.mjs"); +} catch { + // RED: the safety owner does not exist yet. +} + +test("cleanup accepts only a dedicated descendant of the repo artifact space", () => { + assert.ok(safetyModule, "artifact cleanup safety module must exist"); + const safe = join(repo, ".artifacts", "issue3329-macos", "run-1"); + assert.equal(safetyModule.validateArtifactRoot(safe, repo), safe); +}); + +test("cleanup rejects broad, traversing, home, and arbitrary external targets", () => { + assert.ok(safetyModule, "artifact cleanup safety module must exist"); + const outside = mkdtempSync(join(tmpdir(), "hf-issue3329-external-")); + for (const target of [ + parse(repo).root, + homedir(), + repo, + join(repo, ".artifacts"), + join(repo, ".artifacts", "issue3329-macos", "..", ".."), + outside, + ]) { + assert.throws(() => safetyModule.validateArtifactRoot(target, repo), /artifact root/i); + } +}); + +test("ffprobe terminates option parsing before its controlled input path", () => { + const source = readFileSync(join(scriptsDir, "issue3329-macos-real-pixel.mjs"), "utf8"); + assert.match( + source, + /"-of",\s*"json",\s*"--",\s*path/, + "ffprobe input must follow the -- option terminator", + ); +});