fad-checker 2.2.3 → 2.3.0

package/lib/codecs/pypi.codec.js

@@ -22,7 +22,13 @@ const LOCKS = [
 	["pdm.lock", P.parsePdmLock],
 ];
 
-const FALLBACK_MANIFESTS = ["pyproject.toml", "requirements.txt"];
+// The whole requirements*.txt family, not just the literal "requirements.txt": projects
+// using pip-compile/Dependabot keep their actual pins in requirements-pinned.txt (or
+// similar) while requirements.txt holds only ranges. requirements-(dev|test|lint|docs|…)
+// are dev/optional tooling.
+const REQ_RE = /^requirements.*\.txt$/i;
+const DEV_REQ_RE = /requirements[-_.](dev|test|tests|lint|docs?|typing|type|check|ci|mypy|style|format)\b/i;
+const reqFilesIn = names => [...names].filter(n => REQ_RE.test(n)).sort();
 
 function findPyDirs(dir, skipDir = (child, name) => SKIP.has(name)) {
 	const groups = [];
@@ -31,7 +37,8 @@ function findPyDirs(dir, skipDir = (child, name) => SKIP.has(name)) {
 		const cur = stack.pop();
 		let entries; try { entries = fs.readdirSync(cur, { withFileTypes: true }); } catch { continue; }
 		const names = new Set(entries.filter(e => e.isFile()).map(e => e.name));
-		if ([...LOCKS.map(l => l[0]), ...FALLBACK_MANIFESTS].some(n => names.has(n))) groups.push({ dir: cur, names });
+		const qualifies = LOCKS.some(l => names.has(l[0])) || names.has("pyproject.toml") || reqFilesIn(names).length > 0;
+		if (qualifies) groups.push({ dir: cur, names });
 		for (const e of entries) if (e.isDirectory() && !skipDir(path.join(cur, e.name), e.name)) stack.push(path.join(cur, e.name));
 	}
 	return groups;
@@ -53,46 +60,62 @@ module.exports = {
 		const { ignoreTest, deps2Exclude } = opts;
 		const out = new Map();
 		const warnings = [];
+		const parsedManifests = [];
 		const add = (d, manifestPath) => {
 			if (ignoreTest && d.isDev) return;
 			if (deps2Exclude && deps2Exclude.test(d.name)) return;
-			out.set(coordKeyFor("pypi", "", d.name), makeDepRecord({ ecosystem: "pypi", namespace: "", name: d.name, version: d.version, manifestPath, scope: d.scope, isDev: d.isDev }));
+			const key = coordKeyFor("pypi", "", d.name);
+			const rec = makeDepRecord({ ecosystem: "pypi", namespace: "", name: d.name, version: d.version, manifestPath, scope: d.scope, isDev: d.isDev });
+			const existing = out.get(key);
+			if (!existing) { out.set(key, rec); return; }
+			// Same package across several requirements files: merge manifests, keep a concrete
+			// version, and let prod win over dev (declared prod anywhere ⇒ prod).
+			for (const p of rec.manifestPaths) if (!existing.manifestPaths.includes(p)) existing.manifestPaths.push(p);
+			if (!existing.version && rec.version) { existing.version = rec.version; if (!existing.versions.includes(rec.version)) existing.versions.push(rec.version); }
+			if (existing.isDev && !rec.isDev) { existing.isDev = false; existing.scope = rec.scope || "prod"; }
 		};
 		for (const g of findPyDirs(dir, pyDirFilter(dir, opts))) {
 			const lock = LOCKS.find(([n]) => g.names.has(n));
 			if (lock) {
 				const fp = path.join(g.dir, lock[0]);
+				parsedManifests.push(fp);
 				try { const { deps } = lock[1](fp); for (const d of deps) add(d, fp); }
 				catch (e) { warnings.push({ type: "parse-error", manifestPath: fp, message: `${lock[0]} parse failed: ${e.message}` }); }
 				continue;   // lockfile is authoritative for this directory
 			}
-			// No lockfile → best-effort from pyproject.toml and/or requirements.txt.
-			let pinned = 0, skipped = 0;
+			// No lockfile → best-effort from pyproject.toml and EVERY requirements*.txt file.
+			let skipped = 0;
 			const sources = [];
+			const before = out.size;
 			if (g.names.has("pyproject.toml")) {
 				const fp = path.join(g.dir, "pyproject.toml");
+				parsedManifests.push(fp);
 				try {
 					const r = P.parsePyprojectToml(fp);
 					for (const d of r.deps) add(d, fp);
-					pinned += r.deps.length; skipped += r.skipped;
+					skipped += r.skipped;
 					if (r.deps.length || r.skipped) sources.push("pyproject.toml");
 				} catch (e) { warnings.push({ type: "parse-error", manifestPath: fp, message: `pyproject.toml parse failed: ${e.message}` }); }
 			}
-			if (g.names.has("requirements.txt")) {
-				const fp = path.join(g.dir, "requirements.txt");
+			for (const rf of reqFilesIn(g.names)) {
+				const fp = path.join(g.dir, rf);
+				parsedManifests.push(fp);
+				const devFile = DEV_REQ_RE.test(rf);
 				try {
 					const r = P.parseRequirementsTxt(fp);
-					for (const d of r.deps) add(d, fp);
-					pinned += r.deps.length; skipped += r.skipped;
-					sources.push("requirements.txt");
+					for (const d of r.deps) add(devFile ? { ...d, isDev: true, scope: "dev" } : d, fp);
+					skipped += r.skipped;
+					sources.push(rf);
 					for (const miss of (r.missing || [])) warnings.push({ type: "missing-include", manifestPath: fp, message: `referenced requirements file not found: ${miss}` });
-				} catch (e) { warnings.push({ type: "parse-error", manifestPath: fp, message: `requirements.txt parse failed: ${e.message}` }); }
+				} catch (e) { warnings.push({ type: "parse-error", manifestPath: fp, message: `${rf} parse failed: ${e.message}` }); }
 			}
 			if (sources.length) {
-				warnings.push({ type: "no-lockfile", manifestPath: g.dir, message: `no lockfile (${sources.join(" + ")}) — best-effort: ${pinned} pinned, ${skipped} range(s) skipped` });
+				const pinned = out.size - before;
+				const shownSrc = sources.length > 4 ? `${sources.slice(0, 4).join(" + ")} + ${sources.length - 4} more` : sources.join(" + ");
+				warnings.push({ type: "no-lockfile", manifestPath: g.dir, message: `no lockfile (${shownSrc}) — best-effort: ${pinned} pinned, ${skipped} range(s) skipped` });
 			}
 		}
-		return { deps: out, warnings };
+		return { deps: out, warnings, parsedManifests };
 	},
 
 	coordKey(d) { return coordKeyFor("pypi", "", d.name); },

package/lib/codecs/recipes.js

@@ -56,6 +56,23 @@ const maven = {
 	directSection: "B. Or update the direct dependencies pulling them in",
 };
 
+function gradleConstraintsSnippet(items) {
+	const inner = items.map(it => `        implementation("${esc(it.groupId)}:${esc(it.artifactId)}:${esc(it.fixVersion)}")`).join("\n");
+	return `dependencies {
+    constraints {
+${inner}
+    }
+}`;
+}
+
+const gradle = {
+	label: "Gradle",
+	pinSection: "A. Pin vulnerable transitives via a constraints { } block",
+	pinIntro: cnt => `Add to the (sub)project <code>build.gradle(.kts)</code> dependencies block to force ${cnt} transitive${cnt > 1 ? "s" : ""} to a fixed version:`,
+	snippet: gradleConstraintsSnippet,
+	directSection: "B. Or bump the direct dependency (or its version in <code>gradle/libs.versions.toml</code>)",
+};
+
 const npm = {
 	label: "npm",
 	pinSection: "A. Pin vulnerable transitives via npm overrides",
@@ -140,4 +157,4 @@ const binary = {
 	directSection: "B. Prefer declaring these through a package manager (Maven/npm/NuGet/…)",
 };
 
-module.exports = { maven, npm, yarn, composer, pypi, nuget, go, ruby, binary, dependencyManagementSnippet, npmOverridesSnippet, yarnResolutionsSnippet, composerRequireSnippet, pipInstallSnippet, dotnetAddSnippet, goGetSnippet, bundleUpdateSnippet };
+module.exports = { maven, gradle, npm, yarn, composer, pypi, nuget, go, ruby, binary, dependencyManagementSnippet, gradleConstraintsSnippet, npmOverridesSnippet, yarnResolutionsSnippet, composerRequireSnippet, pipInstallSnippet, dotnetAddSnippet, goGetSnippet, bundleUpdateSnippet };

package/lib/codecs/ruby.codec.js

@@ -44,7 +44,9 @@ module.exports = {
 		const { deps2Exclude } = opts;
 		const out = new Map();
 		const warnings = [];
+		const parsedManifests = [];
 		for (const fp of findGemfileLocks(dir, dirFilter(dir, opts))) {
+			parsedManifests.push(fp);
 			try {
 				const { deps } = R.parseGemfileLockFile(fp);
 				for (const d of deps) {
@@ -53,7 +55,7 @@ module.exports = {
 				}
 			} catch (e) { warnings.push({ type: "parse-error", manifestPath: fp, message: `Gemfile.lock parse failed: ${e.message}` }); }
 		}
-		return { deps: out, warnings };
+		return { deps: out, warnings, parsedManifests };
 	},
 
 	coordKey(d) { return coordKeyFor("ruby", "", d.name); },

package/lib/cpe.js

@@ -147,6 +147,31 @@ function nodeAffectsDep(node, dep, cpeCoordMap) {
 	return false;
 }
 
+/**
+ * Does ANY vulnerable cpeMatch in this CVE name the dep's product/vendor — IGNORING the
+ * version range? This distinguishes "NVD has a CPE for this product but the dep version is
+ * out of range" (a genuine false positive worth filtering) from "NVD's CPE never names this
+ * product at all" (a coverage gap — NOT a false positive: the dep's own matcher, OSV or the
+ * CVE index, found it on a real coordinate, and CPE simply can't speak to it).
+ */
+function cveCpeNamesDep(cveRecord, dep, cpeCoordMap) {
+	const map = cpeCoordMap || loadCpeCoordMap();
+	const scan = nodes => {
+		for (const n of (nodes || [])) {
+			for (const m of (n.cpeMatch || n.cpe_match || [])) {
+				if (m.vulnerable === false) continue;
+				const parsed = parseCpe23Cached(m);
+				if (parsed && cpeMatchesDep(parsed, dep, map)) return true;
+			}
+			if (Array.isArray(n.children) && scan(n.children)) return true;
+		}
+		return false;
+	};
+	for (const cfg of (cveRecord?.configurations || [])) if (scan(cfg.nodes)) return true;
+	for (const uri of (cveRecord?.cpes || [])) { const p = parseCpe23(uri); if (p && cpeMatchesDep(p, dep, map)) return true; }
+	return false;
+}
+
 /**
  * A node is "context-only" when it carries no vulnerable cpeMatch (recursively) —
  * e.g. the "…AND runs on linux_kernel" platform node, whose CPEs are all
@@ -309,8 +334,19 @@ function refineMatchesWithCpe(matches, opts = {}) {
 		if (!rec.configurations.length && !rec.cpes.length) continue;
 		const { affected, confidence } = evaluateCveForDep(rec, m.dep, map);
 		m.cpeConfidence = confidence;
-		if (!affected && rec.configurations.length) {
-			// Configurations exist but version doesn't satisfy any → likely FP
+		// Mark a match as a CPE false-positive ONLY for a genuine VERSION contradiction:
+		// NVD's CPE names this product but the dep version is outside the vulnerable range.
+		// NEVER filter when:
+		//   - the match is OSV-confirmed — OSV did a precise, ecosystem-native version match
+		//     (its data is authoritative for the package ecosystems; don't let NVD override it);
+		//   - NVD's CPE never names this product (`!productNamed`) — that's a coverage gap, not
+		//     a false positive (covers every pypi/composer/nuget/go/ruby coord, and any maven/
+		//     npm artifact whose CPE product name simply differs from its coordinate).
+		// Without these guards the filter silently hid REAL CVEs (e.g. cryptography 46.0.5,
+		// fixed in 46.0.6) by dumping them into the false-positives appendix.
+		const isOsv = String(m.source || "").includes("osv");
+		const productNamed = cveCpeNamesDep(rec, m.dep, map);
+		if (!affected && productNamed && !isOsv) {
 			m.cpeFiltered = true;
 		}
 		if (affected && confidence === "exact" && m.confidence !== "exact") m.confidence = "exact";
@@ -325,6 +361,7 @@ module.exports = {
 	cpeMatchesDep,
 	nodeAffectsDep,
 	evaluateCveForDep,
+	cveCpeNamesDep,
 	refineMatchesWithCpe,
 	loadCpeCoordMap,
 };

package/lib/cve-match.js

@@ -122,6 +122,19 @@ function collectResolvedDeps(allPomMetadata, allPropsByPom, opts = {}) {
  *     for transitive deps. This mirrors Maven's behaviour where the root
  *     project's <dependencyManagement> wins over transitive depMgmt.
  */
+/**
+ * A transitive coord is itself a Maven artifact (ecosystem "maven"), but for REPORT
+ * grouping we attribute its ecosystemType to the build tool that pulled it in: if every
+ * root reaching it (the first node of each via-chain) is a Gradle direct dep, it belongs
+ * in the Gradle chapter; a Maven (or mixed/unknown) root keeps it in the Maven chapter.
+ * @param viaPaths array of chains [[rootCoord, …], …]; @param rootEcoType Map coordKey→type
+ */
+function inheritEcoType(viaPaths, rootEcoType) {
+	const roots = (viaPaths || []).map(p => p && p[0]).filter(Boolean);
+	const types = new Set(roots.map(r => rootEcoType.get(r)).filter(Boolean));
+	return (types.size === 1 && types.has("gradle")) ? "gradle" : "maven";
+}
+
 async function expandWithTransitives(resolvedDeps, opts = {}) {
 	const { verbose } = opts;
 	// Root depMgmt: every dep in the Map that has a concrete version becomes a
@@ -146,6 +159,11 @@ async function expandWithTransitives(resolvedDeps, opts = {}) {
 
 	if (verbose) console.log(`🌳 Resolving transitives for ${directs.length} direct deps…`);
 
+	// Root → ecosystemType, so a transitive pulled only by Gradle roots is reported in the
+	// Gradle chapter (not the Maven one) on a pure-Gradle project.
+	const rootEcoType = new Map();
+	for (const d of directs) rootEcoType.set(`${d.groupId}:${d.artifactId}`, d.ecosystemType || d.ecosystem || "maven");
+
 	const transitives = await resolveTransitiveDeps(directs, {
 		...opts,
 		rootDepMgmt,
@@ -165,7 +183,7 @@ async function expandWithTransitives(resolvedDeps, opts = {}) {
 			viaPaths: t.viaPaths || [t.via],
 			depth: t.depth,
 			ecosystem: "maven",
-			ecosystemType: "maven",
+			ecosystemType: inheritEcoType(t.viaPaths || [t.via], rootEcoType),
 		});
 		added++;
 	}
@@ -281,6 +299,7 @@ function matchDepsAgainstCves(resolvedDeps, cveIndex, opts = {}) {
 module.exports = {
 	collectResolvedDeps,
 	expandWithTransitives,
+	inheritEcoType,
 	matchDepsAgainstCves,
 	resolveDepVersion,
 	vendorMatchesGroup,