agent-security-scanner-mcp 2.0.5 → 2.0.6

package/README.md

@@ -65,6 +65,15 @@ The scanner works without tree-sitter using regex-based detection, but AST analy
 
 ---
 
+## What's New in v2.0.6
+
+- **fix_security reliability overhaul** - Fixes now validated before applying to prevent malformed code output
+- **Python f-string SQL injection** - Now detects AND fixes `f"SELECT...{var}"` patterns
+- **Python .format() SQL injection** - Now fixes `"SELECT...{}".format(var)` patterns
+- **JavaScript template literal SQL injection** - Now fixes `` `SELECT...${var}` `` patterns
+- **Multi-pattern fix engine** - Each vulnerability type can have multiple language-specific fix patterns
+- **Syntax validation** - Rejects fixes with unbalanced quotes, brackets, or obvious syntax errors
+
 ## What's New in v2.0.5
 
 - **Claude Code per-project fix** - `init claude-code` now uses `claude mcp add` CLI for reliable per-project configuration

package/index.js

@@ -28,7 +28,73 @@ const FIX_TEMPLATES = {
   // ===========================================
   "sql-injection": {
     description: "Use parameterized queries instead of string concatenation",
-    fix: (line) => line.replace(/["']([^"']*)\s*["']\s*\+\s*(\w+)/, '"$1?", [$2]')
+    patterns: [
+      // Python f-strings: cursor.execute(f"SELECT * FROM users WHERE id = {user_id}")
+      {
+        match: /f["'].*(?:SELECT|INSERT|UPDATE|DELETE).*\{(\w+)\}.*["']/i,
+        fix: (line) => {
+          // Extract the query and variable
+          const match = line.match(/(\w+\.(?:execute|query|run))\s*\(\s*f(["'])(.*?)(?:SELECT|INSERT|UPDATE|DELETE)(.*?)\{(\w+)\}(.*?)\2/i);
+          if (match) {
+            const [, method, quote, prefix, queryStart, varName, suffix] = match;
+            // Reconstruct as parameterized query
+            const cleanPrefix = prefix.replace(/\{[^}]+\}/g, '?');
+            const cleanSuffix = suffix.replace(/\{[^}]+\}/g, '?');
+            return line.replace(
+              /f(["']).*\1/,
+              `"${cleanPrefix}${queryStart.trim().toUpperCase()}${cleanSuffix}?", (${varName},)`
+            );
+          }
+          // Simpler fallback for f-strings
+          return line.replace(/f(["'])(.*?)\{(\w+)\}(.*?)\1/, '"$2?$4", ($3,)');
+        },
+        languages: ['python']
+      },
+      // Python .format(): "SELECT ... WHERE id = {}".format(user_id)
+      {
+        match: /["'].*(?:SELECT|INSERT|UPDATE|DELETE).*\{\}.*["']\.format\s*\(/i,
+        fix: (line) => {
+          return line.replace(
+            /(["'])(.*?)\{\}(.*?)\1\.format\s*\(\s*(\w+)\s*\)/,
+            '"$2?$3", [$4]'
+          );
+        },
+        languages: ['python']
+      },
+      // Python % formatting: "SELECT ... WHERE id = %s" % user_id
+      {
+        match: /["'].*(?:SELECT|INSERT|UPDATE|DELETE).*%s.*["']\s*%\s*\(/i,
+        fix: (line) => {
+          return line.replace(
+            /(["'])(.*?)%s(.*?)\1\s*%\s*\(\s*(\w+)\s*,?\s*\)/,
+            '"$2?$3", [$4]'
+          );
+        },
+        languages: ['python']
+      },
+      // JS template literals: `SELECT * FROM users WHERE id = ${userId}`
+      {
+        match: /`.*(?:SELECT|INSERT|UPDATE|DELETE).*\$\{.*\}.*`/i,
+        fix: (line) => {
+          return line.replace(
+            /`(.*?)\$\{(\w+)\}(.*?)`/,
+            '"$1?$3", [$2]'
+          );
+        },
+        languages: ['javascript', 'typescript']
+      },
+      // Simple concatenation (no quotes inside): "SELECT ... WHERE id = " + userId
+      {
+        match: /["'](?:SELECT|INSERT|UPDATE|DELETE)[^"']+["']\s*\+\s*\w+(?!\s*\+\s*["'])/i,
+        fix: (line) => {
+          return line.replace(
+            /(["'])((?:SELECT|INSERT|UPDATE|DELETE)[^"']+)\1\s*\+\s*(\w+)/i,
+            '"$2?", [$3]'
+          );
+        },
+        languages: ['javascript', 'python', 'java', 'go', 'ruby', 'php']
+      }
+    ]
   },
   "nosql-injection": {
     description: "Sanitize MongoDB query inputs",
@@ -765,17 +831,96 @@ function runAnalyzer(filePath) {
   }
 }
 
+// Validate that a fix produces valid syntax
+function validateFix(original, fixed, language) {
+  // Rule 1: Fix must be different from original
+  if (fixed === original || !fixed) {
+    return { valid: false, reason: 'no_change' };
+  }
+
+  // Rule 2: Balanced quotes (ignore escaped quotes)
+  const unescaped = fixed.replace(/\\["'`]/g, '');
+  const singleQuotes = (unescaped.match(/'/g) || []).length;
+  const doubleQuotes = (unescaped.match(/"/g) || []).length;
+  const backticks = (unescaped.match(/`/g) || []).length;
+  if (singleQuotes % 2 !== 0 || doubleQuotes % 2 !== 0 || backticks % 2 !== 0) {
+    return { valid: false, reason: 'unbalanced_quotes' };
+  }
+
+  // Rule 3: Balanced brackets
+  const brackets = { '(': 0, '[': 0, '{': 0 };
+  const closers = { ')': '(', ']': '[', '}': '{' };
+  for (const char of unescaped) {
+    if (brackets[char] !== undefined) brackets[char]++;
+    if (closers[char]) brackets[closers[char]]--;
+  }
+  if (Object.values(brackets).some(v => v !== 0)) {
+    return { valid: false, reason: 'unbalanced_brackets' };
+  }
+
+  // Rule 4: No obvious syntax errors
+  const badPatterns = [
+    /""[^,\s\]);}]/, // empty string followed by unexpected char
+    /\+\s*[)\]}]/, // + followed by closing bracket
+    /,\s*\+/, // comma followed by +
+    /\(\s*\+/, // open paren followed by +
+  ];
+  for (const pattern of badPatterns) {
+    if (pattern.test(fixed)) {
+      return { valid: false, reason: 'syntax_error' };
+    }
+  }
+
+  return { valid: true };
+}
+
 // Generate fix suggestion for an issue
 function generateFix(issue, line, language) {
   const ruleId = issue.ruleId.toLowerCase();
 
-  for (const [pattern, template] of Object.entries(FIX_TEMPLATES)) {
-    if (ruleId.includes(pattern)) {
-      return {
-        description: template.description,
-        original: line,
-        fixed: template.fix(line, language)
-      };
+  for (const [templateId, template] of Object.entries(FIX_TEMPLATES)) {
+    if (!ruleId.includes(templateId)) continue;
+
+    // New: handle patterns array
+    if (template.patterns && Array.isArray(template.patterns)) {
+      for (const pattern of template.patterns) {
+        // Skip if language doesn't match
+        if (pattern.languages && !pattern.languages.includes(language)) {
+          continue;
+        }
+
+        // Skip if pattern doesn't match the line
+        if (!pattern.match.test(line)) {
+          continue;
+        }
+
+        // Try the fix
+        const candidate = pattern.fix(line, language);
+        const validation = validateFix(line, candidate, language);
+
+        if (validation.valid) {
+          return {
+            description: template.description,
+            original: line,
+            fixed: candidate
+          };
+        }
+        // If invalid, try next pattern
+      }
+    }
+
+    // Fallback: old-style single fix function (backward compatible)
+    if (template.fix && typeof template.fix === 'function') {
+      const candidate = template.fix(line, language);
+      const validation = validateFix(line, candidate, language);
+
+      if (validation.valid) {
+        return {
+          description: template.description,
+          original: line,
+          fixed: candidate
+        };
+      }
     }
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agent-security-scanner-mcp",
-  "version": "2.0.5",
+  "version": "2.0.6",
   "mcpName": "io.github.sinewaveai/agent-security-scanner-mcp",
   "description": "Security scanner MCP server for AI coding agents. Prompt injection firewall, package hallucination detection (4.3M+ packages), 359 vulnerability rules with auto-fix. For Claude Code, Cursor, Windsurf, Cline.",
   "main": "index.js",