Files
msd-core/sdk/src/query/check-ship-ready.ts
Tom Boucher ac34ab2cec fix(3587): address codex-review findings on PR #3611
Codex review surfaced 2 MED + 2 LOW in-scope findings (3 LOW were
pre-existing or out-of-scope, see below); all in-scope items addressed:

1. (MED, test sensitivity) The gh probe test only checked the boolean
   return shape, so a future change that re-introduces shell-string
   execSync for the gh path would pass. Added an
   `architectural-invariant` structural test that reads the production
   source file and asserts:
     - no `execSync(` call appears anywhere in code,
     - no `spawnSync` with `shell: true`,
     - `execFileSync` is the only imported child_process primitive,
     - every options object explicitly pins `shell: false`.
   This is the canonical pattern from CONTRIBUTING.md for invariants
   that behavioral tests can't observe — the defect is the *presence*
   of the shell parsing primitive, not its output.

2. (MED, cross-platform) The execFileSync options didn't explicitly pin
   `shell: false`. Default is already false, but spelling it out (a)
   documents the architectural invariant at the call site, (b) prevents
   a future options-spread refactor from silently flipping it, and
   (c) hardens against a Windows `git.cmd` shim path that could
   otherwise route through cmd.exe.

3. (LOW, test visibility) The exploit-blocked test silently `return`ed
   when git rejected the payload branch name on a stricter platform,
   turning a coverage loss into a stealth pass. Replaced with vitest's
   `ctx.skip()` so a lane that loses coverage now shows up in the skip
   count.

Out of scope, intentionally not changed:
- The `try/finally` at sdk/src/query/check-ship-ready.test.ts:79 is
  pre-existing test code from before this PR. One-concern-per-PR rule
  says no drive-by cleanup.
- The "use createTempGitProject helper" suggestion: that helper lives
  in tests/helpers.cjs (root, node:test world). SDK tests use vitest
  with their own ad-hoc tmpdir pattern; matching the SDK convention.
- The afterEach cleanup uses `rm` directly, matching the surrounding
  SDK test convention; not changing without broader SDK-side refactor.

Validation:
- SDK unit suite via vitest: 1,870/1,870 pass (+1 invariant test).
- Full root suite via gsd-test-both: 10,676/10,676 Mac AND Linux Docker,
  zero cross-platform diff.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-05-15 20:51:05 -04:00

137 lines
5.0 KiB
TypeScript

/**
* Ship preflight checks (`check.ship-ready`).
*
* Consolidates git/gh checks from `ship.md` into a single structured query.
* All subprocess calls are wrapped in try/catch — never throws on git/gh failures.
* See `.planning/research/decision-routing-audit.md` §3.9.
*
* #3587: every subprocess call uses argv-based execFileSync — never a
* shell-string execSync. Git branch names are repository-controlled data
* and can legally contain metacharacters (`;`, `$`, backticks, etc.); a
* shell-string `git config --get branch.${current_branch}.merge` allowed
* arbitrary command injection from a malicious branch name. Passing args
* as argv elements means the shell is never invoked.
*/
import { execFileSync } from 'node:child_process';
import { GSDError, ErrorClassification } from '../errors.js';
import { normalizePhaseName } from './helpers.js';
import { checkVerificationStatus } from './check-verification-status.js';
import type { QueryHandler } from './utils.js';
/**
* Run a subprocess via argv (NEVER a shell string). Returns trimmed stdout
* on success or null on any failure (non-zero exit, missing binary, etc.).
* The pre-#3587 helper used `execSync(cmd, …)` which spawned `/bin/sh -c`
* and parsed `cmd` as shell syntax — that path is gone.
*/
function runArgvSafe(file: string, args: readonly string[], cwd: string): string | null {
try {
return execFileSync(file, args, {
cwd,
encoding: 'utf-8',
stdio: ['pipe', 'pipe', 'pipe'],
// #3587: pin no-shell intent explicitly. The default is already
// false, but spelling it out (a) documents the architectural
// invariant at the call site and (b) prevents a future options
// refactor from silently re-enabling shell parsing — e.g. on
// Windows where `git.cmd` shim resolution can otherwise route
// through cmd.exe.
shell: false,
}).trim();
} catch {
return null;
}
}
function boolArgvSafe(file: string, args: readonly string[], cwd: string): boolean {
return runArgvSafe(file, args, cwd) !== null;
}
export const checkShipReady: QueryHandler = async (args, projectDir) => {
const raw = args[0];
if (!raw) {
throw new GSDError('phase number required for check ship-ready', ErrorClassification.Validation);
}
normalizePhaseName(raw); // validate format
const blockers: string[] = [];
// git checks — all wrapped in try/catch via helpers, all argv-based.
const porcelain = runArgvSafe('git', ['status', '--porcelain'], projectDir);
const clean_tree = porcelain !== null && porcelain === '';
const current_branch = runArgvSafe('git', ['rev-parse', '--abbrev-ref', 'HEAD'], projectDir);
const on_feature_branch =
current_branch !== null &&
current_branch !== 'main' &&
current_branch !== 'master';
// Determine base branch
let base_branch: string | null = null;
if (current_branch) {
// #3587: branch name passed as a single argv element — git treats it
// as data, the shell is never invoked, no interpolation possible.
const mergeRef = runArgvSafe(
'git',
['config', '--get', `branch.${current_branch}.merge`],
projectDir,
);
if (mergeRef) {
base_branch = mergeRef.replace('refs/heads/', '');
} else {
// Fallback: check if 'main' branch exists, else 'master'
const mainExists = boolArgvSafe('git', ['rev-parse', '--verify', 'main'], projectDir);
base_branch = mainExists ? 'main' : 'master';
}
}
const remoteOut = runArgvSafe('git', ['remote'], projectDir);
const remote_configured = remoteOut !== null && remoteOut.trim().length > 0;
// gh availability — argv as well so a future change that interpolates
// a user-controlled value into the probe cannot silently introduce a
// new injection seam.
const gh_available =
boolArgvSafe('gh', ['--version'], projectDir) ||
boolArgvSafe('which', ['gh'], projectDir);
// gh_authenticated: advisory — skip actual auth check to avoid slow network call
const gh_authenticated = false;
// Verification status
let verification_passed = false;
try {
const verRes = await checkVerificationStatus([raw], projectDir);
const vdata = verRes.data as Record<string, unknown>;
const status = String(vdata.status ?? '').toLowerCase();
verification_passed = status === 'pass' || status === 'passed';
} catch {
verification_passed = false;
}
// Collect blockers
if (!verification_passed) blockers.push('verification status is not passed');
if (!clean_tree) blockers.push('working tree is not clean (uncommitted changes)');
if (!on_feature_branch) blockers.push('not on a feature branch (currently on main/master or unknown)');
if (!remote_configured) blockers.push('no git remote configured');
const ready = verification_passed && clean_tree && on_feature_branch && remote_configured;
return {
data: {
ready,
verification_passed,
clean_tree,
on_feature_branch,
current_branch,
base_branch,
remote_configured,
gh_available,
gh_authenticated,
blockers,
},
};
};