jason.woltje
87db40e0cd
Review "changes 8" fix round for org-redact6. - launcher: a harness module's throw names its system code or class, never its message; preflight, loader, bundle, checkout, sandbox and route text is relayed with host paths replaced (relay()). - claude-code and pi preflights name MOSAIC_CLAUDE_BIN and the repository's node_modules, never a path; persona and skill bundle errors and sandboxProblem name their file or the sandbox by label. - seat session: thread store, legacy store, overlap, busy lock and newRun refusals name the place under the data root. - discord: unknown keys, binding names and turn ids are described when not plain; approvals, journal and repository read errors name the file and code; git drops stderr lines that carry a host path and a spawn failure names its code only. - seat, control-board: registration fields and seen keys are described when not plain; invalid seat name and layout state the constraint. - organization: the registry names the config directory and registry file by label; --project is quoted only when it is a plain name; systemConfigProblem moves to its own module. - scripts/mosaic-config.mjs: the config by where it came from, the data root and its marker by role, keys and arguments only when plain, and error codes in place of raw messages. Exit codes unchanged. - webui sso-config: an unknown console key is named only when plain. Sentinel tests in each package's path-redaction-labels file fail on BASE; pins that quoted a path now assert the label and its absence.
67 lines
3.7 KiB
JavaScript
67 lines
3.7 KiB
JavaScript
import { test } from 'node:test';
|
|
import assert from 'node:assert/strict';
|
|
import { spawnSync } from 'node:child_process';
|
|
import { mkdirSync, readFileSync, writeFileSync } from 'node:fs';
|
|
import { dirname, join, resolve } from 'node:path';
|
|
import { loadSystem } from '../src/config.mjs';
|
|
import { tmp } from './helpers.mjs';
|
|
|
|
const repo = resolve(import.meta.dirname, '../../..');
|
|
const configScript = join(repo, 'scripts/mosaic-config.mjs');
|
|
const cli = join(repo, 'packages/cli/src/cli.mjs');
|
|
const secret = 'sk-test-NOT-A-SECRET-1234';
|
|
function fixture(t) {
|
|
const root = tmp(t, 'jr-'), home = join(root, 'home');
|
|
const file = join(home, '.config/mosaic-redacttest/config.json');
|
|
const env = { PATH: process.env.PATH, HOME: home, TMPDIR: process.env.TMPDIR, LANG: 'C.UTF-8', MOSAIC_CONFIG: file };
|
|
const run = (script, ...args) => spawnSync(process.execPath, [script, ...args], { env, cwd: repo, encoding: 'utf8' });
|
|
const boot = () => {
|
|
const result = run(configScript, 'bootstrap', '--instance', 'redacttest');
|
|
assert.equal(result.status, 0, result.stderr);
|
|
};
|
|
return { root, file, env, run, boot };
|
|
}
|
|
// label: the CLI refusal names the file by this label and never by host path (PR #1916).
|
|
// scripts/mosaic-config.mjs names it by label too (#1873 redact6).
|
|
function redacted(result, file, status, label) {
|
|
assert.equal(result.status, status, result.stderr);
|
|
assert.equal(result.stdout, '');
|
|
if (label) {
|
|
assert.ok(!result.stderr.includes(file), result.stderr);
|
|
assert.ok(result.stderr.includes(label), result.stderr);
|
|
} else assert.ok(result.stderr.includes(file), result.stderr);
|
|
assert.match(result.stderr, /not valid JSON/);
|
|
assert.doesNotMatch(result.stderr, /sk-test|Unexpected token/);
|
|
}
|
|
|
|
test('system config parse refusal and CLI relay omit parser bytes', t => {
|
|
const f = fixture(t);
|
|
mkdirSync(dirname(f.file), { recursive: true }); writeFileSync(f.file, secret);
|
|
redacted(f.run(configScript, 'validate', '--instance', 'redacttest'), f.file, 2, 'configuration is not valid JSON (the config of instance redacttest)');
|
|
assert.throws(() => loadSystem({ env: f.env, instance: 'redacttest' }), error => {
|
|
assert.equal(error.exitCode, 3);
|
|
// #1873: the cli relay names the instance's config by label, never its path.
|
|
assert.ok(!error.message.includes(f.file), error.message);
|
|
assert.ok(error.message.includes('configuration is not valid JSON; expected readable JSON: the config of instance redacttest'), error.message);
|
|
assert.match(error.message, /not valid JSON/);
|
|
assert.doesNotMatch(error.message, /sk-test|Unexpected token/);
|
|
return true;
|
|
});
|
|
redacted(f.run(cli, 'org', 'config', 'validate', 'alpha'), f.file, 3, 'configuration is not valid JSON; expected readable JSON: the system config MOSAIC_CONFIG names');
|
|
});
|
|
|
|
test('named instance marker parse refusal omits parser bytes', t => {
|
|
const f = fixture(t); f.boot();
|
|
const { dataRoot } = JSON.parse(readFileSync(f.file, 'utf8'));
|
|
const marker = join(dataRoot, 'instance.json'); writeFileSync(marker, secret);
|
|
redacted(f.run(configScript, 'validate', '--instance', 'redacttest'), marker, 3, "instance-root-unclaimed: the data root's instance marker is not a valid marker (not valid JSON)");
|
|
});
|
|
|
|
for (const operation of ['validate', 'create', 'update']) test(`org ${operation} document refusal omits parser bytes`, t => {
|
|
const f = fixture(t); f.boot();
|
|
const file = join(f.root, 'alpha.json'); writeFileSync(file, secret);
|
|
const args = operation === 'validate' ? ['validate', file]
|
|
: [operation, 'alpha', '--from', file, ...(operation === 'update' ? ['--if-revision', '1'] : [])];
|
|
redacted(f.run(cli, 'org', ...args), file, 2, 'mosaic: cannot read organization document: not valid JSON\n');
|
|
});
|