security-mcp 1.1.4 → 1.3.1

package/dist/gate/policy.js

@@ -1,5 +1,7 @@
 import { z } from "zod";
+import { createHmac, timingSafeEqual, randomUUID } from "node:crypto";
 import fg from "fast-glob";
+import { sanitizeErrorMessage } from "./result.js";
 import { getChangedFiles } from "./diff.js";
 import { detectSurfaces } from "./findings.js";
 import { checkRequiredArtifacts } from "./checks/required-artifacts.js";
@@ -11,7 +13,7 @@ import { checkInfra } from "./checks/infra.js";
 import { checkMobileIos } from "./checks/mobile-ios.js";
 import { checkMobileAndroid } from "./checks/mobile-android.js";
 import { checkAi } from "./checks/ai.js";
-import { checkScannerReadiness } from "./checks/scanners.js";
+import { checkScannerReadiness, runScanners } from "./checks/scanners.js";
 import { evaluateEvidenceCoverage } from "./evidence.js";
 import { applySecurityExceptions } from "./exceptions.js";
 import { controlApplies, loadControlCatalog } from "./catalog.js";
@@ -24,13 +26,14 @@ import { checkDlp } from "./checks/dlp.js";
 import { runSbomChecks } from "./checks/sbom.js";
 import { runPlaybookChecks } from "./checks/playbook.js";
 import { runAiRedteamChecks } from "./checks/ai-redteam.js";
-import { runRuntimeChecks } from "./checks/runtime.js";
+import { runRuntimeChecks, runDockerChecks } from "./checks/runtime.js";
 import { runCiPipelineChecks } from "./checks/ci-pipeline.js";
 import { runNucleiChecks } from "./checks/nuclei.js";
 import { getCommitHash, loadBaseline, saveBaseline, compareBaseline } from "./baseline.js";
 import { checkInjectionDeep } from "./checks/injection-deep.js";
 import { checkAuthDeep } from "./checks/auth-deep.js";
-import { randomUUID } from "node:crypto";
+import { checkSupplyChainDeep } from "./checks/supply-chain-deep.js";
+import { checkBusinessLogic } from "./checks/business-logic.js";
 const PolicySchema = z.object({
     name: z.string(),
     version: z.string(),
@@ -47,7 +50,16 @@ const PolicySchema = z.object({
         type: z.enum(["gate", "control"]).default("gate"),
         evidence: z.array(z.string()).default([])
     }))
-        .default([])
+        .default([]),
+    // Fix 6: configurable severity blocking list
+    severity_block: z.array(z.string()).optional(),
+    // Fix 7: exceptions config with require_ticket
+    exceptions: z
+        .object({
+        require_ticket: z.boolean().optional(),
+        approval_roles: z.array(z.string()).optional()
+    })
+        .optional()
 });
 const SCOPE_IGNORE_GLOBS = ["**/node_modules/**", "**/.git/**", "**/dist/**"];
 const SAFE_SCOPE_TARGET_RE = /^[a-zA-Z0-9_./-]+$/;
@@ -74,23 +86,82 @@ async function resolveScopedFiles(opts) {
         const files = await fg(targets, {
             onlyFiles: true,
             dot: true,
-            ignore: SCOPE_IGNORE_GLOBS
+            ignore: SCOPE_IGNORE_GLOBS,
+            followSymbolicLinks: false
         });
-        return Array.from(new Set(files)).sort();
+        return Array.from(new Set(files)).sort((a, b) => a.localeCompare(b));
     }
     const folderGlobs = targets.map((target) => `${target.replace(/\/+$/, "")}/**/*`);
     const files = await fg(folderGlobs, {
         onlyFiles: true,
         dot: true,
-        ignore: SCOPE_IGNORE_GLOBS
+        ignore: SCOPE_IGNORE_GLOBS,
+        followSymbolicLinks: false
     });
