nsauditor-ai 0.1.92 → 0.1.94

package/README.md

@@ -17,8 +17,10 @@ NSAuditor AI is the open-source core of a privacy-first security intelligence pl
 
 ## What's New
 
-**Latest: CE 0.1.92 + Enterprise 0.16.1** (May 2026)
+**Latest: CE 0.1.94 + Enterprise 0.16.3** (May 2026)
 
+- ⚡ **`scan_cloud` runs cloud plugins in parallel** (CE 0.1.94 — paired EE 0.16.3) — the cloud-audit engine now runs the requested clouds' plugins **concurrently** (default up to 20 at once, 25s per-plugin timeout) so a full ~20-plugin AWS/GCP/Azure audit finishes within Claude Desktop's ~60s tool-call limit — previously the heaviest, most security-critical plugins (IAM, S3, EC2, Inspector/GuardDuty, decrypt-path) timed out at the 5s the budget forced under sequential execution. Tunable via `CLOUD_SCAN_CONCURRENCY` / `CLOUD_PLUGIN_TIMEOUT_MS`; the network `scan_host` path is unchanged; the anti-false-clean reporting is preserved. Plugin count UNCHANGED at 28; all six matrices UNCHANGED.
+- ☁️ **MCP `scan_cloud` tool: audit cloud accounts directly** (CE 0.1.93 — paired EE 0.16.2) — *(Enterprise)* a dedicated MCP tool so you can say *"Audit my AWS account"* or *"Audit my AWS and Azure accounts"* in Claude Desktop / Claude Code, with **no network host** — the server scopes the run to only the requested clouds' EE plugins. The MCP analog of the CLI `--host aws --plugins all` scoping. Enterprise-gated (`enterpriseMCP`) with plugin-layer defense-in-depth, and **anti-false-clean reporting** — a cloud is reported "audited" only if a plugin actually ran; a missing-credential / skipped cloud is surfaced as an explicit note + `audited:false` (R-HIGH caught + folded by the `audit-cloud-plugin-false-negatives` review). Plugin count UNCHANGED at 28; all six matrices UNCHANGED.
 - 🔌 **MCP `NSA_ENV_FILE`: per-environment `.env` for the MCP server** (CE 0.1.92 — paired EE 0.16.1) — the MCP analog of 0.16.0's CLI `--env`. Point the MCP server at a specific account/cloud by setting **`NSA_ENV_FILE`** to a dotenv path in your Claude Desktop / Claude Code config instead of inlining every credential; the server loads that environment's cloud credentials + `CLOUD_PROVIDER` at startup. Loaded **after** the MCP auth gate + license (scan-target vars only; the auth key + license are ignored if present in the file), **fail-fast** on a missing / INI / set-but-empty path, and treated as the **authoritative scan target** — leftover ambient provider credentials the file doesn't set are cleared, closing a false-clean (a partial file could otherwise silently scan a leftover account) caught + folded by the `audit-cloud-plugin-false-negatives` review. Plugin count UNCHANGED at 28; all six matrices UNCHANGED.
 - 🎯 **Per-account scanning: `--env` / `--aws-profile` + sentinel-host plugin scoping** (CE 0.1.91 — paired EE 0.16.0) — audit many cloud accounts one at a time without shell-export juggling. **`--env <path>`** loads a per-scan dotenv credentials file (override-on; fail-fast on a missing file; an INI/`~/.aws/credentials` file is detected and redirected to `--aws-profile`). **`--aws-profile <name>`** uses a named profile from the OS-default `~/.aws/credentials` (clears stale explicit keys, sets `AWS_SDK_LOAD_CONFIG=1`, implies `CLOUD_PROVIDER=aws`). On a cloud-sentinel host, **`--host aws|gcp|azure` + `--plugins all` auto-scopes** to only that cloud's plugins (other clouds + non-cloud plugins are skipped and logged); explicit `--plugins` lists are unaffected. A host↔`CLOUD_PROVIDER` conflict fails fast (no silent empty "clean" report), and a zero-match sentinel scope warns loudly. EE 0.16.0 adds a declarative `cloudProvider` field to all 27 cloud plugins. Plugin count UNCHANGED at 28; all six matrices UNCHANGED.
 - 🛡️ **Cross-cloud scope hotfix** (CE 0.1.90 — paired EE 0.15.9) — EE 0.15.9 moves the AWS-plugin `CLOUD_PROVIDER` gate from `preflight()` to `run()`: the 0.15.8 gate was placed where the scan orchestrator never calls it, so the cross-cloud bleed persisted; it's now on the load-bearing `run()` path (a `CLOUD_PROVIDER=gcp|azure` scan with AWS creds present no longer bleeds AWS resources into the GCP/Azure packs), validated via a run()-path test + a real-creds local proof. CE is a paired no-op bump. Plugin count UNCHANGED at 28; all six matrices UNCHANGED.
