fad-checker 1.0.1 → 1.0.3

package/fad-checker.js

@@ -540,23 +540,30 @@ async function runReportFlow(allPomMetadata, allPropsByPom, ecoFlags = {}) {
 	}
 
 	// Split prod vs dev based on the dep's isDev flag (set at collection time
-	// from Maven scope=test/provided and npm dev/devOptional/optional).
+	// from Maven scope=test/provided and npm dev/devOptional/optional). Keep the
+	// full per-bucket list (including cpeFiltered) so the HTML report can render
+	// its "Likely false positives" appendix — only the CLI headline excludes
+	// cpeFiltered to avoid alarming on triaged-out matches.
 	const prodMatches = cveMatches.filter(m => !m.dep?.isDev);
 	const devMatches  = cveMatches.filter(m =>  m.dep?.isDev);
+	const prodActive  = prodMatches.filter(m => !m.cpeFiltered);
+	const devActive   = devMatches.filter(m => !m.cpeFiltered);
+	const cpeFilteredCount = (prodMatches.length - prodActive.length) + (devMatches.length - devActive.length);
 
-	const stats = computeStats(prodMatches);
-	const devStats = computeStats(devMatches);
-	console.log(chalk.bold.cyan(`\n  1. CVE Vulnerabilities (production: ${prodMatches.length})`));
+	const stats = computeStats(prodActive);
+	const devStats = computeStats(devActive);
+	console.log(chalk.bold.cyan(`\n  1. CVE Vulnerabilities (production: ${prodActive.length})`));
 	console.log(`     critical=${stats.critical}  high=${stats.high}  medium=${stats.medium}  low=${stats.low}  unknown=${stats.unknown}`);
 	const depLabel = d => d.ecosystem === "npm" ? `npm:${d.artifactId}` : `${d.groupId}:${d.artifactId}`;