-    return Array.from(new Set(files)).sort();
+    return Array.from(new Set(files)).sort((a, b) => a.localeCompare(b));
+}
+// POC-8 fix: HMAC-SHA256 verification of the policy file on load.
+// Minimal tamper that bypasses all HIGH/CRITICAL findings: change
+//   "severity_block": ["HIGH", "CRITICAL"]  →  "severity_block": []
+// With HMAC verification that tampered file is detected and rejected.
+const POLICY_HMAC_MIN_KEY_BYTES = 32;
+function getPolicyHmacKey() {
+    const key = process.env["SECURITY_POLICY_HMAC_KEY"];
+    if (!key)
+        return null;
+    if (Buffer.byteLength(key, "utf-8") < POLICY_HMAC_MIN_KEY_BYTES) {
+        throw new Error(`SECURITY_POLICY_HMAC_KEY is too short (${Buffer.byteLength(key, "utf-8")} bytes). ` +
+            `Minimum ${POLICY_HMAC_MIN_KEY_BYTES} bytes required.`);
+    }
+    return key;
+}
+/**
+ * Write the HMAC signature for a policy file to <policyPath>.hmac.
+ * Call this after generating or updating the policy. Not exported from the
+ * module — callers use the CLI helper `security-mcp sign-policy`.
+ */
+export function signPolicyFile(raw, key) {
+    return createHmac("sha256", key).update(raw, "utf-8").digest("hex");
 }
 export async function loadPolicy(policyPath) {
     const raw = await readFileSafe(policyPath);
+    // POC-8: verify HMAC when a key is configured
+    const hmacKey = getPolicyHmacKey();
+    // TM-001: warn when HMAC protection is absent so operators know the policy file
+    // can be silently tampered (e.g. severity_block cleared) without detection.
+    // Non-blocking — allows operation without the key — but makes the risk visible.
+    // Only warn in non-gate contexts — in gate mode stdout is JSON and mixing
+    // stderr into the output file (via 2>&1 hooks) would corrupt JSON parsing.
+    if (!hmacKey && !process.env["SECURITY_GATE_POLICY"]) {
+        console.warn("[loadPolicy] WARNING: SECURITY_POLICY_HMAC_KEY is not set. " +
+            "Policy file integrity is NOT verified — a local attacker could silently edit " +
+            `"${policyPath}" (e.g. clear severity_block) without detection. ` +
+            "Set SECURITY_POLICY_HMAC_KEY (≥32 bytes) and run `security-mcp sign-policy` to enable tamper protection.");
+    }
+    if (hmacKey) {
+        let storedSig = null;
+        try {
+            storedSig = (await readFileSafe(`${policyPath}.hmac`)).trim();
+        }
+        catch {
+            // .hmac sidecar missing — reject to prevent stripping the sig to bypass verification
+            throw new Error(`[loadPolicy] Policy file "${policyPath}" has no .hmac sidecar but ` +
+                `SECURITY_POLICY_HMAC_KEY is set. Generate a signature with: security-mcp sign-policy`);
+        }
+        const expected = createHmac("sha256", hmacKey).update(raw, "utf-8").digest("hex");
+        const storedBuf = Buffer.from(storedSig, "hex");
+        const expectedBuf = Buffer.from(expected, "hex");
+        const valid = storedBuf.length === expectedBuf.length && timingSafeEqual(storedBuf, expectedBuf);
+        if (!valid) {
+            throw new Error(`[loadPolicy] HMAC verification failed for "${policyPath}" — policy file may have been tampered. ` +
+                `Re-sign with: security-mcp sign-policy`);
+        }
+    }
     const parsed = JSON.parse(raw);
     return PolicySchema.parse(parsed);
 }
+// Fix 8: pattern to detect security-relevant config files that must not get docs-tier bypass
+const SECURITY_CONFIG_RE = /security-exceptions|security-policy|security-tools|\.checkov\.yaml|\.github\/workflows\//i;
 /**
  * Classify the change type based on file paths to apply appropriate gate tier.
  */
