cognium-dev 3.158.0 → 3.160.0

package/dist/cli.js

@@ -12982,7 +12982,10 @@ function matchesSinkPattern(call, pattern, typeHierarchy, language) {
       return true;
     }
     const subtypeArgArityOk = !pattern.arg_positions || pattern.arg_positions.length === 0 || pattern.arg_positions.every((pos) => pos < (call.arguments?.length ?? 0));
-    if (call.receiver_type && call.receiver_type === pattern.class) {} else if (call.receiver_type && typeHierarchy && subtypeArgArityOk && typeHierarchy.isSubtypeOf(call.receiver_type, pattern.class)) {} else if (call.receiver_type_fqn && call.receiver_type_fqn.endsWith("." + pattern.class)) {} else if (call.receiver_type_fqn && typeHierarchy && subtypeArgArityOk && typeHierarchy.isSubtypeOf(call.receiver_type_fqn, pattern.class)) {} else if (call.receiver && !receiverMightBeClass(call.receiver, pattern.class)) {
+    if (call.receiver_type && call.receiver_type === pattern.class) {} else if (call.receiver_type && typeHierarchy && subtypeArgArityOk && typeHierarchy.isSubtypeOf(call.receiver_type, pattern.class)) {} else if (call.receiver_type_fqn && call.receiver_type_fqn.endsWith("." + pattern.class)) {} else if (call.receiver_type_fqn && typeHierarchy && subtypeArgArityOk && typeHierarchy.isSubtypeOf(call.receiver_type_fqn, pattern.class)) {} else if (!call.receiver_type && !call.receiver_type_fqn && call.receiver && typeHierarchy && subtypeArgArityOk && (() => {
+      const factoryReturn = typeHierarchy.resolveFactoryReturnType(call.receiver);
+      return factoryReturn !== null && typeHierarchy.isSubtypeOf(factoryReturn, pattern.class);
+    })()) {} else if (call.receiver && !receiverMightBeClass(call.receiver, pattern.class)) {
       if (typeHierarchy && typeHierarchy.couldBeType(call.receiver, pattern.class)) {
         return true;
       }
@@ -13915,6 +13918,7 @@ class TypeHierarchyResolver {
   implementations = new Map;
   _subtypeCache = new Map;
   _implCache = new Map;
+  factoryReturnTypes = new Map;
   addFromIR(ir, filePath) {
     for (const type of ir.types) {
       this.addType(type, filePath, ir.meta.package || null);
@@ -14120,11 +14124,22 @@ class TypeHierarchyResolver {
   getAllTypes() {
     return Array.from(this.types.values());
   }
+  registerFactoryReturnType(factoryClass, method, returnFqn) {
+    this.factoryReturnTypes.set(`${factoryClass}.${method}`, returnFqn);
+  }
+  resolveFactoryReturnType(receiver) {
+    const m = receiver.match(/(?:^|\.)([A-Z]\w*)\.(\w+)\(\)$/);
+    if (!m)
+      return null;
+    const key = `${m[1]}.${m[2]}`;
+    return this.factoryReturnTypes.get(key) ?? null;
+  }
   clear() {
     this.types.clear();
     this.nameToFqn.clear();
     this.subtypes.clear();
     this.implementations.clear();
+    this.factoryReturnTypes.clear();
   }
   resolveTypeName(name2, currentPackage) {
     if (name2.includes("."))
@@ -14463,6 +14478,9 @@ function registerCommonLibraries(resolver) {
   for (const type of [...apacheHttpClient4x, ...apacheHttpClient5x]) {
     resolver.addType(type, "common-libraries", type.package);
   }
+  resolver.registerFactoryReturnType("HttpClients", "createDefault", "org.apache.http.impl.client.CloseableHttpClient");
+  resolver.registerFactoryReturnType("HttpClients", "createSystem", "org.apache.http.impl.client.CloseableHttpClient");
+  resolver.registerFactoryReturnType("HttpClients", "createMinimal", "org.apache.http.impl.client.MinimalHttpClient");
 }
 // ../circle-ir/dist/resolution/symbol-table.js
 class SymbolTable {
@@ -22516,14 +22534,40 @@ class CrossFilePass {
         });
       }
     }
+    const filteredTaintPaths = taintPaths.filter((tp) => {
+      const sinkIR = projectGraph.getIR(tp.sink.file);
+      if (!sinkIR)
+        return true;
+      const sinkTypeStr = tp.sink.type;
+      if (tp.source.file === tp.sink.file) {
+        const lo = Math.min(tp.source.line, tp.sink.line);
+        const hi = Math.max(tp.source.line, tp.sink.line);
+        for (const san of sinkIR.taint.sanitizers ?? []) {
+          if (san.line < lo || san.line > hi)
+            continue;
+          if (san.sanitizes.includes(sinkTypeStr)) {
+            return false;
+          }
+        }
+        return true;
+      }
+      for (const san of sinkIR.taint.sanitizers ?? []) {
+        if (san.line !== tp.sink.line)
+          continue;
+        if (san.sanitizes.includes(sinkTypeStr)) {
+          return false;
+        }
+      }
+      return true;
+    });
     const typeHierarchy = projectGraph.typeHierarchy.toTypeHierarchyData();
     logger.info("cross-file: complete", {
       totalMs: Date.now() - startMs,
-      paths: taintPaths.length,
+      paths: filteredTaintPaths.length,
       crossFileCalls: crossFileCalls.length,
       budgetExceeded: exceeded
     });
-    const result = { crossFileCalls, taintPaths, typeHierarchy };
+    const result = { crossFileCalls, taintPaths: filteredTaintPaths, typeHierarchy };
     if (exceeded)
       result.budgetExceeded = true;
     return result;
@@ -23669,6 +23713,7 @@ class LanguageSourcesPass {
     if (language === "java") {
       additionalSanitizers.push(...findJavaSafeJsonParseSanitizers(code));
       additionalSanitizers.push(...findJavaPathNormalizeStartsWithGuardSanitizers(code));
+      additionalSanitizers.push(...findJavaPathGetFileNameSanitizers(code));
       additionalSanitizers.push(...findJavaInlineCrlfStripLogSanitizers(code));
       additionalSanitizers.push(...findJavaArgvFormExecSanitizers(code));
       for (const finding of findJavaPatternFindings(code, graph.ir.meta.file)) {
@@ -25937,6 +25982,48 @@ function findJavaPathNormalizeStartsWithGuardSanitizers(code) {
   }
   return sanitizers;
 }
+function findJavaPathGetFileNameSanitizers(code) {
+  const sanitizers = [];
+  const lines = code.split(`
+`);
+  const assignmentRe = /^\s*(?:(?:final\s+)?[A-Za-z_][\w.<>?,\s\[\]]*?\s+)?([A-Za-z_]\w*)\s*=\s*(.+?);\s*$/;
+  const rhsHasGetFileNameRe = /\.\s*getFileName\s*\(\s*\)/;
+  const rhsHasPathsChainRe = /\b(?:Paths\s*\.\s*get|Path\s*\.\s*of)\s*\(/;
+  const candidates = [];
+  for (let i2 = 0;i2 < lines.length; i2++) {
+    const m = assignmentRe.exec(lines[i2]);
+    if (!m)
+      continue;
+    const rhs = m[2];
+    if (!rhsHasGetFileNameRe.test(rhs))
+      continue;
+    if (!rhsHasPathsChainRe.test(rhs))
+      continue;
+    candidates.push({ line: i2 + 1, boundVar: m[1] });
+  }
+  if (candidates.length === 0)
+    return sanitizers;
+  for (const c of candidates) {
+    sanitizers.push({
+      type: "java_path_get_filename",
+      method: "getFileName",
+      line: c.line,
+      sanitizes: ["path_traversal", "external_taint_escape"]
+    });
+    const varRefRe = new RegExp(`\\b${c.boundVar}\\b`);
+    for (let l = c.line;l < lines.length; l++) {
+      if (!varRefRe.test(lines[l]))
+        continue;
+      sanitizers.push({
+        type: "java_path_get_filename",
+        method: "getFileName",
+        line: l + 1,
+        sanitizes: ["path_traversal", "external_taint_escape"]
+      });
+    }
+  }
+  return sanitizers;
+}
 function findJavaInlineCrlfStripLogSanitizers(code) {
   const sanitizers = [];
   const lines = code.split(`
@@ -29759,6 +29846,12 @@ function correlateDollarBraceToArgPositions(method, refs) {
       }
     }
   });
+  const declaredNameToIndex = new Map;
+  method.parameters.forEach((param, idx) => {
+    if (param.name && !declaredNameToIndex.has(param.name)) {
+      declaredNameToIndex.set(param.name, idx);
+    }
+  });
   const positions = new Set;
   for (const ref of refs) {
     const namedIdx = paramNameToIndex.get(ref);
@@ -29766,6 +29859,11 @@ function correlateDollarBraceToArgPositions(method, refs) {
       positions.add(namedIdx);
       continue;
     }
+    const declaredIdx = declaredNameToIndex.get(ref);
+    if (declaredIdx !== undefined) {
+      positions.add(declaredIdx);
+      continue;
+    }
     const positionalIdx = parsePositionalRef(ref);
     if (positionalIdx !== null && positionalIdx < method.parameters.length) {
       positions.add(positionalIdx);
@@ -29796,11 +29894,11 @@ class MyBatisAnnotationSqlSinkPass {
   category = "security";
   run(ctx) {
     if (ctx.language !== "java") {
-      return { annotatedMethodCount: 0, addedSinkCount: 0 };
+      return { annotatedMethodCount: 0, addedSinkCount: 0, declarationFindingCount: 0 };
     }
     const { types, imports, calls } = ctx.graph.ir;
     if (!fileImportsMyBatis(imports)) {
-      return { annotatedMethodCount: 0, addedSinkCount: 0 };
+      return { annotatedMethodCount: 0, addedSinkCount: 0, declarationFindingCount: 0 };
     }
     const mapperMethods = [];
     for (const type of types) {
@@ -29829,6 +29927,7 @@ class MyBatisAnnotationSqlSinkPass {
           interfaceSimpleName: type.name,
           interfaceFqn,
           methodName: method.name,
+          declarationLine: method.start_line,
           taintedArgPositions: positions
         });
       }
@@ -29836,9 +29935,27 @@ class MyBatisAnnotationSqlSinkPass {
     if (mapperMethods.length === 0) {
       return {
         annotatedMethodCount: 0,
-        addedSinkCount: 0
+        addedSinkCount: 0,
+        declarationFindingCount: 0
       };
     }
+    const file = ctx.graph.ir.meta.file;
+    let declarationFindingCount = 0;
+    for (const rec of mapperMethods) {
+      ctx.addFinding({
+        id: `${this.name}-${file}-${rec.declarationLine}-${rec.methodName}`,
+        pass: this.name,
+        category: this.category,
+        rule_id: this.name,
+        cwe: "CWE-89",
+        severity: "critical",
+        level: "error",
+        message: `MyBatis Mapper method \`${rec.interfaceSimpleName}.${rec.methodName}\` uses raw ` + `\`\${}\` interpolation in its @Select/@Update/@Insert/@Delete annotation. ` + `Any caller passing dynamic input into arg position(s) ` + `${rec.taintedArgPositions.join(", ")} will execute unbound SQL (CWE-89). ` + `Replace \`\${x}\` with \`#{x}\` to enable JDBC parameter binding.`,
+        file,
+        line: rec.declarationLine
+      });
+      declarationFindingCount++;
+    }
     const sinks = ctx.hasResult("taint-matcher") ? ctx.getResult("taint-matcher").sinks : ctx.graph.ir.taint.sinks;
     let addedSinkCount = 0;
     for (const call of calls) {
@@ -29866,7 +29983,8 @@ class MyBatisAnnotationSqlSinkPass {
     }
     return {
       annotatedMethodCount: mapperMethods.length,
-      addedSinkCount
+      addedSinkCount,
+      declarationFindingCount
     };
   }
 }
@@ -43682,7 +43800,7 @@ var colors = {
 };
 
 // src/version.ts
-var version = "3.158.0";
+var version = "3.160.0";
 
 // src/formatters.ts
 var LIBRARY_API_SURFACE_TAG2 = "library-api-surface:caller-responsibility";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cognium-dev",
-  "version": "3.158.0",
+  "version": "3.160.0",
   "description": "Static Application Security Testing CLI for detecting security vulnerabilities via taint tracking",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -66,7 +66,7 @@
   },
   "dependencies": {
     "@cognium/project-profile-detect": "^1.1.0",
-    "circle-ir": "^3.158.0"
+    "circle-ir": "^3.160.0"
   },
   "devDependencies": {
     "@types/node": "^25.5.0",