-	for (const m of prodMatches.slice(0, 20)) {
+	for (const m of prodActive.slice(0, 20)) {
 		const sev = (m.cve.severity || "UNKNOWN").padEnd(8);
 		console.log(`       ${chalk.red(sev)} ${m.cve.id}  ${depLabel(m.dep)}:${m.dep.version}`);
 	}
-	if (prodMatches.length > 20) console.log(`       ... and ${prodMatches.length - 20} more (see report)`);
+	if (prodActive.length > 20) console.log(`       ... and ${prodActive.length - 20} more (see report)`);
+	if (cpeFilteredCount) console.log(chalk.gray(`     (${cpeFilteredCount} likely false positives moved to report appendix)`));
 
-	if (devMatches.length) {
-		console.log(chalk.bold.cyan(`\n  2. CVE in dev dependencies (${devMatches.length})`));
+	if (devActive.length) {
+		console.log(chalk.bold.cyan(`\n  2. CVE in dev dependencies (${devActive.length})`));
 		console.log(`     critical=${devStats.critical}  high=${devStats.high}  medium=${devStats.medium}  low=${devStats.low}  unknown=${devStats.unknown}`);
 	}
 	if (retireMatches.length) {

package/lib/cpe.js

@@ -67,6 +67,17 @@ function parseCpe23(uri) {
 	};
 }
 
+// Memoize parseCpe23 on the cpeMatch object so subsequent passes (the
+// confidence walk inside evaluateCveForDep) don't re-tokenize the same URI.
+// `_parsedCpe` uses `null` (parse failed) vs `undefined` (not yet parsed) to
+// distinguish empty result from missing cache.
+function parseCpe23Cached(cpeMatch) {
+	if (!cpeMatch || typeof cpeMatch !== "object") return parseCpe23(cpeMatch?.criteria || "");
+	if (cpeMatch._parsedCpe !== undefined) return cpeMatch._parsedCpe;
+	cpeMatch._parsedCpe = parseCpe23(cpeMatch.criteria || "");
+	return cpeMatch._parsedCpe;
+}
+
 /**
  * Match a dep version against a single NVD cpeMatch entry.
  * The entry has the shape:
@@ -81,12 +92,18 @@ function parseCpe23(uri) {
 function matchVersionRange(depVersion, cpeMatch) {
 	if (!cpeMatch) return false;
 	if (!depVersion) return true; // unknown version → assume affected
-	const parsed = parseCpe23(cpeMatch.criteria || "");
+	const parsed = parseCpe23Cached(cpeMatch);
 	if (!parsed) return false;
 
 	// Hard pin in the criteria URI itself
 	if (parsed.version && parsed.version !== "*" && parsed.version !== "-") {
-		try { return compareMavenVersions(depVersion, parsed.version) === 0; }
+		// CPE 2.3 update field qualifies the version (`:1.0.0:beta1:` ≡ `1.0.0-beta1`).
+		// Without folding it in, a release like 1.0.0 would incorrectly match a pin
+		// of 1.0.0:rc1 — see H5 in CRITICAL-REVIEW.md.
+		const pinned = (parsed.update && parsed.update !== "*" && parsed.update !== "-")
+			? `${parsed.version}-${parsed.update}`
+			: parsed.version;
+		try { return compareMavenVersions(depVersion, pinned) === 0; }
 		catch { return false; }
 	}
 
@@ -112,7 +129,7 @@ function nodeAffectsDep(node, dep, cpeCoordMap) {
 	const matches = node.cpeMatch || node.cpe_match || [];
 	for (const m of matches) {
 		if (m.vulnerable === false) continue;
-		const parsed = parseCpe23(m.criteria || "");
+		const parsed = parseCpe23Cached(m);
 		if (!parsed) continue;
 		if (!cpeMatchesDep(parsed, dep, cpeCoordMap)) continue;
 		if (!matchVersionRange(dep.version, m)) continue;
@@ -168,8 +185,9 @@ function cpeMatchesDep(cpe, dep, cpeCoordMap) {
 		const p = (cpe.product || "").toLowerCase();
 		if (p !== a) return false;
 		if (g === v) return true;
+		// Mirrors vendorMatchesGroup: dot-segment membership only, no substring
+		// fallback. Unbounded substring matching leaked FPs (M4 in CRITICAL-REVIEW.md).
 		if (g.split(".").includes(v)) return true;
-		if (g.includes(v) || v.includes(g)) return true;
 	}
 	return false;
 }
@@ -213,7 +231,7 @@ function evaluateCveForDep(cveRecord, dep, cpeCoordMap) {
 			for (const n of nodes) {
 				for (const m of n.cpeMatch || n.cpe_match || []) {
 					if (m.vulnerable === false) continue;
-					const parsed = parseCpe23(m.criteria || "");
+					const parsed = parseCpe23Cached(m);
 					if (!parsed) continue;
 					if (!cpeMatchesDep(parsed, dep, map)) continue;
 					if (!matchVersionRange(dep.version, m)) continue;

package/lib/cve-match.js

@@ -166,16 +166,26 @@ function vendorMatchesGroup(vendor, groupId) {
 	const v = vendor.toLowerCase();
 	const g = groupId.toLowerCase();
 	if (g === v) return true;
-	if (g.includes(v) || v.includes(g)) return true;
-	// org.apache.commons matches vendor "apache"
-	const parts = g.split(".");
-	return parts.includes(v);
+	const segments = g.split(".");
+	// Plain dot-segment match (vendor "apache" ⊂ "org.apache.commons").
+	if (segments.includes(v)) return true;
+	// NVD/CVEProject often record vendor as a legal entity ("qos.ch sarl",
+	// "the apache software foundation"). Split on non-alphanumerics and accept
+	// the match if any token is a dot-segment of the groupId. Unbounded
+	// substring matching is still avoided.
+	const vendorTokens = v.split(/[^a-z0-9]+/).filter(Boolean);
+	if (vendorTokens.length > 1 && vendorTokens.some(t => segments.includes(t))) return true;
+	return false;
 }
 
-function matchDepsAgainstCves(resolvedDeps, cveIndex) {
+function matchDepsAgainstCves(resolvedDeps, cveIndex, opts = {}) {
 	if (!cveIndex) return [];
 	const byPackage = cveIndex.byPackageName || {};
 	const byProduct = cveIndex.byProduct || {};
+	// "possible" tier (product matches but vendor doesn't) is FP-heavy and
+	// hidden by default. The CPE refinement step can still rescue a real hit
+	// later; opt-in shows the raw bucket for triage.
+	const includePossibleTier = !!opts.includePossibleTier;
 
 	const all = [];
 	for (const dep of resolvedDeps.values()) {
@@ -187,12 +197,12 @@ function matchDepsAgainstCves(resolvedDeps, cveIndex) {
 		// Tier 1: exact packageName match
 		const t1 = matchOne(dep, byPackage[key], "exact");
 		all.push(...t1);
-		// Tier 2/3: product match, scoped by vendor heuristic
+		// Tier 2: product match scoped by vendor heuristic
 		const productMatches = byProduct[dep.artifactId.toLowerCase()] || [];
 		for (const e of productMatches) {
 			if (vendorMatchesGroup(e.vendor, dep.groupId)) {
 				all.push(...matchOne(dep, [e], "probable"));
-			} else {
+			} else if (includePossibleTier) {
 				all.push(...matchOne(dep, [e], "possible"));
 			}
 		}

package/lib/maven-version.js

@@ -105,6 +105,12 @@ function isVersionAffected(depVersion, spec) {
 	const dep = parseMavenVersion(depVersion);
 	if (!dep.segments.length) return false;
 
+	// Fail-closed: a spec with no version constraints at all carries no information.
+	// Without this guard the function falls through to `return true` for every input,
+	// which was the H1 cascade described in CRITICAL-REVIEW.md.
+	const hasLower = spec.version && spec.version !== "0" && spec.version !== "*";
+	if (!hasLower && !spec.lessThan && !spec.lessThanOrEqual) return false;
+
 	// Lower bound (inclusive)
 	if (spec.version && spec.version !== "0" && spec.version !== "*") {
 		if (compareMavenVersions(depVersion, spec.version) < 0) return false;

package/lib/nvd.js

@@ -25,6 +25,15 @@ function getRateDelay() {
 	return getNvdApiKey() ? 600 : 6000;
 }
 
+// NIST rate-limit policy is a rolling 30s window. Burst up to N at once then
+// wait until the oldest send is older than 30s. Without a key the burst size
+// stays at 5; with a key it's 50 — which lets latency overlap and avoids
+// blocking on a `setTimeout` between every request.
+function getBurstSize() {
+	return getNvdApiKey() ? 50 : 5;
+}
+const NVD_WINDOW_MS = 30_000;
+
 function cachePath(cveId) {
 	return path.join(NVD_CACHE_DIR, `${cveId}.json`);
 }
@@ -176,31 +185,67 @@ async function fetchOne(cveId, opts = {}) {
  * Rate limited per the NIST policy (use NVD_API_KEY for faster access).
  */
 async function enrichMatches(matches, opts = {}) {
-	const { verbose, offline } = opts;
+	const { offline } = opts;
 	const uniqueCves = new Set();
 	for (const m of matches) if (m.cve?.id?.startsWith("CVE-")) uniqueCves.add(m.cve.id);
 	const hasKey = !!getNvdApiKey();
-	const delay = getRateDelay();
-	if (verbose) console.log(`🔍 NVD: enriching ${uniqueCves.size} unique CVEs${offline ? " (offline — cache only)" : hasKey ? " (with API key, 50/30s)" : " (no API key — throttled to 5/30s; pass --set-nvd-key for 10× faster)"}…`);
+	const burst = getBurstSize();
 
+	// Partition cached vs live up-front so the progress display reflects the
+	// actual work to do (the user's "stuck at OSV" complaint was caused by
+	// silent serial fetching with no progress output).
 	const byId = new Map();
-	let i = 0;
+	const liveIds = [];
 	for (const cveId of uniqueCves) {
-		// Only sleep between live (non-cached) requests.
 		const cached = readCache(cveId);
 		if (cached !== null && cached !== undefined) {
 			byId.set(cveId, cached);
 			continue;
 		}
 		if (offline) { byId.set(cveId, null); continue; }
-		const data = await fetchOne(cveId, opts);
-		byId.set(cveId, data);
-		i++;
-		if (verbose && i % 5 === 0) process.stdout.write(`\r   NVD: ${i} fetched`);
-		// Rate limit between requests
-		await sleep(delay);
+		liveIds.push(cveId);
+	}
+
+	if (liveIds.length) {
+		const etaSec = Math.ceil((liveIds.length / burst) * (NVD_WINDOW_MS / 1000));
+		const keyHint = hasKey ? "with API key (50/30s)" : "no API key — throttled to 5/30s, run `fad-checker --set-nvd-key <KEY>` (free, instant) to be 10× faster";
+		const cachedCount = byId.size;
+		const cachedHint = cachedCount ? `, ${cachedCount} cached` : "";
+		console.log(`🔍 NVD: enriching ${liveIds.length} CVEs${cachedHint} — ${keyHint}. ETA ~${etaSec}s.`);
+	} else if (uniqueCves.size) {
+		console.log(`🔍 NVD: ${uniqueCves.size} CVEs (all cached).`);
+	}
+
+	// Token-bucket burst: fire `burst` requests in parallel, wait until the
+	// oldest send is older than NVD_WINDOW_MS, repeat. Better progress UX than
+	// the previous serial sleep loop — same effective throughput.
+	let done = 0;
+	const startedAt = [];
+	const startProgress = Date.now();
+	const printProgress = (final = false) => {
+		const elapsed = Math.round((Date.now() - startProgress) / 1000);
+		const pct = liveIds.length ? Math.round((done / liveIds.length) * 100) : 100;
+		const line = `   NVD: ${done}/${liveIds.length} (${pct}%) — ${elapsed}s elapsed`;
+		if (process.stdout.isTTY) process.stdout.write(`\r${line}${final ? "\n" : "                    "}`);
+		else if (final) console.log(line);
+	};
+
+	for (let i = 0; i < liveIds.length; i += burst) {
+		const slice = liveIds.slice(i, i + burst);
+		const windowStart = Date.now();
+		startedAt.push(windowStart);
+		const results = await Promise.all(slice.map(id => fetchOne(id, opts)));
+		for (let j = 0; j < slice.length; j++) byId.set(slice[j], results[j]);
+		done += slice.length;
+		printProgress();
+
+		// Respect the rolling 30s window before starting the next burst.
+		if (i + burst < liveIds.length) {
+			const since = Date.now() - windowStart;
+			if (since < NVD_WINDOW_MS) await sleep(NVD_WINDOW_MS - since);
+		}
 	}
-	if (verbose && i) process.stdout.write(`\r   NVD: ${i} fetched                  \n`);
+	if (liveIds.length) printProgress(true);
 
 	for (const m of matches) {
 		const data = byId.get(m.cve?.id);

package/lib/osv.js

@@ -177,7 +177,9 @@ async function queryBatch(deps, opts = {}) {
 		}
 		let batchIdx = 0;
 		for (const batch of batches) {
-			if (verbose) process.stdout.write(`\r   OSV batch ${++batchIdx}/${batches.length} (${batch.length} deps)…`);
+			batchIdx++;
+			if (process.stdout.isTTY) process.stdout.write(`\r   OSV batch ${batchIdx}/${batches.length} (${batch.length} deps)…                  `);
+			else if (batches.length > 1) console.log(`   OSV batch ${batchIdx}/${batches.length} (${batch.length} deps)…`);
 			const res = await fetcher(`${OSV_BASE}/v1/querybatch`, {
 				method: "POST",
 				headers: { "Content-Type": "application/json", "User-Agent": "fad-checker-osv" },
@@ -194,7 +196,7 @@ async function queryBatch(deps, opts = {}) {
 				allResults[(batchIdx - 1) * BATCH_SIZE + j] = results[j] || { vulns: [] };
 			}
 		}
-		if (verbose) process.stdout.write(`\r   OSV batches complete (${batches.length})                \n`);
+		if (process.stdout.isTTY) process.stdout.write(`\r   OSV batches complete (${batches.length})                          \n`);
 
 		// Persist per-dep cache (stub list — details cached separately)
 		for (let i = 0; i < deps.length; i++) {
@@ -214,27 +216,53 @@ async function queryBatch(deps, opts = {}) {
 	const allIds = new Set();
 	for (const slot of indexMap) for (const id of (slot.cached || [])) allIds.add(id);
 
+	// Split cached vs live so the progress display reflects actual work and
+	// detail fetches run in parallel (was silent serial — caused the
+	// "stuck after OSV" symptom on large dep trees).
 	const detailById = new Map();
-	let fetched = 0;
+	const liveIds = [];
 	for (const id of allIds) {
 		const detailCacheKey = `vuln_${id}.json`;
 		const hit = readCache(detailCacheKey);
 		if (hit) { detailById.set(id, hit); continue; }
 		if (offline) continue;
-		try {
-			const r = await fetcher(`${OSV_BASE}/v1/vulns/${encodeURIComponent(id)}`, {
-				headers: { "User-Agent": "fad-checker-osv" },
-			});
-			if (r.ok) {
-				const body = await r.json();
-				detailById.set(id, body);
-				writeCache(detailCacheKey, body);
+		liveIds.push(id);
+	}
+
+	if (liveIds.length) {
+		console.log(`   OSV details: ${liveIds.length} to fetch${allIds.size - liveIds.length ? `, ${allIds.size - liveIds.length} cached` : ""}…`);
+		const concurrency = 10;
+		let cursor = 0;
+		let fetched = 0;
+		const startedAt = Date.now();
+		const printOsvProgress = (final = false) => {
+			const elapsed = Math.round((Date.now() - startedAt) / 1000);
+			const pct = Math.round((fetched / liveIds.length) * 100);
+			const line = `   OSV details: ${fetched}/${liveIds.length} (${pct}%) — ${elapsed}s`;
+			if (process.stdout.isTTY) process.stdout.write(`\r${line}${final ? "\n" : "          "}`);
+			else if (final) console.log(line);
+		};
+		const workers = Array.from({ length: concurrency }, async () => {
+			while (cursor < liveIds.length) {
+				const id = liveIds[cursor++];
+				const detailCacheKey = `vuln_${id}.json`;
+				try {
+					const r = await fetcher(`${OSV_BASE}/v1/vulns/${encodeURIComponent(id)}`, {
+						headers: { "User-Agent": "fad-checker-osv" },
+					});
+					if (r.ok) {
+						const body = await r.json();
+						detailById.set(id, body);
+						writeCache(detailCacheKey, body);
+					}
+				} catch { /* ignore individual failures */ }
+				fetched++;
+				if (fetched % 5 === 0 || fetched === liveIds.length) printOsvProgress();
 			}
-		} catch { /* ignore individual failures */ }
-		fetched++;
-		if (verbose && fetched % 25 === 0) process.stdout.write(`\r   OSV details fetched: ${fetched}/${allIds.size}`);
+		});
+		await Promise.all(workers);
+		printOsvProgress(true);
 	}
-	if (verbose) process.stdout.write(`\r   OSV details fetched: ${fetched}/${allIds.size}                \n`);
 
 	return runMatches(deps, indexMap, detailById);
 }
@@ -248,14 +276,11 @@ function runMatches(deps, indexMap, detailById) {
 		for (const id of ids) {
 			const vuln = detailById instanceof Map ? detailById.get(id) : null;
 			if (!vuln) {
-				// Stub only — emit a minimal match with no description so the
-				// report still surfaces it.
-				matches.push({
-					dep,
-					cve: { id, severity: "UNKNOWN", score: null, description: "", fixVersion: null },
-					source: "osv",
-					confidence: "exact",
-				});
+				// Stub-only (id known but no details fetched yet). Skip rather
+				// than emit a descriptionless UNKNOWN-severity placeholder:
+				// such stubs were FP-prone because the local cache key is
+				// (g, a, v) but the underlying advisory may no longer apply
+				// to a version upgraded since cache build. M2 in CRITICAL-REVIEW.md.
 				continue;
 			}
 			matches.push(vulnToMatch(dep, vuln));

package/lib/outdated.js

@@ -231,12 +231,31 @@ async function checkOutdatedDeps(resolvedDeps, opts = {}) {
 	const list = [...resolvedDeps.values()].filter(d => d.version && !/\$\{|SNAPSHOT/i.test(d.version) && d.ecosystem !== "npm");
 	const results = [];
 
-	// Simple p-limit style throttle without requiring p-limit here (already used in fad-checker.js)
+	// Progress indicator — Maven Central can serve hundreds of deps in a few
+	// seconds with 8-way concurrency, but on first run (cold cache) the user
+	// would see total silence for 20-60s.
+	const liveCount = offline ? 0 : list.filter(d => !cache.entries[`${d.groupId}:${d.artifactId}`]).length;
+	if (liveCount && !offline) {
+		console.log(`📅 Outdated: checking ${list.length} deps against Maven Central (${liveCount} live, ${list.length - liveCount} cached)…`);
+	}
+
 	let cursor = 0;
+	let processed = 0;
+	const startedAt = Date.now();
+	const printOutdatedProgress = (final = false) => {
+		if (!liveCount) return;
+		const elapsed = Math.round((Date.now() - startedAt) / 1000);
+		const pct = Math.round((processed / list.length) * 100);
+		const line = `   outdated: ${processed}/${list.length} (${pct}%) — ${elapsed}s`;
+		if (process.stdout.isTTY) process.stdout.write(`\r${line}${final ? "\n" : "          "}`);
+		else if (final) console.log(line);
+	};
 	const workers = Array.from({ length: concurrency }, async () => {
 		while (cursor < list.length) {
 			const dep = list[cursor++];
 			const entry = await fetchLatestVersion(dep.groupId, dep.artifactId, cache, { offline, repos });
+			processed++;
+			if (processed % 10 === 0 || processed === list.length) printOutdatedProgress();
 			if (!entry?.latest) continue;
 			try {
 				if (compareMavenVersions(dep.version, entry.latest) < 0) {
@@ -247,6 +266,7 @@ async function checkOutdatedDeps(resolvedDeps, opts = {}) {
 		}
 	});
 	await Promise.all(workers);
+	if (liveCount) printOutdatedProgress(true);
 
 	cache.meta = { fetchedAt: Date.now() };
 	saveJsonCache(VERSION_CACHE_PATH, cache);

package/lib/transitive.js

@@ -286,6 +286,10 @@ async function resolveTransitiveDeps(directDeps, opts = {}) {
 
 	const visited = new Map();   // g:a -> { ...entry, depth }
 	const queue = [];
+	// Index cursor instead of `queue.shift()` — shift() is O(n) per call which
+	// turns the BFS into O(n²) on large dep trees. The cursor is safe across
+	// concurrent workers because `head++` is atomic in single-threaded JS.
+	let head = 0;
 
 	// Seed: every direct dep (we won't return them, but we walk their children).
 	for (const dep of directDeps) {
@@ -310,8 +314,8 @@ async function resolveTransitiveDeps(directDeps, opts = {}) {
 
 	// Worker pool
 	const workers = Array.from({ length: concurrency }, async () => {
-		while (queue.length) {
-			const node = queue.shift();
+		while (head < queue.length) {
+			const node = queue[head++];
 			if (!node) break;
 			if (node.depth >= maxDepth) continue;
 
@@ -389,11 +393,15 @@ async function resolveTransitiveDeps(directDeps, opts = {}) {
 					rootExclusions: [...(node.rootExclusions || []), ...(dep.exclusions || [])],
 				});
 			}
-			if (verbose) process.stdout.write(`\r   resolved ${out.size} transitives, queue=${queue.length}`);
+			// Progress visible whenever stdout is a TTY — transitive resolution
+			// dominates wall-clock time on first run and used to look like a hang.
+			// On non-TTY (pipes, CI, tests) we skip the \r-overwrite spam.
+			if (process.stdout.isTTY) process.stdout.write(`\r   resolved ${out.size} transitives, queue=${queue.length - head}          `);
 		}
 	});
 	await Promise.all(workers);
-	if (verbose) process.stdout.write(`\r   resolved ${out.size} transitives                       \n`);
+	if (process.stdout.isTTY) process.stdout.write(`\r   resolved ${out.size} transitives                              \n`);
+	else if (out.size) console.log(`   resolved ${out.size} transitives`);
 
 	return out;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fad-checker",
-  "version": "1.0.1",
+  "version": "1.0.3",
   "description": "Fucking Autonomous Dependency Checker — multi-ecosystem CVE / EOL / outdated / vendored-JS scanner for Maven, npm and Yarn monorepos. Self-contained HTML + Word report.",
   "license": "MIT",
   "author": "N8tz <n8tz.js@gmail.com>",

package/test/cpe.test.js

@@ -51,6 +51,24 @@ test("matchVersionRange honours hard-pinned criteria version", () => {
 	assert.equal(matchVersionRange("2.14.1", m), false);
 });
 
+test("matchVersionRange folds CPE update qualifier into the version pin (H5)", () => {
+	// CPE 2.3 ":1.0.0:rc1:" describes the 1.0.0-rc1 pre-release. A release dep
+	// at 1.0.0 must NOT match — that was the H5 cascade.
+	const beta = { criteria: "cpe:2.3:a:apache:foo:1.0.0:beta1:*:*:*:*:*:*", vulnerable: true };
+	assert.equal(matchVersionRange("1.0.0", beta), false);
+	assert.equal(matchVersionRange("1.0.0-beta1", beta), true);
+
+	const rc = { criteria: "cpe:2.3:a:apache:foo:1.0.0:rc1:*:*:*:*:*:*", vulnerable: true };
+	assert.equal(matchVersionRange("1.0.0", rc), false);
+	assert.equal(matchVersionRange("1.0.0-rc1", rc), true);
+});
+
+test("cpeMatchesDep rejects short-token vendor leak (M4 mirror of H2)", () => {
+	const cpe = parseCpe23("cpe:2.3:a:a:log4j-core:*:*:*:*:*:*:*:*");
+	const dep = { groupId: "com.unrelated.log4j-core", artifactId: "log4j-core", ecosystem: "maven" };
+	assert.equal(cpeMatchesDep(cpe, dep), false);
+});
+
 test("matchVersionRange returns true for unknown dep version (conservative)", () => {
 	const m = { criteria: "cpe:2.3:a:apache:log4j:*:*:*:*:*:*:*:*", vulnerable: true, versionEndExcluding: "2.15.0" };
 	assert.equal(matchVersionRange(null, m), true);

package/test/cve-match.test.js

@@ -48,6 +48,75 @@ test("vendorMatchesGroup heuristic", () => {
 	assert.equal(vendorMatchesGroup("springframework", "org.springframework"), true);
 });
 
+test("vendorMatchesGroup rejects substring leaks (H2)", () => {
+	// All these cases used to leak through unbounded `g.includes(v)` / `v.includes(g)`
+	// branches. The fix keeps only equality + dot-segment membership.
+	assert.equal(vendorMatchesGroup("a", "com.acme.client"), false);
+	assert.equal(vendorMatchesGroup("ibm", "com.ibmcloudant.driver"), false);
+	assert.equal(vendorMatchesGroup("go", "org.golang.x"), false);
+	// "open" used to wrongly match every org.opensaml.* groupId via substring
+	assert.equal(vendorMatchesGroup("open", "org.opensaml.core"), false);
+	// Dot-segment match still works for legitimate cases
+	assert.equal(vendorMatchesGroup("apache", "org.apache.commons"), true);
+	assert.equal(vendorMatchesGroup("springframework", "org.springframework.boot"), true);
+});
+
+test("vendorMatchesGroup tokenizes multi-word legal-entity vendors", () => {
+	// NVD records the logback vendor as "qos.ch sarl" — a legal entity name.
+	// Neither equality nor plain dot-segment catches it, but tokenization on
+	// non-alphanumerics finds "qos"/"ch" as group segments and confirms the
+	// match. Without this, real logback CVEs landed in tier "possible".
+	assert.equal(vendorMatchesGroup("qos.ch sarl", "ch.qos.logback"), true);
+	assert.equal(vendorMatchesGroup("the apache software foundation", "org.apache.commons"), true);
+	// A single-token vendor must NOT be tokenized into substrings — that
+	// would re-introduce the H2 leak (e.g. "open" → ["open"] alone never
+	// matches arbitrary "org.opensaml.*").
+	assert.equal(vendorMatchesGroup("open", "org.opensaml.core"), false);
+});
+
+test("matchDepsAgainstCves hides 'possible' tier by default (H3)", () => {
+	// product matches `log4j-core` but vendor `acme` doesn't match groupId.
+	// Without opts.includePossibleTier we expect zero matches.
+	const idx = {
+		byPackageName: {},
+		byProduct: {
+			"log4j-core": [
+				{ id: "CVE-FAKE-0001", severity: "HIGH", vendor: "acme", product: "log4j-core",
+				  ranges: [{ version: "2.0", lessThan: "2.20.0", status: "affected" }] },
+			],
+		},
+	};
+	const deps = new Map([
+		["org.apache.logging.log4j:log4j-core", {
+			groupId: "org.apache.logging.log4j", artifactId: "log4j-core", version: "2.14.0", scope: "compile", pomPaths: [],
+		}],
+	]);
+	assert.equal(matchDepsAgainstCves(deps, idx).length, 0);
+	assert.equal(matchDepsAgainstCves(deps, idx, { includePossibleTier: true }).length, 1);
+});
+
+test("matchDepsAgainstCves does not flag deps when range has no bounds (H1+H3)", () => {
+	// Sparse range entry (`{status:"affected"}` with no bounds) used to flag
+	// every version that hit the product bucket. Combined with H3 hiding the
+	// possible tier, this should now produce zero matches even when the
+	// vendor matches.
+	const idx = {
+		byPackageName: {},
+		byProduct: {
+			"log4j-core": [
+				{ id: "CVE-FAKE-0002", severity: "HIGH", vendor: "apache", product: "log4j-core",
+				  ranges: [{ status: "affected" }] },
+			],
+		},
+	};
+	const deps = new Map([
+		["org.apache.logging.log4j:log4j-core", {
+			groupId: "org.apache.logging.log4j", artifactId: "log4j-core", version: "2.99.0", scope: "compile", pomPaths: [],
+		}],
+	]);
+	assert.equal(matchDepsAgainstCves(deps, idx).length, 0);
+});
+
 test("collectResolvedDeps dedupes by g:a and includes external parent POMs", async () => {
 	const { store, props } = await pipeline(COMPLEX);
 	const deps = collectResolvedDeps(store, props, {});

package/test/maven-version.test.js

@@ -41,6 +41,15 @@ test("isVersionAffected returns false when status != affected", () => {
 	assert.equal(isVersionAffected("1.5", spec), false);
 });
 
+test("isVersionAffected fail-closed when spec has no version bounds (H1)", () => {
+	// CVEProject sometimes emits {status:"affected"} stubs with no version
+	// fields. The matcher must NOT fall through to `return true` — that was
+	// the H1 cascade.
+	assert.equal(isVersionAffected("2.14.0", { status: "affected" }), false);
+	assert.equal(isVersionAffected("2.14.0", {}), false);
+	assert.equal(isVersionAffected("0.0.1", { status: "affected" }), false);
+});
+
 test("parseRange handles Maven range syntax", () => {
 	assert.deepEqual(parseRange("1.2.3"), { exact: "1.2.3" });
 	assert.deepEqual(parseRange("[1.0,2.0)"), { lower: "1.0", lowerInclusive: true, upper: "2.0", upperInclusive: false });