@@ -99,8 +170,14 @@ function classifyChangeType(files) {
         return "general";
     const allMatch = (pattern) => files.every((f) => pattern.test(f));
     const anyMatch = (pattern) => files.some((f) => pattern.test(f));
-    if (allMatch(/\.(md|txt|rst)$|\/docs\/|README/i))
+    if (allMatch(/\.(md|txt|rst)$|\/docs\/|README/i)) {
+        // Fix 8: override docs tier when security config files are in the changeset
+        if (anyMatch(SECURITY_CONFIG_RE)) {
+            console.warn("[policy] Docs-tier override: security configuration file detected in changed files");
+            return "config";
+        }
         return "docs";
+    }
     if (anyMatch(/\/payment|\/stripe|\/checkout|\/billing|\/invoice/i))
         return "payment";
     if (anyMatch(/\/auth|\/login|\/session|\/token|\/jwt|\/oauth|\/permission/i))
@@ -123,6 +200,160 @@ function assignRiskSlas(findings) {
     const now = new Date().toISOString();
     return findings.map((f) => ({ ...f, sla: SLA_MAP[f.severity], slaAssignedAt: now }));
 }
+// Names aligned with check array order in runAllChecks — used for GATE_CHECK_CRASHED findings
+const CHECK_NAMES = [
+    "required-artifacts",
+    "secrets",
+    "dependencies",
+    "scanner-readiness",
+    "evidence-coverage",
+    "web-nextjs",
+    "api",
+    "infra",
+    "mobile-ios",
+    "mobile-android",
+    "ai",
+    "graphql",
+    "kubernetes",
+    "database",
+    "crypto",
+    "dlp",
+    "sbom",
+    "playbook",
+    "ai-redteam",
+    "runtime",
+    "ci-pipeline",
+    "nuclei",
+    "injection-deep",
+    "auth-deep",
+    "supply-chain-deep",
+    "business-logic",
+    "scanners-run"
+];
+/** Run every applicable security check in parallel and collect findings. */
+async function runAllChecks(opts) {
+    const { policy, changedFiles, targets, surfaces, scannerReadiness, evidenceCoverage } = opts;
+    const stagingUrl = process.env["SECURITY_STAGING_URL"];
+    const isApiOrWeb = surfaces.api || surfaces.web;
+    const settled = await Promise.allSettled([
+        checkRequiredArtifacts({ policy, changedFiles }),
+        checkSecrets({ changedFiles }),
+        checkDependencies({ changedFiles }),
+        Promise.resolve(scannerReadiness.findings),
+        Promise.resolve(evidenceCoverage.findings),
+        surfaces.web ? checkWebNextjs({ changedFiles }) : Promise.resolve([]),
+        surfaces.api ? checkApi({ changedFiles }) : Promise.resolve([]),
+        surfaces.infra ? checkInfra({ changedFiles }) : Promise.resolve([]),
+        surfaces.mobileIos ? checkMobileIos({ changedFiles }) : Promise.resolve([]),
+        surfaces.mobileAndroid ? checkMobileAndroid({ changedFiles }) : Promise.resolve([]),
+        surfaces.ai ? checkAi({ changedFiles }) : Promise.resolve([]),
+        checkGraphQL({ changedFiles }),
+        checkKubernetes({ changedFiles }),
+        checkDatabase({ changedFiles }),
+        checkCrypto({ changedFiles }),
+        checkDlp({ changedFiles }),
+        runSbomChecks({ changedFiles, targets }),
+        runPlaybookChecks({ changedFiles, surfaces }),
+        surfaces.ai ? runAiRedteamChecks({ changedFiles }) : Promise.resolve([]),
+        stagingUrl ? runRuntimeChecks({ targets, changedFiles }) : Promise.resolve([]),
+        runCiPipelineChecks({ changedFiles }),
+        stagingUrl ? runNucleiChecks({ changedFiles }) : Promise.resolve([]),
+        isApiOrWeb ? checkInjectionDeep({ changedFiles }) : Promise.resolve([]),
+        isApiOrWeb ? checkAuthDeep({ changedFiles }) : Promise.resolve([]),
+        checkSupplyChainDeep({ changedFiles }),
+        checkBusinessLogic({ changedFiles }),
+        runDockerChecks({ changedFiles }),
+        runScanners({ surfaces, changedFiles })
+    ]);
+    const findings = [];
+    // Fix 5: crashed check modules generate HIGH findings instead of silent console.warn
+    for (let i = 0; i < settled.length; i++) {
+        const r = settled[i];
+        if (r.status === "fulfilled") {
+            findings.push(...r.value);
+        }
+        else {
+            const checkName = CHECK_NAMES[i] ?? `check-${i}`;
+            // CWE-200: sanitize error message before embedding in gate findings —
+            // raw Error.message can contain absolute filesystem paths that reveal
+            // internal directory structure to callers of the gate result.
+            const rawErrorMessage = r.reason instanceof Error ? r.reason.message : String(r.reason);
+            const errorMessage = sanitizeErrorMessage(rawErrorMessage);
+            findings.push({
+                id: "GATE_CHECK_CRASHED",
+                title: "Security check module crashed — coverage gap",
+                severity: "HIGH",
+                evidence: [`Check module: ${checkName}`, `Error: ${errorMessage}`],
+                requiredActions: [
+                    `The ${checkName} check module threw an unhandled error: ${errorMessage}. Findings from this module are unavailable, which may constitute a false negative.`
+                ]
+            });
+        }
+    }
+    return findings;
+}
+/** Build tooling-based control coverage from the catalog. */
+function buildToolingCoverage(catalog, surfaces, scannerReadiness) {
+    return catalog.controls
+        .filter((c) => c.automation === "tooling" && controlApplies(c, surfaces))
+        .map((c) => {
+        const required = c.required_scanners ?? [];
+        const missing = required.filter((id) => !scannerReadiness.configured.includes(id) || scannerReadiness.missing.includes(id));
+        return {
+            id: c.id,
+            description: c.description,
+            automation: c.automation,
+            frameworks: c.frameworks,
+            status: missing.length > 0 ? "missing" : "satisfied",
+            details: missing.length > 0 ? missing : required
+        };
+    });
+}
+/** Compute coverage and confidence scores from control coverage + scanner readiness. */
+function computeConfidence(controlCoverage, scannerReadiness) {
+    const relevant = controlCoverage.filter((c) => c.status !== "not_applicable");
+    const satisfied = relevant.filter((c) => c.status === "satisfied").length;
+    const riskAccepted = relevant.filter((c) => c.status === "risk_accepted").length;
+    const missing = relevant.filter((c) => c.status === "missing").length;
+    const automatedCoverage = relevant.length === 0
+        ? 100
+        : Math.round((satisfied + riskAccepted * 0.5) / relevant.length * 100);
+    const { configured, missing: scanMissing } = scannerReadiness;
+    const scannerScore = configured.length === 0
+        ? 0
+        : Math.round((configured.length - scanMissing.length) / configured.length * 100);
+    const confidenceScore = Math.max(0, Math.min(100, Math.round(automatedCoverage * 0.7 + scannerScore * 0.3)));
+    return { automatedCoverage, scannerScore, confidenceScore, missingControls: missing, riskAcceptedControls: riskAccepted };
+}
+/** Inject regression findings when a baseline exists and controls have regressed. */
+function applyBaselineDiff(findings, controlCoverage, previousBaseline, changedFiles, surfaces, confidence) {
+    const snapshot = {
+        findings,
+        controlCoverage,
+        confidence: { automatedCoverage: confidence.automatedCoverage, score: 0, missingControls: 0, scannerReadiness: 0, summary: "" },
+        status: "PASS",
+        policyVersion: "",
+        evaluatedAt: "",
+        scope: { changedFiles, surfaces }
+    };
+    const diff = compareBaseline(snapshot, previousBaseline);
+    if (diff.regressions.length === 0)
+        return { findings, diff };
+    const regressionFindings = diff.regressions.map((r) => ({
+        id: "BASELINE_REGRESSION",
+        title: `Security regression: control "${r.controlId}" was previously satisfied but is now missing`,
+        severity: "HIGH",
+        evidence: [`Control ${r.controlId}: "satisfied" → "missing" since last gate run`],
+        requiredActions: [
+            `Restore control "${r.controlId}" to a satisfied state.`,
+            "Investigate what change caused this regression and revert or remediate."
+        ]
+    }));
+    return { findings: [...regressionFindings, ...findings], diff };
+}
+// ---------------------------------------------------------------------------
+// Main gate entry point
+// ---------------------------------------------------------------------------
 export async function runPrGate(opts) {
     const [policy, commitHash, previousBaseline] = await Promise.all([
         loadPolicy(opts.policyPath),
@@ -132,133 +363,54 @@ export async function runPrGate(opts) {
     const mode = opts.mode ?? "recent_changes";
     const targets = normalizeTargets(opts.targets);
     const changedFiles = await resolveScopedFiles({
-        mode,
-        targets,
+        mode, targets,
         baseRef: opts.baseRef ?? "origin/main",
         headRef: opts.headRef ?? "HEAD"
     });
-    // Classify the change type to apply appropriate gate tier
     const changeType = classifyChangeType(changedFiles);
     const surfaces = detectSurfaces(changedFiles);
-    const catalog = await loadControlCatalog();
-    const scannerReadiness = await checkScannerReadiness({ surfaces });
-    const evidenceCoverage = await evaluateEvidenceCoverage({ policy, surfaces });
-    let rawFindings;
-    // "docs" tier: only run secrets check to avoid unnecessary overhead
-    if (changeType === "docs") {
-        rawFindings = await checkSecrets({ changedFiles });
-    }
-    else {
-        // Run all independent checks in parallel
-        const checkResults = await Promise.allSettled([
-            checkRequiredArtifacts({ policy, changedFiles }),
-            checkSecrets({ changedFiles }),
-            checkDependencies({ changedFiles }),
-            Promise.resolve(scannerReadiness.findings),
-            Promise.resolve(evidenceCoverage.findings),
-            surfaces.web ? checkWebNextjs({ changedFiles }) : Promise.resolve([]),
-            surfaces.api ? checkApi({ changedFiles }) : Promise.resolve([]),
-            surfaces.infra ? checkInfra({ changedFiles }) : Promise.resolve([]),
-            surfaces.mobileIos ? checkMobileIos({ changedFiles }) : Promise.resolve([]),
-            surfaces.mobileAndroid ? checkMobileAndroid({ changedFiles }) : Promise.resolve([]),
-            surfaces.ai ? checkAi({ changedFiles }) : Promise.resolve([]),
-            checkGraphQL({ changedFiles }),
-            checkKubernetes({ changedFiles }),
-            checkDatabase({ changedFiles }),
-            checkCrypto({ changedFiles }),
-            checkDlp({ changedFiles }),
-            runSbomChecks({ changedFiles, targets }),
-            runPlaybookChecks({ changedFiles, surfaces }),
-            surfaces.ai ? runAiRedteamChecks({ changedFiles }) : Promise.resolve([]),
-            process.env["SECURITY_STAGING_URL"] ? runRuntimeChecks({ targets, changedFiles }) : Promise.resolve([]),
-            runCiPipelineChecks({ changedFiles }),
-            process.env["SECURITY_STAGING_URL"] ? runNucleiChecks({ changedFiles }) : Promise.resolve([]),
-            (surfaces.api || surfaces.web) ? checkInjectionDeep({ changedFiles }) : Promise.resolve([]),
-            (surfaces.api || surfaces.web) ? checkAuthDeep({ changedFiles }) : Promise.resolve([])
-        ]);
-        rawFindings = [];
-        for (const result of checkResults) {
-            if (result.status === "fulfilled") {
-                rawFindings.push(...result.value);
-            }
-            else {
-                console.warn("[policy] Check failed:", result.reason);
-            }
-        }
-    }
-    rawFindings = assignRiskSlas(rawFindings);
-    const toolingCoverage = catalog.controls
-        .filter((control) => control.automation === "tooling" && controlApplies(control, surfaces))
-        .map((control) => {
-        const required = control.required_scanners ?? [];
-        const missing = required.filter((scannerId) => !scannerReadiness.configured.includes(scannerId) || scannerReadiness.missing.includes(scannerId));
-        return {
-            id: control.id,
-            description: control.description,
-            automation: control.automation,
-            frameworks: control.frameworks,
-            status: missing.length > 0 ? "missing" : "satisfied",
-            details: missing.length > 0 ? missing : required
-        };
-    });
+    const [catalog, scannerReadiness, evidenceCoverage] = await Promise.all([
+        loadControlCatalog(),
+        checkScannerReadiness({ surfaces }),
+        evaluateEvidenceCoverage({ policy, surfaces })
+    ]);
+    // Collect raw findings — docs tier runs secrets-only to reduce overhead
+    const rawChecked = changeType === "docs"
+        ? await checkSecrets({ changedFiles })
+        : await runAllChecks({ policy, changedFiles, targets, surfaces, scannerReadiness, evidenceCoverage });
+    const rawFindings = assignRiskSlas(rawChecked);
+    // Build control coverage
+    const toolingCoverage = buildToolingCoverage(catalog, surfaces, scannerReadiness);
     const controlCoverage = [
-        ...evidenceCoverage.controls.filter((control) => control.automation === "evidence"),
+        ...evidenceCoverage.controls.filter((c) => c.automation === "evidence"),
         ...toolingCoverage
     ];
-    const exceptionResult = await applySecurityExceptions(rawFindings);
+    // Apply exceptions — Fix 7: pass require_ticket from policy config
+    const requireTicket = policy.exceptions?.require_ticket ?? false;
+    const exceptionResult = await applySecurityExceptions(rawFindings, { requireTicket });
     const controlCoverageWithExceptions = controlCoverage.map((control) => {
-        if (exceptionResult.activeControlExceptionIds.includes(control.id) && control.status === "missing") {
-            return {
-                ...control,
-                status: "risk_accepted",
-                details: [...control.details, "Covered by an active approved control exception."]
-            };
+        const excepted = exceptionResult.activeControlExceptionIds.includes(control.id);
+        if (excepted && control.status === "missing") {
+            return { ...control, status: "risk_accepted", details: [...control.details, "Covered by an active approved control exception."] };
         }
         return control;
     });
-    const findings = [...exceptionResult.findings, ...exceptionResult.exceptionFindings];
-    // Apply risk-based adaptive gating tier overrides
-    let effectiveFindings = findings;
-    if (changeType === "payment") {
-        // Payment changes: treat as prod-equivalent — block on all HIGH+
-        effectiveFindings = findings;
-    }
-    else if (changeType === "auth") {
-        // Auth changes: always block on HIGH+ even in dev
-        effectiveFindings = findings;
-    }
-    const relevantControls = controlCoverageWithExceptions.filter((control) => control.status !== "not_applicable");
-    const satisfiedControls = relevantControls.filter((control) => control.status === "satisfied").length;
-    const riskAcceptedControls = relevantControls.filter((control) => control.status === "risk_accepted").length;
-    const automatedCoverage = relevantControls.length === 0
-        ? 100
-        : Math.round((((satisfiedControls) + (riskAcceptedControls * 0.5)) / relevantControls.length) * 100);
-    const scannerScore = scannerReadiness.configured.length === 0
-        ? 0
-        : Math.round(((scannerReadiness.configured.length - scannerReadiness.missing.length) / scannerReadiness.configured.length) * 100);
-    const confidenceScore = Math.max(0, Math.min(100, Math.round((automatedCoverage * 0.7) + (scannerScore * 0.3))));
-    const missingControls = relevantControls.filter((control) => control.status === "missing").length;
-    // Baseline regression detection: compare current run against previous baseline
+    // Include exception warnings (e.g. CI_EXCEPTIONS_IN_LOCAL_SCAN, EXCEPTIONS_FILE_UNSIGNED) in findings
+    const baseFindings = [...exceptionResult.findings, ...exceptionResult.exceptionFindings, ...exceptionResult.warnings];
+    // Confidence metrics
+    const cm = computeConfidence(controlCoverageWithExceptions, scannerReadiness);
+    // Baseline regression injection
+    let effectiveFindings = baseFindings;
     let baselineDiff;
     if (previousBaseline) {
-        baselineDiff = compareBaseline({ findings: effectiveFindings, controlCoverage: controlCoverageWithExceptions, confidence: { automatedCoverage, score: 0, missingControls: 0, scannerReadiness: 0, summary: "" }, status: "PASS", policyVersion: "", evaluatedAt: "", scope: { changedFiles, surfaces } }, previousBaseline);
-        if (baselineDiff.regressions.length > 0) {
-            const regressionFindings = baselineDiff.regressions.map((r) => ({
-                id: "BASELINE_REGRESSION",
-                title: `Security regression: control "${r.controlId}" was previously satisfied but is now missing`,
-                severity: "HIGH",
-                evidence: [`Control ${r.controlId}: "satisfied" → "missing" since last gate run`],
-                requiredActions: [
-                    `Restore control "${r.controlId}" to a satisfied state.`,
-                    "Investigate what change caused this regression and revert or remediate."
-                ]
-            }));
-            effectiveFindings = [...regressionFindings, ...effectiveFindings];
-        }
+        const br = applyBaselineDiff(baseFindings, controlCoverageWithExceptions, previousBaseline, changedFiles, surfaces, cm);
+        effectiveFindings = br.findings;
+        baselineDiff = br.diff;
     }
-    const status = effectiveFindings.some((f) => f.severity === "HIGH" || f.severity === "CRITICAL")
-        ? "FAIL"
-        : "PASS";
+    // Fix 6: read severity_block from policy instead of hardcoding HIGH/CRITICAL
+    const blockedSeverities = policy.severity_block ?? ["HIGH", "CRITICAL"];
+    const status = effectiveFindings.some((f) => blockedSeverities.includes(f.severity))
+        ? "FAIL" : "PASS";
     const result = {
         status,
         policyVersion: policy.version,
@@ -267,17 +419,14 @@ export async function runPrGate(opts) {
         findings: effectiveFindings,
         suppressedFindings: exceptionResult.suppressed,
         controlCoverage: controlCoverageWithExceptions,
-        scannerReadiness: {
-            configured: scannerReadiness.configured,
-            missing: scannerReadiness.missing
-        },
+        scannerReadiness: { configured: scannerReadiness.configured, missing: scannerReadiness.missing },
         confidence: {
-            score: confidenceScore,
-            automatedCoverage,
-            missingControls,
-            riskAcceptedControls,
-            scannerReadiness: scannerScore,
-            summary: `Automated coverage ${automatedCoverage}%, scanner readiness ${scannerScore}%, missing controls ${missingControls}, risk-accepted controls ${riskAcceptedControls}. Change type: ${changeType}.`
+            score: cm.confidenceScore,
+            automatedCoverage: cm.automatedCoverage,
+            missingControls: cm.missingControls,
+            riskAcceptedControls: cm.riskAcceptedControls,
+            scannerReadiness: cm.scannerScore,
+            summary: `Automated coverage ${cm.automatedCoverage}%, scanner readiness ${cm.scannerScore}%, missing controls ${cm.missingControls}, risk-accepted controls ${cm.riskAcceptedControls}. Change type: ${changeType}.`
         },
         baselineDiff
     };