* fix(#3951): two lint rules that could not reach the code they govern B6 names two widenings. Measuring them first turned up a defect the criterion did not know about, and refuted the reason it gave for one of them. 1. no-adhoc-markdown-parsing self-gates on its own filename. Lines 107-110 short-circuit create() to {} unless the path matches /(?:^|\/)src\/[^/]+\.cts$/. B6 says to widen the files: glob in eslint.config.mjs - but doing only that ships an INERT rule, because the gate still returns {} for every new path. Both halves have to change, and the gate is the load-bearing one. That same regex hides a live hole: [^/]+ is FLAT-ONLY, so it requires the file to sit directly in src/. The registered glob is src/**/*.cts, which includes subdirectories. 28 .cts files - health-diagnostic-rules/ (10), installer-migrations/ (11), observability/ (3), host-integration-adapters/ (2), vendor/ (2) - are inside the registered glob and silently skipped. Measured with the gate neutralized: 0 violations there today. The hole is hiding nothing right now, and is fixed anyway, because "no violations today" is not a property that keeps holding. The fix is not invented: require-subprocess-timeout.cjs:196 already carries the correct form of this guard, /(?:^|\/)src\/.*\.cts$/ with .*, one directory over. Checked the other 21 rules for the same bug - no-adhoc-regex-escape and no-private-binary-resolution short-circuit only to exempt their own seam file, which is the right shape, and no-crlf-fragile-split has no filename gate at all. This bug is unique to the one rule. 2. no-adhoc-regex-escape could not see the shape that actually occurs. Line 396 gated the whole UNSAFE-NEW-REGEXP arm on arg.type === 'Identifier'. Every check below it - the _SOURCE provenance check, the isSoleReturnOfOwnParameter shape - lives inside that branch, so new RegExp(obj['key']) and new RegExp(cfg.pattern) were never examined at all. Runtime data arrives as a property access far more often than as a bare identifier, which is exactly why this rule never fired on the #3477 ReDoS. Widened to MemberExpression, measured by AST walk across all five registered blocks rather than by grep. 27 sites, zero TSAsExpression: 18 safe new RegExp(X.source, flags) -> exempted, keyed strictly on the PROPERTY being `source`, never on the object. Keying on the object would wave through X.anything and buy nothing. B6 estimated ~10; that was an undercount. 3 _SOURCE-suffixed constants reached through a required module namespace (phaseId.BRACKET_PHASE_TOKEN_SOURCE) -> the same provenance-exempt class the rule already recognizes for bare identifiers, extended to reach them. Without this the widening produces 3 false flags. 6 real findings -> marked, each a test extracting a pattern from a shipped file at test time, where the runtime contract IS the product. Deliberately the NARROW MemberExpression form. The rule's own isSoleReturnOfOwnParameter doc comment records that an earlier broad "any non-literal identifier" heuristic produced ~25 false positives and was rejected; a re-run of the census after this change flags exactly the 6 above and nothing else. Verified by execution, not by reading: the gate now accepts src/<subdir>/x.cts, still accepts flat src/x.cts, and still exempts paths outside src/ - each pinned by a test proven to fail against the old regex. build:lib, lint and lint:ci all exit 0. Refs #3951 Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> * fix(#3951): give no-adhoc-markdown-parsing its reach, and fix the 80 parses it finds The rule self-gates on filename AND is registered on one glob, so widening either half alone is inert. Both move here: the gate now accepts tests/**/*.cjs and scripts/**/*.cjs alongside src/**/*.cts, and eslint.config.mjs registers it on the same two. A test pins that the gate and the registration AGREE, in both directions. The original defect was a gate narrower than its registration; the failure mode of this fix is a gate wider than its registration. Both are silent, so the test asserts the pair rather than either half. 80 violations across 43 files, all in tests/, zero in scripts/. 70 are routed through the existing seams - scanFencedBlocks, collectSection, stripFencedCode, tokenizeHeadings from markdown-sectionizer; splitTableRow, parseMarkdownTable, findTableWithColumns from markdown-table. Headerless STATE.md tables use splitTableRow per line, because parseMarkdownTable needs a real delimiter row. 10 are suppressed, 12.5%, well under the third that would have meant the rule is mis-scoped for tests/ rather than the tests carrying debt. Each names its reason: three regression guards (#3873 / bug-#21) are deliberately independent of the generator's own fence handling, and routing them through the seam would have them test the generator against itself; one is a negative-text probe that extracts nothing; six are a shell-pipe-to-jq detector whose regex coincidentally matches the table fingerprint and is not markdown parsing at all. All ten sit in tests whose subject is .md content, which is normally a reason to prefer the seam. The marker used is allow-adhoc-markdown, distinct from no-source-grep's allow-test-rule, and lint:ci's lint-allow-test-rule-refs reports the same 280/280 unverified count as before - checked rather than assumed, because those two markers are easy to conflate. The widening earned its keep immediately: it found a test that passed for the wrong reason. tests/config-field-docs.test.cjs asserted notEqual(<cell>, '600') against the TYPE column instead of the DEFAULT column. notEqual('number', '600') is true forever, so the guard against workflow.subagent_timeout regressing to the old seconds default could never fire. docs/CONFIGURATION.md:434 is `| workflow.subagent_timeout | number | 300000 | ... |`, so the default is cell index 2; the assertion is now row-scoped through splitTableRow and reads 300000. That is the argument for the widening in one case: the violation was invisible to lint, the suite was green, and the assertion was vacuous. A rule that cannot reach a file cannot tell you the file is lying. Not fixed here, and recorded rather than assumed: #3426/#3239 are NOT reachable by this widening. tests/package-legitimacy-gate.test.cjs yields zero violations even with the gate bypassed - its hand-rolled scans are real, but built from line filters and split('|') rather than the regex-literal fingerprints this rule detects. They need new detectors. The epic assumed a wider glob would catch them. build:lib, lint and lint:ci all exit 0; the post-fix census across tests/** and scripts/** is 0 violations. Refs #3951 Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> * fix(#3951): B7 — and #3356's defects were still live in the code B7 asks that each closed child be driven fail-first with a behavioral identity test at the CONSUMER's output. Four of eleven children had no test citing their issue number. Auditing them by BEHAVIOR rather than by number-grep changed the answer for three of the four. #3364 and #2540 — traceability only. Both were implemented by #3941 and their consumer-output tests exist and were shown failing-first; neither cited its originating issue, so an audit that greps for the number reports them uncovered. Tagged the specific asserting test in each file, following the citation form those files already use. #3372 — covered, but only at helper level, and the triage narrowed it. Of the four commands the issue names, only estimate-cli's collectCalibrationSamples actually enumerates phase dirs from disk; smart-entry, audit and roadmap-upgrade derive from ROADMAP/body text and never reach the sentinel path, so they are benign by construction and were left alone rather than "fixed" into churn. The existing #3882 rows asserted the helper's return value. Added a consumer-output test driving `query estimate-calibrate` and asserting sample_count and the persisted document. RED proof: reverted collectCalibrationSamples to a raw readdirSync and ran the real CLI - sample_count 3, sentinel leaked; restored - sample_count 2. #3356 — NOT covered, and BOTH halves of the defect were still live in source. The issue is closed; the bug was not fixed. Fixed here rather than writing tests that document a bug as correct. Defect 1, the contradicted row. quick.md:627 claimed `quick-tasks-append` performs "the equivalent write" to the Step 7c row. It did not: the `#` cell was a positional ordinal and `Directory` read `—`, because the route had no way to receive a quick id or task directory. Added OPTIONAL `--quick-id` / `--slug` / `--directory`. A caller with neither - fast.md, the original #2133 caller - omits them and gets the byte-identical prior row, so nothing existing changes. A caller that HAS a real id and directory now gets the canonical row quick.md:632 renders. The false-equivalence sentence itself is corrected rather than left to mislead the next reader. Defect 2, the forced re-derive. The route called readModifyWriteStateMd with no options, so a body-only append to the Quick Tasks table triggered a full re-derive of the disk-derived progress.* frontmatter. Every other body-only writer passes { resync: false } - src/state.cts's own docstring prescribes it - and this route was the lone outlier. RED proof: reverted the option, seeded a project with 2 real phase dirs and a curated total_phases of 25, ran quick-tasks-append; total_phases collapsed to 2. Restored; it stayed 25. That second one is the shape this epic exists to close: a silent write that replaces curated state with a re-derivation nobody asked for, exit 0 throughout. build:lib, lint and lint:ci all exit 0. Refs #3951 Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> * docs(#3951): amend B6's ledger to what was measured, and document the new flags The ADR gains a ledger amendment in its own correction style - the sixth wrong premise it records, found the same way as the other five, by measuring before building. B6 says the net guard count must fall. It rose: 62 -> 69, +7, measured from the epic's filing commit to origin/next. The attribution is the point, though. Five of the seven came from PRs unrelated to this epic, one was added by a phase of it, and the epic did retire something sub-file - #3884 removed a detector with an explicit "net: -1 detector, 0 added" ledger. Every named casualty is load-bearing, two already carry retractions in this same document, and a sweep of all 22 rules plus every scripts/lint-* found no provably dead guard. There is no honest way to make the count fall; forcing it would trade coverage for a number, which is the Goodhart outcome Decision 6 exists to prevent. The amendment also records that B6's own prescribed fix for one widening was inert. no-adhoc-markdown-parsing self-gates on its filename, so widening only the files: glob - which is what the criterion says to do - ships a rule that still returns {} for every new path. And #3426/#3239 are not reachable by that widening at all; their scans use line filters and split('|'), not the regex fingerprints the rule detects. The roster row tracked them against the wrong mechanism. Three roster rows updated from aspiration to fact: the two widenings are DONE with their measured counts, and lint-phase-enumeration-drift is marked RETAINED rather than "expected casualty - verify before retiring", because Phase 5 verified it and kept it. The rule Decision 6 should carry forward is stated plainly: a guard ledger is a claim about COVERAGE, not about COUNT. "Net count must fall" is measurable and wrong. "Every guard is reachable, and each retirement names what makes its defect unrepresentable" is the property that was actually wanted. CLI-TOOLS.md documents the optional --quick-id/--slug/--directory flags and says plainly that omitting them keeps the pre-#3356 row byte-identical, plus that the append no longer re-derives progress frontmatter. New features fragment (id 3951); FEATURES.md regenerated rather than hand-edited. Changeset is Changed, pr:0 pending backfill. Refs #3951 Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> * test(#3951): correct four rows that pinned the lint rule's old narrow reach The remote suite came back RED with 5 failures, all in tests/eslint-rules.test.cjs. They are stale tests, not a regression: four rows assert that no-adhoc-markdown-parsing is inert outside src/*.cts, which is exactly the contract this deliverable changes. Confirmed by reading rather than inferred from the names - the row at :1981 used filename: 'tests/some.test.cjs' and filename: 'scripts/helper.cjs', the two roots the rule now covers on purpose. Worth recording WHY local gates missed this. npm run lint and lint:ci were green, and the touched test files passed standalone. Lint only reports violations in real files; these rows assert the rule's REACH using synthetic RuleTester filenames, so nothing but the full suite could see them. Local green on a rule change says nothing about the rule's own tests. Each row is rewritten with BOTH halves rather than flipped from valid to invalid: - the same fingerprint under tests/ or scripts/ is now flagged, with the right messageId - the negative space is preserved - the same fingerprint under a path outside all three roots (gsd-core/bin/lib/foo.cjs) is still NOT flagged The second half is the one that matters. Without it the rule has no boundary and nothing would catch an over-wide gate later, which is the mirror image of the bug this deliverable just fixed. Each row is renamed to state the current contract; the old names said "non-src/*.cts ... is not flagged" and would have been actively misleading once the bodies changed. Proven to test the widening rather than restate it: every flagged half was run against HEAD~2's pre-widening rule and does NOT fire there, then against the current rule and does. 12/12 on that probe; the full file is 178/178. Swept for the same staleness elsewhere and found none. require-subprocess-timeout's own "inert outside src/*.cts" row is untouched - that rule's gate was not widened here - and no-adhoc-regex-escape's test file already carries correctly-targeted rows. Refs #3951 Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> * test(#3951): acknowledge the quick.md growth the attribution guard reported The full suite came back RED with one failure, and it is mine: 1 file(s) grew without an acknowledgment: quick.md grew 364 bytes gsd-core/workflows/quick.md is runtime-loaded emitted content, so correcting its false 'performs the equivalent write' claim trips emitted-attribution by construction. This is the acknowledgment, not a workaround - there is nothing to regenerate. The fragment names ONE path, which is the only one the guard reported. The four spent acknowledgments it also listed (audit-uat, plan-phase, progress, review) belong to other fragments whose ripple the base already absorbs; they are inert, not failures, and are deliberately NOT copied here - naming paths I did not change would make this record false in the other direction. Byte figure corrected before committing: the guard reported 37220 -> 37584 (+364), but origin/next has since moved and quick.md is 37232 there now, so the measured delta is +352. The reason text says so and names the base as a moving figure rather than pinning a number that is already stale. Refs #3951 Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> * test(#3951): move the quick.md growth ack to a trailer, delete the obsolete fragment The acknowledgment mechanism changed under this branch. Merging next brought in the redesign - it also deleted .github/workflows/ack-fragment-sweep.yml, which was in the merge status and which I did not register at the time - and the guard now says so directly: Add a trailer to a commit in this PR (never a new file). Emitted-Drift-Ack-Growth: quick.md - <why this growth is deliberate> So tests/emitted-drift-acks/3951-quick-append-equivalence.json is obsolete on arrival. A fragment file is no longer read by anything, and leaving it would be a dead record that looks like an active one. It is deleted here rather than kept "just in case". The byte figure moved again with the merge: 37232 -> 37596, +364. The earlier fragment said +352, measured before the merge auto-merged quick.md itself. The trailer carries no number, which is the better design - the figure was stale twice in two attempts. Refs #3951 Emitted-Drift-Ack-Growth: quick.md — #3356/#3951 replaces a false claim with an accurate one. Line 627 said the `quick-tasks-append` shortcut "performs the equivalent write" to the Step 7c row rendered above it; it did not, and that was the documented half of #3356 — with no quick id or task directory the route emitted a positional ordinal in `#` and an em-dash in `Directory`, a visibly different row. The corrected sentence has to carry three facts the original elided: what the shortcut actually writes when it has neither input, that this is honest behavior for its real caller (`fast.md`, which has neither), and how a caller with both now gets the byte-identical canonical row via the new optional `--quick-id`/`--slug`/`--directory` flags. Prose is the product here — an executing agent reads this line to decide whether the shortcut is safe for its case, and a shorter correction would either drop the flags (leaving the reader unable to act on the fix) or drop the limitation (recreating the false claim in gentler words). Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> * chore(#3951): backfill changeset pr number Refs #3951 Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> --------- Co-authored-by: sim <sim@local> Co-authored-by: Claude Opus 5 <noreply@anthropic.com>
519 lines
23 KiB
JavaScript
519 lines
23 KiB
JavaScript
'use strict';
|
|
|
|
/**
|
|
* no-adhoc-regex-escape
|
|
*
|
|
* ADR-3212 (lexical-seam-consolidation) §7 / #3412 Phase 1:
|
|
* `src/pattern.cts` is the single seam for regex-metacharacter escaping
|
|
* (`escapeRegex` / `literalPattern`, delegating to the built-in
|
|
* `RegExp.escape`). This rule flags the two ways a 13th hand-rolled copy of
|
|
* that concern can be reintroduced:
|
|
*
|
|
* 1. ADHOC-REPLACE — an inline `<expr>.replace(<escape-all-metachars
|
|
* char-class regex>, '\$&')` call anywhere outside
|
|
* `src/pattern.cts`. Matches on the character-class
|
|
* MEMBER SET (the 14 regex metacharacters
|
|
* `. * + ? ^ $ { } ( ) | [ ] \`), not on exact byte
|
|
* order or escaping style — a reordered or
|
|
* differently-escaped class with the same member set
|
|
* is the same shape and still fires (design doc
|
|
* row 25).
|
|
*
|
|
* 2. UNSAFE-NEW-REGEXP — `new RegExp(<identifier>)` where `<identifier>`
|
|
* is a genuinely dynamic, unescaped runtime value
|
|
* (a function parameter, or a `let`/`var` binding, or
|
|
* a `const` whose initializer is not a static
|
|
* string/template) with no seam routing.
|
|
*
|
|
* Negative space (design doc "Not-corruption"; test-matrix rows 26-28) —
|
|
* deliberately NOT flagged:
|
|
*
|
|
* - `src/pattern.cts` itself — the seam owns this shape.
|
|
* - A regex literal that merely CONTAINS the escape-class characters as
|
|
* DATA (e.g. `/^[.*+?]$/`) with no `.replace(..., '\$&')` shape present.
|
|
* - `new RegExp(<identifier>)` where `<identifier>` is a REVIEWED PATTERN
|
|
* FRAGMENT. Provenance is accepted under EITHER of two conditions
|
|
* (strongest first):
|
|
* (a) STRUCTURAL — the identifier resolves (via scope walk) to a
|
|
* `const` declaration whose initializer is a string Literal or a
|
|
* TemplateLiteral with zero `${...}` expressions. This cannot be
|
|
* evaded by renaming the identifier (#3410's guard-evasion class:
|
|
* a rule keyed only on an identifier's NAME is defeated by a
|
|
* rename; a rule keyed on the const/static-initializer SHAPE is
|
|
* not).
|
|
* (b) NAMING CONVENTION (fallback) — the identifier ends in `_SOURCE`
|
|
* AND resolves (via scope walk) to one of: an ES `import` binding,
|
|
* or a `require(...)`-derived module-scope `const` (either
|
|
* `const { X_SOURCE } = require('./mod.cjs')` or
|
|
* `const X_SOURCE = require('./mod.cjs').X_SOURCE`). Kept for the
|
|
* cross-module case where the initializer itself is not in scope
|
|
* to inspect (condition (a) cannot see into another file), e.g. an
|
|
* imported `PHASE_NUMBER_TOKEN_SOURCE`. (a) is the real check; (b)
|
|
* only covers what (a) structurally cannot see — and is bound to
|
|
* the identifier's ACTUAL BINDING KIND, not just its spelling: a
|
|
* function parameter, a `let`/`var`, a reassigned binding, or an
|
|
* unresolvable identifier is NEVER exempted by naming alone, no
|
|
* matter what it's called. A naming-only check (no scope/binding
|
|
* verification) is exactly #3410's guard-evasion class — a rule
|
|
* keyed on spelling is defeated by picking a matching name for a
|
|
* genuinely dynamic value (e.g. a function parameter named
|
|
* `userInput_SOURCE`). If scope analysis cannot resolve the
|
|
* identifier's binding at all, this fails CLOSED (flags it) —
|
|
* an unresolvable binding is not evidence of safety.
|
|
* A `new RegExp(<CallExpression>)` argument that already routes through
|
|
* the seam (`escapeRegex(...)` / `literalPattern(...)`, by name or as a
|
|
* `pattern.escapeRegex(...)` member call) is also treated as safe — that
|
|
* IS the fix, not a violation.
|
|
*
|
|
* Per-finding exemption: add // allow-adhoc-regex-escape: <reason> as a
|
|
* trailing comment on the same source line, OR as a standalone comment on
|
|
* the line immediately preceding the flagged node (mirrors
|
|
* no-adhoc-markdown-parsing's `// allow-adhoc-markdown:` convention).
|
|
*/
|
|
|
|
// The 14 regex metacharacters the census copies' char class escapes.
|
|
const ESCAPE_ALL_METACHARS_SET = new Set(['.', '*', '+', '?', '^', '$', '{', '}', '(', ')', '|', '[', ']', '\\']);
|
|
|
|
// The self-reference replacement string every copy uses: '\$&' (3 chars:
|
|
// backslash, dollar, ampersand).
|
|
const SELF_REFERENCE_REPLACEMENT = '\\$&';
|
|
|
|
const SOURCE_SUFFIX_RE = /_SOURCE$/;
|
|
|
|
/**
|
|
* Parse the first top-level (unescaped) `[...]` character class out of a
|
|
* regex source string and return its member-character set, or `null` if no
|
|
* class is present / it is unterminated. Single-pass, escape-aware — mirrors
|
|
* the style of no-adhoc-markdown-parsing's hasQualifyingNegatedPipeClass
|
|
* (walk once, honor `\` escapes, never backtrack into the class body).
|
|
*/
|
|
function parseCharClassMembers(src) {
|
|
let i = 0;
|
|
while (i < src.length) {
|
|
const ch = src[i];
|
|
if (ch === '\\') {
|
|
i += 2;
|
|
continue;
|
|
}
|
|
if (ch === '[') break;
|
|
i += 1;
|
|
}
|
|
if (i >= src.length) return null;
|
|
|
|
let j = i + 1;
|
|
let negated = false;
|
|
if (src[j] === '^') {
|
|
negated = true;
|
|
j += 1;
|
|
}
|
|
|
|
const members = new Set();
|
|
while (j < src.length) {
|
|
const c = src[j];
|
|
if (c === '\\') {
|
|
const next = src[j + 1];
|
|
if (next === undefined) return null; // unterminated escape
|
|
members.add(next);
|
|
j += 2;
|
|
continue;
|
|
}
|
|
if (c === ']') {
|
|
return { members, negated };
|
|
}
|
|
members.add(c);
|
|
j += 1;
|
|
}
|
|
return null; // unterminated class
|
|
}
|
|
|
|
/**
|
|
* Does `src` (a regex literal's `.pattern`) contain, as its first char
|
|
* class, EXACTLY the escape-all-metachars member set — regardless of
|
|
* ordering or which members are backslash-escaped (row 25: shape, not
|
|
* bytes)?
|
|
*/
|
|
function isEscapeAllMetacharsClassSource(src) {
|
|
const parsed = parseCharClassMembers(src || '');
|
|
if (!parsed || parsed.negated) return false;
|
|
if (parsed.members.size !== ESCAPE_ALL_METACHARS_SET.size) return false;
|
|
for (const m of ESCAPE_ALL_METACHARS_SET) {
|
|
if (!parsed.members.has(m)) return false;
|
|
}
|
|
return true;
|
|
}
|
|
|
|
/** Is `node` the regex literal `.replace()` first-argument shape? */
|
|
function isEscapeAllMetacharsRegexLiteral(node) {
|
|
return node.type === 'Literal' && !!node.regex && isEscapeAllMetacharsClassSource(node.regex.pattern);
|
|
}
|
|
|
|
/** Is `node` the string literal `'\$&'` self-reference replacement? */
|
|
function isSelfReferenceReplacement(node) {
|
|
return node.type === 'Literal' && typeof node.value === 'string' && node.value === SELF_REFERENCE_REPLACEMENT;
|
|
}
|
|
|
|
/**
|
|
* Walk up the scope chain from `scope` looking for `identifierName`'s
|
|
* declaration. Returns `{ def, kind }` where `kind` is 'param' for a
|
|
* function-parameter binding, 'import' for an ES `import` binding, or the
|
|
* VariableDeclaration `kind` ('const'/'let'/'var') for a variable binding —
|
|
* or `null` if unresolved in any enclosing scope reachable from here (fails
|
|
* closed: callers must treat `null` as "not provably safe").
|
|
*/
|
|
function resolveBinding(identifierName, scope) {
|
|
let s = scope;
|
|
while (s) {
|
|
const variable = s.variables.find((v) => v.name === identifierName);
|
|
if (variable) {
|
|
const def = variable.defs && variable.defs[0];
|
|
if (!def) return null;
|
|
if (def.type === 'Parameter') return { def, kind: 'param' };
|
|
if (def.type === 'ImportBinding') return { def, kind: 'import' };
|
|
if (
|
|
def.node
|
|
&& def.node.type === 'VariableDeclarator'
|
|
&& def.parent
|
|
&& def.parent.type === 'VariableDeclaration'
|
|
) {
|
|
return { def, kind: def.parent.kind };
|
|
}
|
|
return null;
|
|
}
|
|
s = s.upper;
|
|
}
|
|
return null;
|
|
}
|
|
|
|
/** Is `node` a `require(...)` call expression? */
|
|
function isRequireCallExpression(node) {
|
|
return !!node && node.type === 'CallExpression'
|
|
&& node.callee && node.callee.type === 'Identifier' && node.callee.name === 'require';
|
|
}
|
|
|
|
/**
|
|
* Provenance condition (b), require branch — does `identifierName` resolve
|
|
* to a module-scope `const` whose initializer is EITHER `require(...)`
|
|
* itself (the `const { X_SOURCE } = require('./mod.cjs')` destructure shape)
|
|
* OR a non-computed member access on a `require(...)` call (the
|
|
* `const X_SOURCE = require('./mod.cjs').X_SOURCE` shape)?
|
|
*/
|
|
function resolvesToRequireDerivedConstBinding(identifierName, scope) {
|
|
const binding = resolveBinding(identifierName, scope);
|
|
if (!binding || binding.kind !== 'const') return false;
|
|
const init = binding.def.node.init;
|
|
if (!init) return false;
|
|
if (isRequireCallExpression(init)) return true;
|
|
if (init.type === 'MemberExpression' && !init.computed && isRequireCallExpression(init.object)) return true;
|
|
return false;
|
|
}
|
|
|
|
/** Provenance condition (b), import branch — does `identifierName` resolve to an ES `import` binding? */
|
|
function resolvesToImportBinding(identifierName, scope) {
|
|
const binding = resolveBinding(identifierName, scope);
|
|
return !!binding && binding.kind === 'import';
|
|
}
|
|
|
|
/**
|
|
* Provenance condition (a) — STRUCTURAL: does `identifierName` resolve to a
|
|
* `const` whose initializer is a static string Literal or a TemplateLiteral
|
|
* with no `${...}` expressions?
|
|
*/
|
|
function resolvesToStaticConstFragment(identifierName, scope) {
|
|
const binding = resolveBinding(identifierName, scope);
|
|
if (!binding || binding.kind !== 'const') return false;
|
|
const init = binding.def.node.init;
|
|
if (!init) return false;
|
|
if (init.type === 'Literal' && typeof init.value === 'string') return true;
|
|
if (init.type === 'TemplateLiteral' && (!init.expressions || init.expressions.length === 0)) return true;
|
|
return false;
|
|
}
|
|
|
|
/**
|
|
* UNSAFE-NEW-REGEXP is deliberately narrow. An earlier version of this rule
|
|
* flagged ANY `new RegExp(<identifier>)` whose identifier resolved to a
|
|
* function parameter, a `let`/`var`, or a `const` with a non-static
|
|
* initializer — e.g. `const src = someHelper(x); new RegExp(src);`. A first
|
|
* whole-repo run proved that heuristic unusable: it fired ~25 times across
|
|
* `tests/**` on code with no relation to the escape-helper concern —
|
|
* `for (const level of [...]) { ...new RegExp(level)... }` (a fixed literal
|
|
* array), `patterns.filter(p => new RegExp(p).test(...))` (`p` is itself an
|
|
* already-regex-shaped source string, not literal text needing escaping),
|
|
* `const src = phaseId.phaseMarkdownRegexSource(x); new RegExp(src)` (a
|
|
* value produced by a function that ALREADY routes through escapeRegex
|
|
* internally, just not through a literal `new RegExp(escapeRegex(...))`
|
|
* one-liner). A syntax-only rule cannot distinguish "raw literal text that
|
|
* needed escaping and didn't get it" from "an already-valid regex-source
|
|
* string produced elsewhere" for an arbitrary non-literal expression — so it
|
|
* does not try to for the general case.
|
|
*
|
|
* What IS a reliable, false-positive-free signal is the row-29 shape
|
|
* itself: a function whose ENTIRE body is `return new RegExp(<own
|
|
* parameter>)` (or an arrow function's implicit-return equivalent) — i.e. a
|
|
* hand-rolled re-implementation of `literalPattern()` that skips the
|
|
* escaping step. That shape cannot arise from "value already computed
|
|
* upstream and merely re-used" (there is no upstream — the parameter IS the
|
|
* function's only input), so it is exactly ADR §7's "new RegExp() built
|
|
* from a non-literal without routing through the seam" with no other
|
|
* plausible reading.
|
|
*/
|
|
function isSoleReturnOfOwnParameter(newExprNode, argIdentifier) {
|
|
let fn = null;
|
|
|
|
const parent = newExprNode.parent;
|
|
if (!parent) return false;
|
|
|
|
if (parent.type === 'ReturnStatement' && parent.argument === newExprNode) {
|
|
const block = parent.parent;
|
|
if (
|
|
block
|
|
&& block.type === 'BlockStatement'
|
|
&& block.body.length === 1
|
|
&& block.parent
|
|
&& (block.parent.type === 'FunctionDeclaration'
|
|
|| block.parent.type === 'FunctionExpression'
|
|
|| block.parent.type === 'ArrowFunctionExpression')
|
|
&& block.parent.body === block
|
|
) {
|
|
fn = block.parent;
|
|
}
|
|
}
|
|
else if (parent.type === 'ArrowFunctionExpression' && parent.body === newExprNode) {
|
|
fn = parent;
|
|
}
|
|
|
|
if (!fn) return false;
|
|
return (fn.params || []).some((p) => p.type === 'Identifier' && p.name === argIdentifier.name);
|
|
}
|
|
|
|
function isReviewedPatternFragmentIdentifier(identifierName, scope) {
|
|
if (resolvesToStaticConstFragment(identifierName, scope)) return true; // (a) structural
|
|
if (SOURCE_SUFFIX_RE.test(identifierName)) {
|
|
// (b) naming fallback — only trusted when the identifier's ACTUAL
|
|
// BINDING is an import or a require()-derived module-scope const.
|
|
// A function parameter, a let/var, a reassigned binding, or an
|
|
// unresolvable identifier is never exempted by spelling alone (#3410
|
|
// guard-evasion class) — fails closed via resolveBinding returning null.
|
|
if (resolvesToImportBinding(identifierName, scope)) return true;
|
|
if (resolvesToRequireDerivedConstBinding(identifierName, scope)) return true;
|
|
return false;
|
|
}
|
|
return false;
|
|
}
|
|
|
|
/**
|
|
* Unwrap a chain of TypeScript `<expr> as T` casts (TSAsExpression) down to
|
|
* the innermost expression, so a cast around a MemberExpression/Identifier
|
|
* argument cannot hide its shape from the checks below. Zero sites exist in
|
|
* this repo today (#3951 Rung A measurement) — kept so a future cast cannot
|
|
* silently re-open the hole this widening closes.
|
|
*/
|
|
function unwrapTSAsExpression(node) {
|
|
let n = node;
|
|
while (n && n.type === 'TSAsExpression') {
|
|
n = n.expression;
|
|
}
|
|
return n;
|
|
}
|
|
|
|
/** Does `node` route through the seam (`escapeRegex(...)` / `literalPattern(...)`)? */
|
|
function isSeamRoutedCall(node) {
|
|
if (node.type !== 'CallExpression') return false;
|
|
const callee = node.callee;
|
|
if (!callee) return false;
|
|
if (callee.type === 'Identifier') {
|
|
return callee.name === 'escapeRegex' || callee.name === 'literalPattern';
|
|
}
|
|
if (callee.type === 'MemberExpression' && !callee.computed && callee.property) {
|
|
return callee.property.name === 'escapeRegex' || callee.property.name === 'literalPattern';
|
|
}
|
|
return false;
|
|
}
|
|
|
|
/** @type {import('eslint').Rule.RuleModule} */
|
|
const rule = {
|
|
meta: {
|
|
type: 'problem',
|
|
docs: {
|
|
description:
|
|
'Disallow a hand-rolled regex-metacharacter-escape helper or an unrouted new RegExp() from a runtime value outside src/pattern.cts — import escapeRegex()/literalPattern() from the seam instead.',
|
|
category: 'Best Practices',
|
|
},
|
|
schema: [],
|
|
messages: {
|
|
adhocRegexEscape:
|
|
'Ad-hoc regex-metacharacter-escape detected (.replace() against the escape-all-metachars character class, with the \'\\$&\' self-reference replacement). Import escapeRegex() from ./pattern (src/pattern.cts) instead. Suppress with: // allow-adhoc-regex-escape: <reason>',
|
|
unsafeNewRegExp:
|
|
'new RegExp() built from a runtime value with no escaping and no seam routing. Route it through escapeRegex()/literalPattern() from ./pattern (src/pattern.cts) first. Suppress with: // allow-adhoc-regex-escape: <reason>',
|
|
},
|
|
},
|
|
|
|
create(context) {
|
|
const filename = context.getFilename ? context.getFilename() : context.filename;
|
|
const normalizedFilename = filename.replace(/\\/g, '/');
|
|
// The seam owns this shape — it is not a violation of itself.
|
|
if (/(?:^|\/)src\/pattern\.cts$/.test(normalizedFilename)) {
|
|
return {};
|
|
}
|
|
|
|
const sourceCode = context.getSourceCode ? context.getSourceCode() : context.sourceCode;
|
|
|
|
function isAllowed(node) {
|
|
const nodeStartLine = node.loc.start.line;
|
|
const allComments = sourceCode.getAllComments();
|
|
return allComments.some((c) => {
|
|
if (!/allow-adhoc-regex-escape:\s*\S/.test(c.value)) return false;
|
|
return c.loc.start.line === nodeStartLine || c.loc.start.line === nodeStartLine - 1;
|
|
});
|
|
}
|
|
|
|
return {
|
|
// ── ADHOC-REPLACE: <expr>.replace(<escape-class>, '\$&') ──────────────
|
|
CallExpression(node) {
|
|
const callee = node.callee;
|
|
if (callee && callee.type === 'MemberExpression' && !callee.computed
|
|
&& callee.property && callee.property.name === 'replace') {
|
|
const args = node.arguments || [];
|
|
const patternArg = args[0];
|
|
const replacementArg = args[1];
|
|
if (
|
|
patternArg
|
|
&& replacementArg
|
|
&& isEscapeAllMetacharsRegexLiteral(patternArg)
|
|
&& isSelfReferenceReplacement(replacementArg)
|
|
) {
|
|
if (!isAllowed(node)) {
|
|
context.report({ node, messageId: 'adhocRegexEscape' });
|
|
}
|
|
}
|
|
return;
|
|
}
|
|
|
|
// ── UNSAFE-NEW-REGEXP is checked on NewExpression below; nothing
|
|
// else to do for other CallExpressions here.
|
|
},
|
|
|
|
// ── UNSAFE-NEW-REGEXP: new RegExp(<unrouted runtime identifier>) ──────
|
|
NewExpression(node) {
|
|
if (!node.callee || node.callee.type !== 'Identifier' || node.callee.name !== 'RegExp') return;
|
|
const arg = node.arguments && node.arguments[0];
|
|
if (!arg) return;
|
|
// #3951 Rung A: a `<expr> as T` cast around the argument (TSAsExpression)
|
|
// must not hide its shape from the checks below — unwrap to the
|
|
// innermost expression. Zero sites exist today; kept so a future cast
|
|
// cannot silently re-open the hole this widening closes.
|
|
const effectiveArg = unwrapTSAsExpression(arg);
|
|
|
|
// Static text (string literal / no-interpolation template literal) —
|
|
// fully known at lint time, not a runtime value. Never flagged.
|
|
if (effectiveArg.type === 'Literal' && typeof effectiveArg.value === 'string') return;
|
|
if (effectiveArg.type === 'TemplateLiteral' && (!effectiveArg.expressions || effectiveArg.expressions.length === 0)) return;
|
|
|
|
// Already routed through the seam — that IS the fix.
|
|
if (isSeamRoutedCall(effectiveArg)) return;
|
|
|
|
if (effectiveArg.type === 'Identifier') {
|
|
const scope = context.getScope ? context.getScope() : sourceCode.getScope(node);
|
|
if (isReviewedPatternFragmentIdentifier(effectiveArg.name, scope)) {
|
|
return;
|
|
}
|
|
|
|
// The `_SOURCE` suffix exists ONLY to claim provenance exemption
|
|
// (b). An identifier that carries the suffix but did NOT resolve
|
|
// to a legitimate import/require-derived binding above (or is
|
|
// unresolvable at all) IS the #3410-class evasion this check
|
|
// exists to close — flag it unconditionally, independent of the
|
|
// narrower sole-return-of-parameter shape below. This cannot
|
|
// reproduce the ~25 unrelated false positives an earlier, broader
|
|
// "any non-literal identifier" heuristic produced (see
|
|
// isSoleReturnOfOwnParameter's doc comment): those identifiers
|
|
// never carried the `_SOURCE` naming convention in the first
|
|
// place, so this branch never reaches them.
|
|
if (SOURCE_SUFFIX_RE.test(effectiveArg.name)) {
|
|
if (!isAllowed(node)) {
|
|
context.report({ node, messageId: 'unsafeNewRegExp' });
|
|
}
|
|
return;
|
|
}
|
|
|
|
// Narrow, false-positive-free shape only — see
|
|
// isSoleReturnOfOwnParameter's doc comment for why the broader
|
|
// "any non-literal identifier" heuristic was rejected.
|
|
if (isSoleReturnOfOwnParameter(node, effectiveArg)) {
|
|
if (!isAllowed(node)) {
|
|
context.report({ node, messageId: 'unsafeNewRegExp' });
|
|
}
|
|
}
|
|
return;
|
|
}
|
|
|
|
// #3951 Rung A: `new RegExp(obj['key'])` / `new RegExp(cfg.pattern)`
|
|
// — the whole UNSAFE-NEW-REGEXP arm used to gate on
|
|
// `arg.type === 'Identifier'` alone, so a MemberExpression argument
|
|
// (computed or not) was never examined at all. That is why this rule
|
|
// never fired on the #3477 ReDoS (src/verify.cts:1239).
|
|
if (effectiveArg.type === 'MemberExpression') {
|
|
// (a) `.source`-exemption — `new RegExp(X.source, flags)` is the
|
|
// safe re-flag-composition idiom. Keyed ONLY on the PROPERTY being
|
|
// literally `source` (non-computed): exempting on the OBJECT
|
|
// instead would wave through `X.anything`, which buys nothing.
|
|
if (!effectiveArg.computed && effectiveArg.property && effectiveArg.property.type === 'Identifier') {
|
|
if (effectiveArg.property.name === 'source') return;
|
|
|
|
// (b) provenance exemption, extended to MemberExpressions: the
|
|
// same NAMING CONVENTION fallback isReviewedPatternFragmentIdentifier
|
|
// already trusts for bare identifiers — a `_SOURCE`-suffixed
|
|
// constant reached through a required module namespace, e.g.
|
|
// `phaseId.BRACKET_PHASE_TOKEN_SOURCE` where
|
|
// `const phaseId = require('./phase-id.cjs')`. Bound to the
|
|
// OBJECT's actual binding kind (import / require()-derived
|
|
// const), never to spelling alone — same #3410 guard-evasion
|
|
// discipline as the bare-identifier case above.
|
|
if (
|
|
SOURCE_SUFFIX_RE.test(effectiveArg.property.name)
|
|
&& effectiveArg.object
|
|
&& effectiveArg.object.type === 'Identifier'
|
|
) {
|
|
const scope = context.getScope ? context.getScope() : sourceCode.getScope(node);
|
|
if (
|
|
resolvesToImportBinding(effectiveArg.object.name, scope)
|
|
|| resolvesToRequireDerivedConstBinding(effectiveArg.object.name, scope)
|
|
) {
|
|
return;
|
|
}
|
|
}
|
|
}
|
|
|
|
// Neither exemption applied — a MemberExpression argument (computed
|
|
// like `obj['key']`, or non-computed like `cfg.pattern`) with no
|
|
// proven-safe provenance is exactly ADR §7's "new RegExp() built
|
|
// from a runtime value with no escaping and no seam routing."
|
|
// Deliberately UNCONDITIONAL (unlike the bare-Identifier arm's
|
|
// narrower isSoleReturnOfOwnParameter gate): a MemberExpression
|
|
// argument categorically cannot be the "value already computed
|
|
// upstream, safely, and merely re-used" case that heuristic exists
|
|
// to avoid false-flagging — see isSoleReturnOfOwnParameter's doc
|
|
// comment. Measured across the repo: this arm's population is
|
|
// exactly the 27 `new RegExp(<MemberExpression>)` sites accounted
|
|
// for above (18 `.source`, 3 provenance-exempt, 6 real findings) —
|
|
// going wider than this shape is out of scope.
|
|
if (!isAllowed(node)) {
|
|
context.report({ node, messageId: 'unsafeNewRegExp' });
|
|
}
|
|
}
|
|
},
|
|
};
|
|
},
|
|
};
|
|
|
|
// Exposed for reuse by scripts/lint-no-adhoc-regex-escape.cjs (the whole-tree
|
|
// parity backstop for directories/extensions this rule's eslint.config.mjs
|
|
// wiring does not reach, e.g. tests/fixtures/**/*.cts). ESLint itself only
|
|
// reads `.create`/`.meta` off a required rule module, so these extra
|
|
// properties are inert to the linter and exist purely as a single source of
|
|
// truth for the shape-detection logic (avoids a second, drifting copy of the
|
|
// character-class parser — the exact class of bug this rule exists to end).
|
|
rule.isEscapeAllMetacharsClassSource = isEscapeAllMetacharsClassSource;
|
|
rule.SELF_REFERENCE_REPLACEMENT = SELF_REFERENCE_REPLACEMENT;
|
|
|
|
module.exports = rule;
|