mirror of
https://github.com/garrytan/gstack.git
synced 2026-11-03 07:18:03 +01:00
* fix(cso): record a nested repository as an explicit snapshot exclusion An untracked nested repository makes gstack-cso start fail with UNSAFE_PATH. Git lists it as one entry with a trailing slash, so relativePath() rejected the empty segment and aborted the run. A registered submodule gitlink already failed one step later for the same reason: it is a directory, and the capture loop only reads regular files. Accept the boundary under its own name and record it like a host dependency tree: one manifest entry, originalHash not-read, an excluded: transformation that discloses the omission in the report's snapshot-inputs coverage, no payload copied, and an identity check during capture so a swapped or symlinked boundary fails closed. Nested repository contents are never audited with the outer repository because Git never descends into them. * fix(cso): keep the newest whole commits when history exceeds the 1 MiB bound (#3255) Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * test(cso): regressions and negative controls for nested repos, long history and macOS sockets (#3255, #3248) Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * docs(changelog): blank line before 1.91.149.0 Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * test(cso): set GSTACK_HOME in beforeAll, not at module scope Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * chore: stamp v1.91.152.0 Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> --------- Co-authored-by: Chao Chen <209239467+surlymochan@users.noreply.github.com> Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com>
300 lines
15 KiB
TypeScript
300 lines
15 KiB
TypeScript
// Regressions for /cso on ordinary user repositories: an untracked nested Git
|
|
// repository (#3255 bug 1), a patch history over the 1 MiB bound (#3255 bug 2),
|
|
// and a Docker socket that realpath refuses to open (#3248).
|
|
import { afterAll, afterEach, beforeAll, describe, expect, spyOn, test } from 'bun:test';
|
|
import * as fs from 'node:fs';
|
|
import * as net from 'node:net';
|
|
import * as os from 'node:os';
|
|
import * as path from 'node:path';
|
|
import { spawnSync } from 'node:child_process';
|
|
import { NESTED_REPOSITORY, capture, historyMarker } from '../lib/cso/snapshot';
|
|
import { newRun, readJson } from '../lib/cso/state';
|
|
import { MAX_OUTPUT } from '../lib/cso/contracts';
|
|
import { dockerEndpoint } from '../lib/cso/docker';
|
|
import { TRUSTED_DIRECTORIES } from '../lib/cso/process';
|
|
|
|
const ROOT = path.resolve(import.meta.dir, '..');
|
|
const launcher = path.join(ROOT, 'bin', process.platform === 'win32' ? 'gstack-cso-launcher.exe' : 'gstack-cso-launcher');
|
|
const MIB = 1024 * 1024;
|
|
const CREDENTIAL_CANARY = ['ghp_', 'abcdefghijklmnopqrstuvwxyz1234567890'].join('');
|
|
const OLD_CANARY = ['ghp_', 'zyxwvutsrqponmlkjihgfedcba0987654321'].join('');
|
|
const MARKER = '[gstack-cso history truncated:';
|
|
const roots: string[] = [];
|
|
const originalHome = process.env.GSTACK_HOME;
|
|
let state = '';
|
|
beforeAll(() => {
|
|
state = fs.realpathSync(fs.mkdtempSync(path.join(os.tmpdir(), 'cso-ordinary-state-')));
|
|
process.env.GSTACK_HOME = state;
|
|
});
|
|
afterEach(() => {
|
|
for (const root of roots.splice(0)) fs.rmSync(root, { recursive: true, force: true });
|
|
});
|
|
afterAll(() => {
|
|
if (originalHome === undefined) delete process.env.GSTACK_HOME;
|
|
else process.env.GSTACK_HOME = originalHome;
|
|
fs.rmSync(state, { recursive: true, force: true });
|
|
});
|
|
|
|
function tmp(): string {
|
|
const root = fs.realpathSync(fs.mkdtempSync(path.join(os.tmpdir(), 'cso-ordinary-')));
|
|
roots.push(root);
|
|
return root;
|
|
}
|
|
function git(repo: string, ...args: string[]): string {
|
|
const result = spawnSync('/usr/bin/git', ['-C', repo, ...args], { encoding: 'utf8', env: { HOME: path.dirname(repo), PATH: '/usr/bin:/bin' }, timeout: 60_000 });
|
|
if (result.status) throw new Error(result.stderr);
|
|
return result.stdout;
|
|
}
|
|
function init(repo: string): string {
|
|
fs.mkdirSync(repo, { recursive: true });
|
|
git(repo, 'init', '-q');
|
|
git(repo, 'config', 'user.email', 'fixture@example.test');
|
|
git(repo, 'config', 'user.name', 'Fixture');
|
|
return repo;
|
|
}
|
|
function commit(repo: string, files: Record<string, string>, subject: string): void {
|
|
for (const [file, body] of Object.entries(files)) fs.writeFileSync(path.join(repo, file), body);
|
|
git(repo, 'add', '-A');
|
|
git(repo, 'commit', '-qm', subject);
|
|
}
|
|
function filler(tag: string, bytes: number): string {
|
|
const lines: string[] = [];
|
|
for (let i = 0, size = 0; size < bytes; i++) {
|
|
const line = `export const ${tag}${i} = ${i};`;
|
|
lines.push(line);
|
|
size += line.length + 1;
|
|
}
|
|
return lines.join('\n') + '\n';
|
|
}
|
|
function nestedRepository(outer: string, name: string, files: Record<string, string>): string {
|
|
const inner = init(path.join(outer, name));
|
|
commit(inner, files, 'inner');
|
|
return inner;
|
|
}
|
|
function cso(repo: string, args: string[]) {
|
|
return spawnSync(launcher, args, { cwd: repo, encoding: 'utf8', env: { HOME: path.dirname(repo), GSTACK_HOME: state, PATH: '/usr/bin:/bin' }, timeout: 120_000, maxBuffer: 64 * MIB });
|
|
}
|
|
function runFiles(dir: string): string[] {
|
|
return fs.readdirSync(dir, { recursive: true, withFileTypes: true }).filter((item) => item.isFile()).map((item) => path.join(item.parentPath, item.name));
|
|
}
|
|
|
|
describe('CSO start on a repository with an untracked nested repository (#3255 bug 1)', () => {
|
|
test('start succeeds, records the boundary as an explicit exclusion, and never reads the nested source', () => {
|
|
const repo = init(path.join(tmp(), 'repo'));
|
|
commit(repo, { 'README.md': 'outer\n' }, 'outer');
|
|
nestedRepository(repo, 'inner', { 'secret.txt': `TOKEN=${CREDENTIAL_CANARY}\n` });
|
|
const started = cso(repo, ['start', '--repo', repo, '--scope', 'auth', '--offline']);
|
|
expect(started.stderr).toBe('');
|
|
expect(started.status).toBe(0);
|
|
const run = JSON.parse(started.stdout),
|
|
dir = path.join(state, 'security', 'cso', run.repoId, run.runId),
|
|
report = readJson(path.join(dir, 'report.json')),
|
|
snapshot = report.coverage.find((item: any) => item.domain === 'snapshot-inputs');
|
|
expect(snapshot.exclusions).toEqual([`inner: ${NESTED_REPOSITORY}`]);
|
|
expect(snapshot.gaps).toEqual([]);
|
|
for (const file of runFiles(dir)) expect(fs.readFileSync(file, 'utf8')).not.toContain(CREDENTIAL_CANARY);
|
|
expect(fs.existsSync(path.join(dir, 'snapshot', 'inner'))).toBe(false);
|
|
expect(fs.existsSync(path.join(dir, 'readable', 'inner'))).toBe(false);
|
|
});
|
|
|
|
test('negative control: an untracked symlink to a directory is still refused, not treated as a boundary', () => {
|
|
const root = tmp(),
|
|
repo = init(path.join(root, 'repo')),
|
|
outside = path.join(root, 'outside');
|
|
commit(repo, { 'README.md': 'outer\n' }, 'outer');
|
|
nestedRepository(repo, 'inner', { 'f.txt': 'x\n' });
|
|
fs.mkdirSync(outside);
|
|
fs.writeFileSync(path.join(outside, 'host.txt'), 'host\n');
|
|
fs.symlinkSync(outside, path.join(repo, 'escape'));
|
|
const started = cso(repo, ['start', '--repo', repo, '--scope', 'auth', '--offline']);
|
|
expect(started.status).not.toBe(0);
|
|
expect(JSON.parse(started.stderr).error).toMatchObject({ code: 'UNSAFE_PATH', message: expect.stringContaining('escape') });
|
|
});
|
|
|
|
test('negative control: a nested repository swapped for another directory during capture fails as a snapshot race', async () => {
|
|
const root = tmp(),
|
|
repo = init(path.join(root, 'repo')),
|
|
target = path.join(repo, 'vendor', 'inner'),
|
|
replacement = path.join(root, 'replacement');
|
|
commit(repo, { 'README.md': 'outer\n' }, 'outer');
|
|
fs.mkdirSync(path.join(repo, 'vendor'));
|
|
nestedRepository(repo, 'vendor/inner', { 'f.txt': 'x\n' });
|
|
nestedRepository(root, 'replacement', { 'f.txt': 'y\n' });
|
|
const original = fs.lstatSync;
|
|
let hits = 0;
|
|
const counting = spyOn(fs, 'lstatSync').mockImplementation(((candidate: any, options?: any) => {
|
|
if (path.resolve(String(candidate)) === target) hits++;
|
|
return options === undefined ? original(candidate) : original(candidate, options);
|
|
}) as typeof fs.lstatSync);
|
|
try {
|
|
await capture(repo, newRun(repo).dir, 'HEAD');
|
|
} finally {
|
|
counting.mockRestore();
|
|
}
|
|
const last = hits;
|
|
expect(last).toBeGreaterThan(1);
|
|
hits = 0;
|
|
let swapped = false;
|
|
const swapping = spyOn(fs, 'lstatSync').mockImplementation(((candidate: any, options?: any) => {
|
|
if (path.resolve(String(candidate)) === target && ++hits === last) {
|
|
fs.renameSync(target, `${target}.parked`);
|
|
fs.renameSync(replacement, target);
|
|
swapped = true;
|
|
}
|
|
return options === undefined ? original(candidate) : original(candidate, options);
|
|
}) as typeof fs.lstatSync);
|
|
try {
|
|
await expect(capture(repo, newRun(repo).dir, 'HEAD')).rejects.toMatchObject({ code: 'SNAPSHOT_RACE', message: 'Source changed before snapshot persistence: vendor/inner' });
|
|
} finally {
|
|
swapping.mockRestore();
|
|
}
|
|
expect(swapped).toBe(true);
|
|
});
|
|
});
|
|
|
|
describe('CSO history capture over the 1 MiB bound (#3255 bug 2)', () => {
|
|
test('keeps the newest whole commits that fit, marks the truncation, and still redacts', async () => {
|
|
const repo = init(path.join(tmp(), 'repo'));
|
|
commit(repo, { 'old.ts': filler('old', 450 * 1024) + `// ${OLD_CANARY}\n` }, 'oldest');
|
|
commit(repo, { 'mid.ts': filler('mid', 450 * 1024) }, 'middle');
|
|
commit(repo, { 'new.ts': filler('new', 300 * 1024) + `// ${CREDENTIAL_CANARY}\n` }, 'newest');
|
|
const run = newRun(repo);
|
|
await capture(repo, run.dir);
|
|
const status = readJson(path.join(run.dir, 'history-status.json')),
|
|
history = fs.readFileSync(path.join(run.dir, 'history.txt'), 'utf8');
|
|
expect(status).toMatchObject({ status: 'captured', commits: 2 });
|
|
expect(status.truncated).toBe(`the newest 2 of 3 commits were retained with patches; 1 older commits were omitted to stay within the ${MAX_OUTPUT}-byte history limit`);
|
|
expect(history.startsWith(historyMarker(status.truncated))).toBe(true);
|
|
expect(Buffer.byteLength(history)).toBeLessThanOrEqual(MAX_OUTPUT);
|
|
expect(status.bytes).toBe(Buffer.byteLength(history));
|
|
expect(history).toContain('Subject: newest');
|
|
expect(history).toContain('Subject: middle');
|
|
expect(history).not.toContain('Subject: oldest');
|
|
expect(history).toContain('diff --git a/new.ts b/new.ts');
|
|
expect(history).not.toContain(CREDENTIAL_CANARY);
|
|
expect(history).not.toContain(OLD_CANARY);
|
|
});
|
|
|
|
test('falls back to commit metadata when the newest patch alone exceeds the bound, and still redacts', async () => {
|
|
const repo = init(path.join(tmp(), 'repo'));
|
|
commit(repo, { 'a.ts': 'export const a = 1;\n' }, 'first');
|
|
commit(repo, { 'big.ts': filler('big', 1.2 * MIB) }, `rotate ${CREDENTIAL_CANARY}`);
|
|
const run = newRun(repo);
|
|
await capture(repo, run.dir);
|
|
const status = readJson(path.join(run.dir, 'history-status.json')),
|
|
history = fs.readFileSync(path.join(run.dir, 'history.txt'), 'utf8');
|
|
expect(status).toMatchObject({ status: 'captured', commits: 'metadata for at most 100' });
|
|
expect(status.truncated).toMatch(/^patches were withheld because/);
|
|
expect(history.startsWith(historyMarker(status.truncated))).toBe(true);
|
|
expect(history).toContain('Subject: first');
|
|
expect(history).toContain('Subject: rotate');
|
|
expect(history).not.toContain('diff --git');
|
|
expect(history).not.toContain(CREDENTIAL_CANARY);
|
|
});
|
|
|
|
test('a history within the bound is retained whole with no marker', async () => {
|
|
const repo = init(path.join(tmp(), 'repo'));
|
|
commit(repo, { 'a.ts': 'export const a = 1;\n' }, 'first');
|
|
commit(repo, { 'b.ts': `// ${CREDENTIAL_CANARY}\n` }, 'second');
|
|
const run = newRun(repo);
|
|
await capture(repo, run.dir);
|
|
const status = readJson(path.join(run.dir, 'history-status.json')),
|
|
history = fs.readFileSync(path.join(run.dir, 'history.txt'), 'utf8');
|
|
expect(status).toEqual({ status: 'captured', range: status.range, commits: 'at most 100', bytes: Buffer.byteLength(history) });
|
|
expect(history.startsWith('commit ')).toBe(true);
|
|
expect(history).toContain('Subject: first');
|
|
expect(history).not.toContain(MARKER);
|
|
expect(history).not.toContain(CREDENTIAL_CANARY);
|
|
});
|
|
|
|
test('start reports the truncated history as partial coverage and history stays readable', () => {
|
|
const repo = init(path.join(tmp(), 'repo'));
|
|
commit(repo, { 'old.ts': filler('old', 700 * 1024) }, 'oldest');
|
|
commit(repo, { 'new.ts': filler('new', 700 * 1024) }, 'newest');
|
|
const started = cso(repo, ['start', '--repo', repo, '--scope', 'auth', '--offline']);
|
|
expect(started.stderr).toBe('');
|
|
expect(started.status).toBe(0);
|
|
const run = JSON.parse(started.stdout),
|
|
report = readJson(path.join(state, 'security', 'cso', run.repoId, run.runId, 'report.json')),
|
|
coverage = report.coverage.find((item: any) => item.domain === 'history-inputs');
|
|
expect(coverage.status).toBe('partial');
|
|
expect(coverage.gaps).toEqual([`History truncated: the newest 1 of 2 commits were retained with patches; 1 older commits were omitted to stay within the ${MAX_OUTPUT}-byte history limit`]);
|
|
expect(coverage.evidence[0]).toStartWith('Captured 1 from ');
|
|
const whole = cso(repo, ['history', run.runId]);
|
|
expect(whole.status).toBe(0);
|
|
expect(whole.stdout.startsWith(MARKER)).toBe(true);
|
|
const scoped = cso(repo, ['history', run.runId, 'new.ts']);
|
|
expect(scoped.status).toBe(0);
|
|
expect(scoped.stdout.startsWith('commit ')).toBe(true);
|
|
expect(scoped.stdout).toContain('diff --git a/new.ts b/new.ts');
|
|
});
|
|
});
|
|
|
|
const dockerInstalled = TRUSTED_DIRECTORIES.some((directory) => fs.existsSync(path.join(directory, 'docker')));
|
|
describe.skipIf(process.platform === 'win32' || !dockerInstalled)('CSO Docker endpoint admission when realpath refuses sockets (#3248)', () => {
|
|
let root = '';
|
|
let socketPath = '';
|
|
let server: net.Server;
|
|
const realpath = fs.realpathSync;
|
|
const refusing = ((candidate: fs.PathLike, ...rest: any[]) => {
|
|
let socket = false;
|
|
try {
|
|
socket = fs.statSync(candidate).isSocket();
|
|
} catch {}
|
|
if (socket) {
|
|
const error = new Error('EOPNOTSUPP: operation not supported on socket') as NodeJS.ErrnoException;
|
|
error.code = 'EOPNOTSUPP';
|
|
throw error;
|
|
}
|
|
return realpath(candidate, ...rest);
|
|
}) as typeof fs.realpathSync;
|
|
beforeAll(async () => {
|
|
root = realpath(fs.mkdtempSync(path.join(os.tmpdir(), 'cso-endpoint-')));
|
|
socketPath = path.join(root, 'docker.sock');
|
|
server = net.createServer();
|
|
await new Promise<void>((resolve, reject) => {
|
|
server.once('error', reject);
|
|
server.listen(socketPath, () => resolve());
|
|
});
|
|
});
|
|
afterAll(async () => {
|
|
await new Promise<void>((resolve) => server.close(() => resolve()));
|
|
fs.rmSync(root, { recursive: true, force: true });
|
|
});
|
|
afterEach(() => {
|
|
(fs.realpathSync as any).mockRestore?.();
|
|
});
|
|
const admit = (host: string) => dockerEndpoint(root, { HOME: root, DOCKER_HOST: host });
|
|
|
|
test('admits a socket reached through a symlinked directory and a symlinked leaf, pinned to its identity', async () => {
|
|
const linkedDirectory = path.join(root, 'run'),
|
|
leaf = path.join(root, 'colima.sock');
|
|
fs.symlinkSync(root, linkedDirectory);
|
|
fs.symlinkSync('docker.sock', leaf);
|
|
const stub = spyOn(fs, 'realpathSync').mockImplementation(refusing);
|
|
const identity = fs.statSync(socketPath);
|
|
for (const host of [`unix://${socketPath}`, `unix://${path.join(linkedDirectory, 'colima.sock')}`]) {
|
|
const endpoint = await admit(host);
|
|
expect(endpoint).toMatchObject({ socket: socketPath, uri: `unix://${socketPath}`, device: identity.dev, inode: identity.ino });
|
|
}
|
|
expect(stub.mock.calls.some(([candidate]) => String(candidate) === socketPath)).toBe(true);
|
|
});
|
|
|
|
test('negative controls: non-sockets, dangling or looping links, and non-local URIs are still refused', async () => {
|
|
spyOn(fs, 'realpathSync').mockImplementation(refusing);
|
|
const file = path.join(root, 'plain.sock'),
|
|
dangling = path.join(root, 'dangling.sock'),
|
|
loopA = path.join(root, 'loop-a.sock'),
|
|
loopB = path.join(root, 'loop-b.sock');
|
|
fs.writeFileSync(file, '');
|
|
fs.symlinkSync(path.join(root, 'missing.sock'), dangling);
|
|
fs.symlinkSync(loopB, loopA);
|
|
fs.symlinkSync(loopA, loopB);
|
|
await expect(admit(`unix://${file}`)).rejects.toMatchObject({ code: 'ISOLATION_FAILED', message: 'Docker endpoint is not a local Unix socket' });
|
|
for (const candidate of [dangling, loopA])
|
|
await expect(admit(`unix://${candidate}`)).rejects.toMatchObject({ code: 'ISOLATION_FAILED', message: 'Pinned local Docker socket is unavailable' });
|
|
await expect(admit(`unix://${root}/../${path.basename(root)}/docker.sock`)).rejects.toMatchObject({ code: 'ISOLATION_FAILED' });
|
|
await expect(admit('tcp://127.0.0.1:2375')).rejects.toMatchObject({ code: 'ISOLATION_FAILED' });
|
|
});
|
|
});
|