@@ -413,11 +415,17 @@ npx nsauditor-ai-mcp
 
 | Tool | Purpose |
 |---|---|
+| `scan_cloud` | Audit one or more cloud accounts (AWS / GCP / Azure) using server-configured credentials; no network host. "Audit my AWS account" / "Audit my AWS and Azure accounts". |
 | `start_assessment` | Multi-host orchestrated assessment workflow |
 | `prioritize_risks` | Cross-host risk prioritization |
 | `compliance_check` | Compliance mapping with gap analysis |
 | `export_report` | Generate formatted compliance report |
 
+> `scan_cloud` runs the requested clouds' plugins **concurrently** (default up to 20 at once, 25s per-plugin
+> timeout) so a full multi-service cloud audit completes within Claude Desktop's ~60s tool-call limit. Tune with
+> `CLOUD_SCAN_CONCURRENCY` (default 20) and `CLOUD_PLUGIN_TIMEOUT_MS` (default 25000) in the server env. The
+> network `PLUGIN_TIMEOUT_MS` still governs `scan_host` / network scans.
+
 Security: SSRF protection on all host inputs (blocks RFC 1918, loopback, fc00::/7, cloud metadata), port validation (1–65535), CPE format enforcement, dependency injection for test isolation. **Server-startup authentication is required** — see next section.
 
 ### Authentication (required)
@@ -501,6 +509,8 @@ The exact `NSA_MCP_AUTH_KEY` value to paste is printed by `nsauditor-ai mcp inst
 - `NSA_MCP_AUTH_KEY` — **required** (see Authentication section above)
 - `NSA_ALLOW_ALL_HOSTS=1` — required to scan private/RFC 1918 addresses (e.g., `192.168.x.x`)
 - `PLUGIN_TIMEOUT_MS=5000` — reduces per-plugin timeout to 5s so the full scan completes within Claude Desktop's 60s MCP limit
+- `CLOUD_SCAN_CONCURRENCY` — max cloud plugins run at once by `scan_cloud` (default 20).
+- `CLOUD_PLUGIN_TIMEOUT_MS` — per-plugin timeout for `scan_cloud` (default 25000; independent of the network `PLUGIN_TIMEOUT_MS`).
 - `AI_PROVIDER` and API key — optional, enables AI-powered analysis of scan results
 
 #### `NSA_ENV_FILE` — point the MCP server at an environment file

package/mcp_server.mjs

@@ -54,6 +54,12 @@ export function _requireProCapability(toolName) {
   return requireProCapability(toolName);
 }
 
+/** @internal Test-only. Returns the Enterprise-gate denial object (or null if allowed). */
+export function _requireEnterpriseCapability(toolName) {
+  if (process.env.NODE_ENV === 'production') throw new Error('_requireEnterpriseCapability is test-only and disabled in production');
+  return requireEnterpriseCapability(toolName);
+}
+
 function requireProCapability(toolName) {
   if (_capabilities.proMCP) return null; // Pro/Enterprise: allow
   return {
@@ -65,6 +71,17 @@ function requireProCapability(toolName) {
   };
 }
 
+function requireEnterpriseCapability(toolName) {
+  if (_capabilities.enterpriseMCP) return null; // Enterprise: allow
+  return {
+    content: [{
+      type: 'text',
+      text: `🔒 **${toolName}** (cloud account auditing) requires an Enterprise license.\n\nView Enterprise pricing at https://www.nsauditor.com/ai/pricing/\n\n**CE tools available:** scan_host, list_plugins`,
+    }],
+    isError: true,
+  };
+}
+
 // ---------------------------------------------------------------------------
 // Lazy singletons — initialised on first use, overridable for tests
 // ---------------------------------------------------------------------------
