@produtype/core 1.21.0 → 1.21.2

package/dist/analyzer/detectObservability.js

@@ -69,7 +69,21 @@ async function detectObservability(ctx) {
         evidence.push({ type: 'dependency', value: d, claim: 'logging' });
     for (const d of sentryDeps)
         evidence.push({ type: 'dependency', value: d, claim: 'logging' });
-    const hits = await (0, textSearch_1.searchInFiles)(ctx.root, ctx.files.source, [HEALTH_ROUTE, /x-request-id/i, /correlation-id/i, /error\s*handler/i, /RotatingFileHandler/i], 25);
+    /**
+     * An import path is not a route.
+     *
+     * `import Health from 'typings/Health';` is a TypeScript type in Radarr's frontend,
+     * and `/Health'` matches the route pattern exactly as `/health` in a URL does. It
+     * was the evidence behind Radarr's passing health check — a false pass, which is
+     * the direction that raises a score rather than lowering one.
+     *
+     * Imports are good evidence elsewhere and are left alone there; this is the search
+     * for a *route*, and a module specifier is never one. Filtered inside the search so
+     * that a frontend full of them cannot spend the budget before a real route is
+     * reached.
+     */
+    const IMPORT_LINE = /^\s*(?:import\b|from\s+['"]|const\s+\{?[\w\s,}]*\}?\s*=\s*require\()/;
+    const hits = await (0, textSearch_1.searchInFiles)(ctx.root, ctx.files.source, [HEALTH_ROUTE, /x-request-id/i, /correlation-id/i, /error\s*handler/i, /RotatingFileHandler/i], 25, (match) => !IMPORT_LINE.test(match.snippet));
     /**
      * One search, three answers, so the claim is decided per hit rather than per search.
      *

package/dist/utils/textSearch.js

@@ -98,14 +98,37 @@ const NAMES_SOMETHING = /^["']?(?:name|key|label|id|title|field|env|variable)["'
  * has other arguments and is untouched.
  */
 const HTTP_HEADER_NAME = /^[A-Z][A-Za-z0-9]*(?:-[A-Z][A-Za-z0-9]*)+$/;
+/**
+ * What is left when a constant's value is taken out of its own name.
+ *
+ * Stirling-PDF stores a user's second factor under a key, and declares that key as
+ * `public static final String MFA_SECRET_KEY = "mfaSecret";`. Normalised, the name is
+ * the value plus `key` — it says what the string is *for*. That line was the one
+ * `critical` in the report of a careful product: the loudest severity there is, about
+ * a map key.
+ *
+ * A real secret is never its own name. `JWT_SECRET = "jwtSecret"` is somebody naming
+ * a slot; the value that matters is random and lives in the environment.
+ */
+const NAME_PLUS_WHAT_IT_IS = /^(?:key|name|field|prop|property|attr|attribute|header|param|id|label|const|setting|option)$/;
 function spellsItsOwnName(trimmed) {
     const withoutComment = trimmed.replace(/\s*(\/\/|#).*$/, '').replace(/[,;]\s*$/, '');
-    const assignment = /^(?:(?:public|private|protected|internal|export|const|let|var|final|static|readonly|string)\s+)*([A-Za-z_][\w.]*)\s*(?::\s*[\w<>[\].]+)?\s*=\s*(['"`])([^'"`]+)\2$/.exec(withoutComment);
+    /**
+     * The type sits between the modifiers and the name in Java, C# and Go, and it is
+     * spelled however that language spells it — `String`, not `string`. Listing the
+     * declarators alone missed `public static final String MFA_SECRET_KEY = "mfaSecret"`
+     * entirely, so one optional word is allowed there instead of a list that would
+     * always be short of somebody's type.
+     */
+    const assignment = /^(?:(?:public|private|protected|internal|export|const|let|var|final|static|readonly)\s+)*(?:[A-Za-z_][\w.<>[\]]*\s+)?([A-Za-z_][\w.]*)\s*(?::\s*[\w<>[\].]+)?\s*=\s*(['"`])([^'"`]+)\2$/.exec(withoutComment);
     if (!assignment)
         return false;
     const plain = (value) => value.toLowerCase().replace(/[-_.\s]/g, '');
     const declared = /^\s*(?:public|private|protected|internal|export|const|let|var|final|static|readonly)\b/.test(withoutComment);
-    return plain(assignment[1]) === plain(assignment[3])
+    const name = plain(assignment[1]);
+    const literal = plain(assignment[3]);
+    return name === literal
+        || (declared && NAME_PLUS_WHAT_IT_IS.test(name.replace(literal, '')) && name.includes(literal))
         || (declared && HTTP_HEADER_NAME.test(assignment[3]));
 }
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@produtype/core",
-  "version": "1.21.0",
+  "version": "1.21.2",
   "description": "Deterministic CLI and library that analyzes a web application repository and reports how far it is from production-ready for the kind of product it is meant to be.",
   "license": "MIT",
   "bin": {