v1.91.176.0 cso: ignore the compiled helpers' leading #! line in the release contract's preparationSha256 (both sides) (#3333)

* cso: ignore the compiled helpers' leading #! line in preparationSha256, on both sides of the release contract

S1 (#3312) rewrote only line 1 of lib/cso/verifier.ts and
lib/cso/preparation-container.ts. That shebang is an unused string in the
compiled helper binaries, but it moved preparationSha256, so qualify run
39535948607 refused the run-5 statements staged at 133cb36 with
STALE_RUNTIME_QUALIFICATION. Garry chose this narrow rule (option 2).

The release contract re-measures a recorded preparationSha256 that differs
from the checkout's at the staged commit (git history), accepts a record
that matches it under the current or the legacy rule, and compares and
records the current-rule value. Both release workflows fetch full history.

* test(cso): prove the release-contract fingerprint rule without git history

Free-suite checkouts are depth 1, so the tests no longer read 133cb36 or
6b2b5f3. They rebuild the staged commit in a scratch repository from this
tree with both helpers' S1 shebang reverted. Its legacy fingerprint equals
the real run-5 record (b069f7ef...), so it is 133cb36's image source byte
for byte, and the contract accepts that record under the current rule.

* v1.91.176.0 stamp
This commit is contained in:
Garry Tan authored and GitHub committed 2026-10-21 19:22:49 +00:00
1 parent 4065e340e9
commit 514fbfdc97
10 files changed
+164 -16

No files matched your search

+77 -5
View File
@@ -1,16 +1,17 @@
import { describe, expect, test } from 'bun:test';
import { afterEach, describe, expect, test } from 'bun:test';
import { spawnSync } from 'node:child_process';
import { createHash } from 'node:crypto';
import { mkdirSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from 'node:fs';
import { copyFileSync, mkdirSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from 'node:fs';
import { tmpdir } from 'node:os';
import { join } from 'node:path';
import { dirname, join } from 'node:path';
import committedCatalog from '../lib/cso/runtime-catalog.json';
import buildInputs from '../lib/cso/images/build-inputs.json';
import { isEvaluationRuntimeCatalog, validateRuntimeCatalog } from '../lib/cso/runtime-catalog';
import { imageBuildMatrix, type ImageBuildRow } from '../scripts/cso-image-matrix';
import { catalogPromotionCandidate, evaluationCandidateCatalog, validateEvaluationCandidate, validateRuntimeCatalogTransition, type RuntimeQualificationStatement } from '../scripts/cso-runtime-promotion';
import { catalogPromotionCandidate, evaluationCandidateCatalog, releaseCandidate, validateEvaluationCandidate, validateRuntimeCatalogTransition, type RuntimeQualificationStatement } from '../scripts/cso-runtime-promotion';
import { assertVersionOutput, probesForBuildRow } from '../scripts/cso-verify-runtime-base';
import { requalificationTriggers } from '../scripts/cso-requalification';
import { committedPreparation, requalificationTriggers } from '../scripts/cso-requalification';
import { gitArgvIn } from './helpers/scratch-repo';
const TRIGGERS = await requalificationTriggers();
const digest = (value: string) => `sha256:${createHash('sha256').update(value).digest('hex')}`;
@@ -220,3 +221,74 @@ describe('CSO evaluation-only runtime catalogs', () => {
expect(isEvaluationRuntimeCatalog(committedCatalog as any)).toBe(false);
});
});
/** preparationSha256 recorded by staging run 39325583697 at 133cb36 (cso-requalification-triggers), before S1. */
const RUN5_RECORD = 'b069f7ef9b19dba9a770cac02a5b6b4b5d60fa68ac058321864b614de14d59f6';
const HELPERS = ['lib/cso/verifier.ts', 'lib/cso/preparation-container.ts'];
const CHECKOUT = join(import.meta.dir, '..');
describe.skipIf(process.platform === 'win32')('CSO release contract preparation fingerprint', () => {
const temps: string[] = [];
afterEach(() => { for (const dir of temps.splice(0)) rmSync(dir, { recursive: true, force: true }); });
const rewrite = (root: string, file: string, change: (lines: string[]) => void) => {
const lines = readFileSync(join(root, file), 'utf8').split('\n'); change(lines); writeFileSync(join(root, file), lines.join('\n'));
};
/** A copy of the checkout's tracked lib/ tree, optionally edited. */
const trackedLib = (edit?: (root: string) => void): string => {
const root = mkdtempSync(join(tmpdir(), 'cso-release-contract-')); temps.push(root);
const listed = spawnSync('git', ['ls-files', '-z', 'lib'], { cwd: CHECKOUT, encoding: 'utf8', timeout: 30_000, maxBuffer: 16 * 1024 * 1024 });
expect(listed.status).toBe(0);
for (const file of listed.stdout.split('\0').filter(Boolean)) {
mkdirSync(dirname(join(root, file)), { recursive: true });
copyFileSync(join(CHECKOUT, file), join(root, file));
}
edit?.(root);
return root;
};
const current = (edit?: (root: string) => void) => requalificationTriggers(trackedLib(edit));
/** The staged commit, rebuilt in a scratch repository: this tree with both helpers' S1 shebang reverted. */
const stagedCommit = () => {
const repo = trackedLib(root => { for (const helper of HELPERS) rewrite(root, helper, lines => { lines[0] = '#!/usr/bin/env bun'; }); });
for (const args of [['init', '-q'], ['add', '-A'], ['commit', '-q', '-m', 'staged']]) expect(gitArgvIn(repo, args, 30_000).status).toBe(0);
const commit = gitArgvIn(repo, ['rev-parse', 'HEAD'], 30_000).stdout.toString().trim();
return { repo, commit, evidence: statements().map(statement => ({ ...statement, sourceCommit: commit })) };
};
test('the run-5 record is this tree with S1\'s shebangs reverted, and the release contract accepts it under the current rule', async () => {
const staged = stagedCommit();
const measured = await committedPreparation(staged.commit, staged.repo);
const main = await current();
const record = { ...main, preparationSha256: RUN5_RECORD };
if (measured.legacy !== RUN5_RECORD) {
// An image source moved since run 5 beyond the shebangs, so its record can no longer be released.
await expect(releaseCandidate(staged.evidence, record, main, staged.repo)).rejects.toThrow(/STALE_RUNTIME_QUALIFICATION|REQUALIFICATION_TRIGGERS_MISMATCH/);
return;
}
// The same SHA-256 over every image source byte: the rebuilt commit is 133cb36's image source, byte for byte.
expect(main.preparationSha256).not.toBe(RUN5_RECORD);
expect(measured.current).toBe(main.preparationSha256);
const released = await releaseCandidate(staged.evidence, record, main, staged.repo);
expect(released.promotion!.requalification).toEqual(main);
}, 120_000);
test('the release contract ignores only a compiled helper\'s leading #! line, on both sides', async () => {
const staged = stagedCommit();
const legacy = (await committedPreparation(staged.commit, staged.repo)).legacy;
const recordFor = (triggers: Awaited<ReturnType<typeof requalificationTriggers>>, preparationSha256 = legacy) => ({ ...triggers, preparationSha256 });
const release = (triggers: Awaited<ReturnType<typeof requalificationTriggers>>, preparationSha256?: string) =>
releaseCandidate(staged.evidence, recordFor(triggers, preparationSha256), triggers, staged.repo);
const main = await current();
expect((await release(main)).promotion!.requalification.preparationSha256).toBe(main.preparationSha256);
for (const helper of HELPERS) {
expect((await current(root => rewrite(root, helper, lines => { lines[0] = '#!/usr/bin/env node'; }))).preparationSha256).toBe(main.preparationSha256);
const drifted = await current(root => rewrite(root, helper, lines => { lines.splice(1, 0, '// drift'); }));
await expect(release(drifted)).rejects.toThrow('STALE_RUNTIME_QUALIFICATION: preparationSha256');
}
await expect(release(await current(root => writeFileSync(join(root, 'lib/cso/images/rails.Dockerfile'), '\n', { flag: 'a' })))).rejects.toThrow('STALE_RUNTIME_QUALIFICATION: preparationSha256');
await expect(release(await current(root => rewrite(root, 'lib/cso/images/entrypoint', lines => { lines[0] = '#!/bin/bash'; })))).rejects.toThrow('STALE_RUNTIME_QUALIFICATION: preparationSha256');
await expect(release(main, 'd'.repeat(64))).rejects.toThrow('REQUALIFICATION_TRIGGERS_MISMATCH');
const recordedUnderCurrentRule = await releaseCandidate(staged.evidence, main, main, join(tmpdir(), 'no-such-checkout'));
expect(recordedUnderCurrentRule.promotion!.requalification).toEqual(main);
}, 180_000);
});