@@ -176,6 +193,22 @@ const TOOLS = [
       required: ['host'],
     },
   },
+  {
+    name: 'scan_cloud',
+    description:
+      'Audit one or more cloud accounts (AWS / GCP / Azure) for security & compliance posture using the credentials configured in the server environment. No network host required. Requires an Enterprise license. Use for "audit my AWS account" / "audit my AWS and Azure accounts".',
+    inputSchema: {
+      type: 'object',
+      properties: {
+        providers: {
+          type: 'array',
+          items: { type: 'string', enum: ['aws', 'gcp', 'azure'] },
+          description: 'Which cloud(s) to audit. Omit to audit all clouds the server is configured for.',
+        },
+      },
+      required: [],
+    },
+  },
   {
     name: 'probe_service',
     description:
@@ -313,6 +346,80 @@ export async function handleScanHost(args) {
   };
 }
 
+const VALID_PROVIDERS = ['aws', 'gcp', 'azure'];
+
+export async function handleScanCloud(args) {
+  // Validate providers; default → all three.
+  let providers = VALID_PROVIDERS.slice();
+  if (args && args.providers != null) {
+    if (!Array.isArray(args.providers)) {
+      throw new Error('providers must be an array of "aws" | "gcp" | "azure"');
+    }
+    const requested = args.providers.map((p) => String(p).trim().toLowerCase());
+    for (const p of requested) {
+      if (!VALID_PROVIDERS.includes(p)) {
+        throw new Error(`unknown provider '${p}' (valid: ${VALID_PROVIDERS.join(', ')})`);
+      }
+    }
+    if (requested.length > 0) providers = requested;
+  }
+
+  const pm = await getPluginManager();
+
+  // Save/set/restore CLOUD_PROVIDER so the per-plugin .includes() gates pass and
+  // the cross-cloud bleed gate is satisfied — restored in finally so the tool
+  // never leaves the long-lived server's env mutated for the next call.
+  const savedProvider = process.env.CLOUD_PROVIDER;
+  let output;
+  try {
+    process.env.CLOUD_PROVIDER = providers.join(',');
+    output = await pm.runCloud(providers);
+  } finally {
+    if (savedProvider === undefined) delete process.env.CLOUD_PROVIDER;
+    else process.env.CLOUD_PROVIDER = savedProvider;
+  }
+
+  // Render a Markdown summary (best-effort, same as scan_host).
+  let markdown = null;
+  try {
+    if (output.conclusion) {
+      markdown = buildMarkdownReport({ host: output.host, conclusion: output.conclusion, toolVersion: TOOL_VERSION });
+    }
+  } catch { /* swallow — markdown is best-effort */ }
+
+  // Anti-false-clean: a requested cloud is "audited" ONLY if >=1 of its plugins
+  // actually completed (manifest status 'ran'). Surface every NOT-effectively-
+  // audited provider with a specific reason — never a silent empty "clean".
+  const providerStatus = output.providerStatus || {};
+  const auditedProviders = output.auditedProviders || [];
+  const notes = [];
+  for (const p of providers) {
+    const s = providerStatus[p] || { available: 0, ran: 0, skipped: 0, errored: 0 };
+    if (s.ran > 0) continue; // effectively audited (clean or not)
+    if (s.available === 0) {
+      notes.push(`${p}: no cloud plugins available — Enterprise EE plugins not installed (an empty result is NOT a clean pass)`);
+    } else if (s.errored > 0) {
+      notes.push(`${p}: ${s.errored} plugin(s) ran but errored (e.g. credentials not configured) — NOT audited (an empty result is NOT a clean pass)`);
+    } else {
+      notes.push(`${p}: ${s.skipped} plugin(s) present but skipped (requirements/capability not met) — NOT audited`);
+    }
+  }
+
+  // Honest count: completed audits, NOT error/skip envelopes.
+  const pluginsRan = (output.manifest || []).filter((m) => m.status === 'ran').length;
+
+  return {
+    providers,
+    audited: auditedProviders.length > 0,
+    auditedProviders,
+    conclusion: output.conclusion ?? null,
+    manifest: output.manifest ?? [],
+    pluginsRan,
+    markdown,
+    ...(notes.length ? { notes } : {}),
+  };
+}
+
 export async function handleProbeService(args) {
   if (!args?.host || typeof args.host !== 'string') {
     throw new Error('Missing required parameter: host');
@@ -371,6 +478,7 @@ export async function handleListPlugins() {
 /** Map tool name to handler. Exported for testing. */
 export const toolHandlers = {
   scan_host: handleScanHost,
+  scan_cloud: handleScanCloud,
   probe_service: handleProbeService,
   get_vulnerabilities: handleGetVulnerabilities,
   list_plugins: handleListPlugins,
@@ -429,6 +537,19 @@ export function createServer() {
       }
     }
 
+    // Gate the Enterprise cloud-audit tool at the MCP dispatch layer.
+    if (name === 'scan_cloud') {
+      const denied = requireEnterpriseCapability(name);
+      if (denied) {
+        return {
+          ...denied,
+          content: denied.content.map((c) =>
+            c.type === 'text' ? { ...c, text: appendCallSentinel(c.text, callId) } : c,
+          ),
+        };
+      }
+    }
+
     try {
       const result = await handler(args ?? {});
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nsauditor-ai",
-  "version": "0.1.92",
+  "version": "0.1.94",
   "description": "Modular AI-assisted network security audit platform — Community Edition",
   "type": "module",
   "private": false,

package/plugin_manager.mjs

@@ -20,7 +20,8 @@ import { pathToFileURL, fileURLToPath } from "url";
 import { discoverPlugins } from './utils/plugin_discovery.mjs';
 import { getTierFromEnv } from './utils/license.mjs';
 import { resolveCapabilities } from './utils/capabilities.mjs';
-import { scopeSelectionForHost } from './utils/sentinel_scope.mjs';
+import { scopeSelectionForHost, scopeSelectionForProviders } from './utils/sentinel_scope.mjs';
+import { mapLimit } from './utils/concurrency.mjs';
 
 const __filename = fileURLToPath(import.meta.url);
 
@@ -145,9 +146,15 @@ async function callPlugin(mod, host, ctx, priorOutputs = null, cliOpts = {}) {
     // Forward CLI-derived opts (ports, etc.) so plugins can honor flags like --ports.
     // CLI opts come last so they don't override critical orchestration fields like
     // `context` if the CLI ever accidentally collides on those names.
-    const pluginPromise = mod.run(host, port, { ...cliOpts, context: withBaseContext(ctx), ...extra });
-
-    const timeoutMs = PLUGIN_TIMEOUT_MS;
+    // Promise.resolve().then(...) so a plugin that throws SYNCHRONOUSLY (before its
+    // first await) becomes a rejected promise the race below catches, instead of
+    // propagating out of callPlugin and aborting the whole (sequential or parallel) batch.
+    const pluginPromise = Promise.resolve().then(() => mod.run(host, port, { ...cliOpts, context: withBaseContext(ctx), ...extra }));
+
+    // Honor a per-run timeout (cloud path) but clamp to a positive number; an
+    // undefined (network path) or non-positive value falls back to PLUGIN_TIMEOUT_MS.
+    const reqTimeout = Number(cliOpts && cliOpts.timeoutMs);
+    const timeoutMs = Number.isFinite(reqTimeout) && reqTimeout > 0 ? reqTimeout : PLUGIN_TIMEOUT_MS;
     let timer;
     const timeoutPromise = new Promise((_, reject) => {
       timer = setTimeout(() => reject(new Error(`Plugin "${mod.name}" timed out after ${timeoutMs}ms`)), timeoutMs);
@@ -852,6 +859,99 @@ export class PluginManager {
       ai_out_path: null,
     };
   }
+
+  /**
+   * Concurrent executor for cloud plugins. Mirrors _runOrchestrated's per-plugin
+   * logic (requirements + capability skip checks, callPlugin, manifest status)
+   * but runs with bounded parallelism and a per-run timeout — cloud plugins are
+   * independent (no sequential context chain), so each gets its OWN base ctx and
+   * there is no shared-mutation race. Returns { results, manifest } in plugin order.
+   */
+  async _runCloudPluginsParallel(selected, host, opts = {}) {
+    const concurrency = Number(process.env.CLOUD_SCAN_CONCURRENCY) || 20;
+    const rawTimeout = Number(process.env.CLOUD_PLUGIN_TIMEOUT_MS);
+    const timeoutMs = Number.isFinite(rawTimeout) && rawTimeout > 0 ? rawTimeout : 25000;
+    const toRun = selected.filter((p) => !isConcluder(p));
+
+    const entries = await mapLimit(toRun, concurrency, async (mod) => {
+      try {
+        const ctx = withBaseContext({ host, hostUp: false, tcpOpen: new Set(), udpOpen: new Set() });
+        if (!shouldRunPlugin(mod, ctx)) {
+          return { manifest: { id: String(mod.id || ''), name: mod.name || 'Plugin', status: 'skipped', reason: describeSkipReason(mod, ctx), duration_ms: 0 }, outputs: [] };
+        }
+        if (!this._hasCapabilities(mod, opts?.capabilities)) {
+          return { manifest: { id: String(mod.id || ''), name: mod.name || 'Plugin', status: 'skipped', reason: `missing capabilities: ${(mod.requiredCapabilities || []).join(',')}`, duration_ms: 0 }, outputs: [] };
+        }
+        const startMs = Date.now();
+        const wrappedRuns = await callPlugin(mod, host, ctx, [], { ...opts, timeoutMs });
+        const duration_ms = Date.now() - startMs;
+        let status = 'ran';
+        let reason = null;
+        for (const w of wrappedRuns) {
+          if (w.result?.timedOut) { status = 'timeout'; reason = w.result.error || `timed out after ${timeoutMs}ms`; }
+          else if (w.result?.error && status !== 'timeout') { status = 'error'; reason = w.result.error; }
+        }
+        return { manifest: { id: String(mod.id || ''), name: mod.name || 'Plugin', status, reason, duration_ms }, outputs: wrappedRuns };
+      } catch (err) {
+        return { manifest: { id: String(mod.id || ''), name: mod.name || 'Plugin', status: 'error', reason: String(err?.message || err), duration_ms: 0 }, outputs: [] };
+      }
+    });
+
+    return { results: entries.flatMap((e) => e.outputs), manifest: entries.map((e) => e.manifest) };
+  }
+
+  /**
+   * Cloud-account audit: scope the plugin run to the union of the given cloud
+   * providers (by each plugin's `cloudProvider` field), with no network host.
+   * Sibling of run() that scopes by provider-set instead of by sentinel host,
+   * then reuses the same orchestrate + conclude path. Returns the run()-shaped
+   * output. The cloud plugins ignore `host`; the synthetic label just identifies
+   * the report. An empty selection returns an empty result (surfaced as a note
+   * by the caller) rather than a silent clean.
+   *
+   * @param {string[]} providers  e.g. ['aws'] or ['aws','azure']
+   * @param {object} [opts]
+   */
+  async runCloud(providers, opts = {}) {
+    const reqProviders = (providers || []).map((p) => String(p).trim().toLowerCase());
+    const host = `cloud:${reqProviders.join('+') || 'none'}`;
+    const all = this.plugins.slice();
+    const { selected } = scopeSelectionForProviders(all, reqProviders);
+
+    // Seed per-provider accounting for EVERY requested provider, so a provider
+    // with zero plugins is visible (available:0), not just silently absent.
+    const providerStatus = {};
+    for (const p of reqProviders) providerStatus[p] = { available: 0, ran: 0, skipped: 0, errored: 0 };
+
+    if (selected.length === 0) {
+      // Parity with the sentinel-host path in run(): an empty scope is NOT a clean pass.
+      console.error(
+        `WARNING: scan_cloud scope [${reqProviders.join(', ') || '(none)'}] matched 0 cloud plugins — ` +
+        `NOTHING was audited (an empty result is NOT a clean pass).`,
+      );
+      return { host, results: [], conclusion: null, manifest: [], providerStatus, auditedProviders: [],
+               ai: null, ai_meta: null, ai_error: null, ai_out_path: null };
+    }
+
+    const orch = await this._runCloudPluginsParallel(selected, host, opts);
+    const conclusion = await this.runConcluder(orch.results);
+
+    // Per-provider effectiveness from the manifest (ids match the selected set).
+    const manifestById = new Map((orch.manifest || []).map((m) => [String(m.id), m]));
+    for (const p of selected) {
+      const prov = p.cloudProvider;
+      if (!providerStatus[prov]) providerStatus[prov] = { available: 0, ran: 0, skipped: 0, errored: 0 };
+      providerStatus[prov].available++;
+      const m = manifestById.get(String(p.id));
+      if (m && m.status === 'ran') providerStatus[prov].ran++;
+      else if (m && m.status === 'skipped') providerStatus[prov].skipped++;
+      else providerStatus[prov].errored++;
+    }
+    const auditedProviders = Object.keys(providerStatus).filter((p) => providerStatus[p].ran > 0);
+
+    return { host, results: orch.results, conclusion, manifest: orch.manifest, providerStatus, auditedProviders,
+             ai: null, ai_meta: null, ai_error: null, ai_out_path: null };
+  }
 }
 
 export default PluginManager;

package/utils/concurrency.mjs

@@ -0,0 +1,21 @@
+// utils/concurrency.mjs
+//
+// Minimal bounded-concurrency runner: run fn(item, index) over items with at
+// most `limit` in flight, returning results in input order. A thrown fn rejects
+// the whole call — callers that need per-item isolation should catch inside fn.
+
+export async function mapLimit(items, limit, fn) {
+  const list = Array.isArray(items) ? items : [];
+  const n = list.length;
+  const out = new Array(n);
+  const cap = Math.max(1, Math.min((limit | 0) || 1, n || 1));
+  let next = 0;
+  async function worker() {
+    while (next < n) {
+      const i = next++;
+      out[i] = await fn(list[i], i);
+    }
+  }
+  await Promise.all(Array.from({ length: Math.min(cap, n) }, () => worker()));
+  return out;
+}

package/utils/sentinel_scope.mjs

@@ -40,3 +40,24 @@ export function scopeSelectionForHost(selection, host, spec) {
   }
   return { selected, skipped, scoped: true, provider };
 }
+
+/**
+ * Multi-cloud generalization of scopeSelectionForHost: scope a resolved plugin
+ * selection to the union of the given providers (by each plugin's cloudProvider
+ * field). Used by pluginManager.runCloud() / the MCP scan_cloud tool. Network
+ * plugins (no cloudProvider) and non-requested clouds land in `skipped`.
+ *
+ * @param {Array<object>} selection  resolved plugin objects (each may have .cloudProvider)
+ * @param {string[]} providers       e.g. ['aws'] or ['aws','azure']
+ * @returns {{selected: object[], skipped: object[], providers: string[]}}
+ */
+export function scopeSelectionForProviders(selection, providers) {
+  const set = new Set((providers || []).map((p) => String(p).trim().toLowerCase()));
+  const selected = [];
+  const skipped = [];
+  for (const p of selection) {
+    if (p && p.cloudProvider && set.has(p.cloudProvider)) selected.push(p);
+    else skipped.push(p);
+  }
+  return { selected, skipped, providers: [...set] };
+}