1. plan-review-dedup skips only a null or undefined finding; any other entry that is not an object (a string, a number, an array) goes on as before E, a finding with no valid severity that the plan gate counts as a blocker (it was dropped, so a string blocker recorded PASS). 2. plan-gate --record: a previous finding that rule A carried as counted and whose id is backed this round leaves the counted set, the counts, the verdict and the stop rule's summary (it was counted and listed in known_outside at once: BLOCK, not-fewer, and --accept-open refused). 3. A known_outside entry keeps rule_keys; extractVerdict accepts it (a list of strings), and the bare gate re-checks with the same keys the recorder used, so a merged finding whose security key is only in rule_keys is a WARN, not a STOP. 4. plan-critic, scope-guardian and /trekplan Phase 9's round-2 sentences say the Critic Verdict also lists known_outside and each is marked by id in previous. Code already accepts such a mark (dedup passes it; countRound ignores ids it does not carry; --record removes the entry on true); pinned in diff mode and full count. 5. The approval prose names ## Threat Model where it named only ## Intent + ## Goal: skills/annotating/SKILL.md (description, step 4, guard list), docs/command-modes.md, Handover 1's intent_approved_hash row, README (approval, Approve row, intent approval gate) and CLAUDE.md's /trekbrief row. 6. threat-model.mjs gains usableInRepo (a brief path relative to the repo top level) and repoRelativeBrief; --record stores brief_path relative to the top level, never absolute, and both gates read it from there, so the gate run from a subdirectory reads the same brief. reviewThreatModel uses usableInRepo. Handover 4 and the gate header say so. 7. review-finalize's outside pass puts an entry back only when no finding carries its row yet (engine-compare rowOf): an engine finding listed in known_outside while its payload is saved went back twice. 8. A test runs scripts/release-check.mjs on a review whose known_outside entry the brief does not back: exit 2 (control: backed passes the review check). Existing tests changed: plan-gate-threat-model's entry-keys assertion now expects rule_keys (item 3), and its planted non-security entry drops the security key from rule_keys too, since the gate reads rule_keys (item 3). Part 2 fix round of the E plan. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
175 lines
8.9 KiB
JavaScript
175 lines
8.9 KiB
JavaScript
// lib/review/threat-model.mjs
|
|
// One reader of the brief's optional `## Threat Model` (E, decisions 164, 218),
|
|
// for both gates: the plan gate (lib/validators/plan-gate.mjs) and the review's
|
|
// verdict gate (lib/review/verdict-gate.mjs).
|
|
//
|
|
// The section is `- Inside: <text>` / `- Outside: <text>` bullets
|
|
// (brief-validator.mjs `parseThreatModel`, the same reader the validator uses).
|
|
// Voyage's own security findings (plan-critic, scope-guardian, the code
|
|
// reviewer's part for command texts) block inside it; one that quotes an
|
|
// `Outside:` line's text exactly in `threat_model_ref` is backed by that line
|
|
// and becomes a listed known issue instead of a blocker. Engine findings
|
|
// (Claude Code's `/security-review`, Claude Security) block as before: only a
|
|
// security finding not from an engine can be outside (218).
|
|
//
|
|
// readThreatModel(briefText) -> {present, inside, outside, problems}
|
|
// usable(briefPath, repo) -> {usable, why, threatModel}
|
|
// usable = the section is present and well formed, AND the intent approval
|
|
// is current: the two checks /trekplan Phase 1 runs (the marker,
|
|
// checkIntentApprovalContent; and the approval log, verifyLog kind
|
|
// `intent` with the hash's `sha256:` stripped and the subject normalized).
|
|
// Otherwise every security finding counts, and `why` says why.
|
|
// backedLine(finding, tm) -> the `Outside:` text the finding's
|
|
// `threat_model_ref` equals exactly, else null.
|
|
// usableInRepo(briefPath, repo) -> usable() for a brief path relative to
|
|
// the repo's top level (an absolute one as it is); both gates read a
|
|
// stored `brief_path` this way, whatever directory they run in.
|
|
// repoRelativeBrief(briefPath, repo) -> a brief path given from the
|
|
// working directory, made relative to the repo's top level (forward
|
|
// slashes; `..` when outside it), never absolute: what the plan gate
|
|
// stores as `brief_path`.
|
|
// reviewThreatModel(reviewText, repo) -> usableInRepo() for the brief a
|
|
// review names in its `brief_path`; the review side's `known_outside`
|
|
// (E 2.5) is checked with it.
|
|
// isKnownEntry(e) -> a review `known_outside` entry's shape: a
|
|
// finding with a string `rule_key` and `file`, an integer `line` >= 0
|
|
// and a non-empty `threat_model_ref`.
|
|
//
|
|
// Lifting a finding back in is the operator's: change (or remove) that
|
|
// `Outside:` line and approve the intent again. Both gates re-read the brief on
|
|
// every run, so a finding whose line is gone counts in full.
|
|
|
|
import { readFileSync } from 'node:fs';
|
|
import { isAbsolute, join, relative, sep } from 'node:path';
|
|
import { parseDocument } from '../util/frontmatter.mjs';
|
|
import { verifyLog, normalizeHex, normalizeSubject, resolveRepo } from '../util/approval-log.mjs';
|
|
import { checkIntentApprovalContent } from '../validators/intent-approval.mjs';
|
|
import { parseThreatModel } from '../validators/brief-validator.mjs';
|
|
import { isSecurityKey, keysOf } from './plan-review-dedup.mjs';
|
|
|
|
/** The engines' catalogue key (/security-review, Claude Security): never Voyage's own. */
|
|
export const ENGINES_SECURITY_KEY = 'SECURITY_REVIEW_VULNERABILITY';
|
|
|
|
const EMPTY = Object.freeze({ present: false, inside: [], outside: [], problems: [] });
|
|
|
|
/**
|
|
* Read the brief's `## Threat Model`.
|
|
* @param {string} briefText - the whole brief (frontmatter optional)
|
|
* @returns {{present: boolean, inside: string[], outside: string[], problems: string[]}}
|
|
*/
|
|
export function readThreatModel(briefText) {
|
|
const text = typeof briefText === 'string' ? briefText : '';
|
|
const doc = parseDocument(text);
|
|
const body = doc.parsed?.body ?? text;
|
|
return parseThreatModel(body);
|
|
}
|
|
|
|
/**
|
|
* May the brief's threat model be applied? Present, well formed, and the
|
|
* intent approval current (marker and log). Otherwise every security finding
|
|
* counts, and `why` says why.
|
|
* @param {string} briefPath
|
|
* @param {string} [repo] - the repo whose approval log to read (default: the git top level of the working directory)
|
|
* @returns {{usable: boolean, why: string|null, threatModel: {present: boolean, inside: string[], outside: string[], problems: string[]}}}
|
|
*/
|
|
export function usable(briefPath, repo) {
|
|
const no = (why, threatModel = EMPTY) => ({ usable: false, why, threatModel });
|
|
if (typeof briefPath !== 'string' || briefPath === '') return no('no brief path was given');
|
|
let text;
|
|
try { text = readFileSync(briefPath, 'utf8'); } catch (e) { return no(`cannot read the brief ${briefPath}: ${e.message}`); }
|
|
const tm = readThreatModel(text);
|
|
if (!tm.present) return no('the brief has no ## Threat Model', tm);
|
|
if (tm.problems.length > 0) return no(`the brief's ## Threat Model is malformed: ${tm.problems.join('; ')}`, tm);
|
|
const marker = checkIntentApprovalContent(text);
|
|
if (!marker.valid) {
|
|
return no(`the intent approval is not current (${marker.errors.map((e) => e.code).join(', ')})`, tm);
|
|
}
|
|
const sha = normalizeHex(marker.parsed?.frontmatter?.intent_approved_hash);
|
|
if (!sha) return no('the brief carries no intent approval hash', tm);
|
|
let log;
|
|
try {
|
|
const root = resolveRepo(repo);
|
|
log = verifyLog({ repo: root, kind: 'intent', subject: normalizeSubject(root, briefPath), sha });
|
|
} catch (e) {
|
|
return no(`the approval log could not be read: ${e.message}`, tm);
|
|
}
|
|
if (log.exit !== 0) {
|
|
return no(`the intent approval is not in the approval log (${log.status}${log.detail ? `: ${log.detail}` : ''})`, tm);
|
|
}
|
|
return { usable: true, why: null, threatModel: tm };
|
|
}
|
|
|
|
/**
|
|
* usable() for a brief path relative to the repo's top level (an absolute
|
|
* path as it is), so a stored `brief_path` reads the same brief from any
|
|
* working directory.
|
|
* @param {string} briefPath
|
|
* @param {string} [repo] - the repo (default: the git top level of the working directory)
|
|
* @returns {{usable: boolean, why: string|null, threatModel: object}}
|
|
*/
|
|
export function usableInRepo(briefPath, repo) {
|
|
if (typeof briefPath !== 'string' || briefPath.trim() === '') return { usable: false, why: 'no brief path was given', threatModel: EMPTY };
|
|
let root;
|
|
try { root = resolveRepo(repo); } catch (e) {
|
|
return { usable: false, why: `the repo could not be read: ${e.message}`, threatModel: EMPTY };
|
|
}
|
|
return usable(isAbsolute(briefPath) ? briefPath : join(root, briefPath), root);
|
|
}
|
|
|
|
/**
|
|
* A brief path given from the working directory, relative to the repo's top
|
|
* level: forward slashes, `..` when the brief is outside the repo, never absolute.
|
|
* @param {string} briefPath
|
|
* @param {string} [repo] - the repo (default: the git top level of the working directory)
|
|
* @returns {string}
|
|
*/
|
|
export function repoRelativeBrief(briefPath, repo) {
|
|
const root = resolveRepo(repo);
|
|
const s = normalizeSubject(root, briefPath);
|
|
return isAbsolute(s) ? relative(root, s).split(sep).join('/') : s;
|
|
}
|
|
|
|
/**
|
|
* The threat model a review applies: usableInRepo() for the brief at the
|
|
* review's frontmatter `brief_path`, a relative path read from the repo's top level.
|
|
* @param {string} reviewText - review.md
|
|
* @param {string} [repo] - the repo (default: the git top level of the working directory)
|
|
* @returns {{usable: boolean, why: string|null, threatModel: object}}
|
|
*/
|
|
export function reviewThreatModel(reviewText, repo) {
|
|
const doc = parseDocument(typeof reviewText === 'string' ? reviewText : '');
|
|
const bp = doc.parsed?.frontmatter?.brief_path;
|
|
if (typeof bp !== 'string' || bp.trim() === '') return { usable: false, why: 'the review names no brief_path', threatModel: EMPTY };
|
|
return usableInRepo(bp, repo);
|
|
}
|
|
|
|
/** A review `known_outside` entry's shape (E 2.5): string rule_key and file, integer line >= 0, non-empty threat_model_ref. */
|
|
export function isKnownEntry(e) {
|
|
return e !== null && typeof e === 'object' && !Array.isArray(e) &&
|
|
typeof e.rule_key === 'string' && e.rule_key !== '' && typeof e.file === 'string' && e.file !== '' &&
|
|
Number.isInteger(e.line) && e.line >= 0 && typeof e.threat_model_ref === 'string' && e.threat_model_ref !== '';
|
|
}
|
|
|
|
/** A security finding that is Voyage's own: a security key, no engine, not the engines' key (218). */
|
|
export function isOwnSecurityFinding(f) {
|
|
if (!f || typeof f !== 'object') return false;
|
|
if (typeof f.engine === 'string' && f.engine.trim() !== '') return false;
|
|
const keys = keysOf(f);
|
|
if (keys.some((k) => k.trim().toUpperCase() === ENGINES_SECURITY_KEY)) return false;
|
|
return keys.some(isSecurityKey);
|
|
}
|
|
|
|
/**
|
|
* The `Outside:` text a finding is backed by: its `threat_model_ref` equals it
|
|
* exactly. Only Voyage's own security findings can be backed.
|
|
* @param {object} finding
|
|
* @param {{present?: boolean, outside?: string[]}|null} tm - from readThreatModel / usable
|
|
* @returns {string|null}
|
|
*/
|
|
export function backedLine(finding, tm) {
|
|
if (!tm || tm.present !== true || !Array.isArray(tm.outside)) return null;
|
|
if (!isOwnSecurityFinding(finding)) return null;
|
|
const ref = finding.threat_model_ref;
|
|
if (typeof ref !== 'string' || ref === '') return null;
|
|
return tm.outside.find((line) => line === ref) ?? null;
|
|
}
|