dsh-standards 1.2.0 → 1.2.2

package/40-checker/src/remediation.mjs

@@ -53,8 +53,13 @@ function uniqueEvidence(...lists) {
  *
  * One entry is produced per (check.id, detail.item) pair with FAIL/WARN — or,
  * for a FAIL/WARN check with no live details, one entry keyed by check.clause.
- * Duplicate details are merged: severity takes the worst value, evidence is
- * unioned, and the specific reasons are joined for diagnostics.
+ * `gate` is the check's final result (PASS/WARN/FAIL) after report adjustments
+ * such as the ENTRY static-claim downgrade; `severity` follows that gate, so a
+ * FAIL detail under a check downgraded to WARN yields a WARN advice entry. The
+ * detail's own reason stays in `reason` for diagnostics.
+ *
+ * Duplicate details are merged: evidence is unioned, occurrences counted, and
+ * the specific reasons are joined for diagnostics.
  *
  * @param {object} report dsh-conformance/1 report
  * @param {object} rules flat key→rule map (also accepts a { rules } or { items } wrapper)
@@ -66,15 +71,15 @@ export function joinAdvice(report, rules, docsBase = DOCS_BASE) {
   const version = versionOf(rules)
   const merged = new Map()
 
-  const add = (check, key, severity, reason, evidence) => {
-    if (typeof key !== 'string' || key === '' || !LIVE.has(severity)) return false
+  const add = (check, key, gate, reason, evidence) => {
+    if (typeof key !== 'string' || key === '' || !LIVE.has(gate)) return false
     const id = `${check.id}|${key}`
     const current = merged.get(id)
     if (!current) {
       merged.set(id, {
         check,
         key,
-        severity,
+        gate,
         reasons: typeof reason === 'string' && reason !== '' ? [reason] : [],
         evidence: uniqueEvidence(evidence),
         occurrences: 1,
@@ -83,7 +88,6 @@ export function joinAdvice(report, rules, docsBase = DOCS_BASE) {
     }
     current.occurrences += 1
     if (typeof reason === 'string' && reason !== '' && !current.reasons.includes(reason)) current.reasons.push(reason)
-    if (SEVERITY_RANK[severity] > SEVERITY_RANK[current.severity]) current.severity = severity
     current.evidence = uniqueEvidence(current.evidence, evidence)
     return true
   }
@@ -92,7 +96,7 @@ export function joinAdvice(report, rules, docsBase = DOCS_BASE) {
     const liveDetails = (Array.isArray(check.details) ? check.details : [])
       .filter(detail => detail && LIVE.has(detail.result))
     let added = 0
-    for (const detail of liveDetails) if (add(check, detail.item, detail.result, detail.reason, detail.evidence)) added += 1
+    for (const detail of liveDetails) if (add(check, detail.item, check.result, detail.reason, detail.evidence)) added += 1
     // A runtime FAIL (DSC-04 / DSC-14) has no details; its clause is the only
     // joinable key. Only use the fallback when no joinable detail was produced,
     // so a specific detail always wins over the check-level summary.
@@ -106,7 +110,8 @@ export function joinAdvice(report, rules, docsBase = DOCS_BASE) {
     const rule = table[entry.key] ?? null
     const item = {
       key: entry.key,
-      severity: entry.severity,
+      gate: entry.gate,
+      severity: entry.gate,
       title: rule?.title ?? entry.key,
       why: rule?.why ?? null,
       fix: rule?.fix ?? null,
@@ -124,7 +129,7 @@ export function joinAdvice(report, rules, docsBase = DOCS_BASE) {
 
   // FAIL before WARN, then key/source for deterministic output.
   advice.sort((a, b) => (
-    (SEVERITY_RANK[b.severity] ?? 0) - (SEVERITY_RANK[a.severity] ?? 0)
+    (SEVERITY_RANK[b.gate] ?? 0) - (SEVERITY_RANK[a.gate] ?? 0)
     || a.key.localeCompare(b.key)
     || a.source.localeCompare(b.source)
   ))

package/40-checker/src/sandbox-run.mjs

@@ -0,0 +1,403 @@
+/**
+ * Sandbox execution for FLOW evidence collection.
+ *
+ * `flow collect --sandbox` runs the runtime probe (which executes
+ * `dsh plugin add` and boots the tree) behind a containment layer:
+ *
+ *   env      allowlist from `sandbox-env.mjs`; GH_TOKEN / NPM_TOKEN /
+ *            GITHUB_TOKEN are asserted absent, and any secret-shaped name is
+ *            reported rather than silently forwarded;
+ *   home     caller-supplied temporary HOME/DSH_HOME/TMPDIR (never the real
+ *            profile);
+ *   network  `unshare -n` when permitted, falling back to
+ *            `unshare -Urn` (user+network namespace); if neither works the run
+ *            continues degraded and records `unshare-missing`;
+ *   limits   `prlimit --nproc --as` when util-linux prlimit is available; the
+ *            probe reads `/proc/self/limits` so only limits that actually took
+ *            effect are recorded;
+ *   timeout  the child is spawned as its own process-group leader and the
+ *            whole group receives SIGKILL, so `dsh` grandchildren die too
+ *            (Windows: `taskkill /T /F`).
+ *
+ * This is containment, not a security boundary: no seccomp, no cgroup memory/
+ * pids accounting, no OCI image. Evidence is only allowed to call itself
+ * `sandbox` when every item above is effective; any missing item switches the
+ * producer to `sandbox-degraded`, which `level-audit` never reports as runtime.
+ */
+import fs from 'node:fs'
+import { spawn, spawnSync } from 'node:child_process'
+import { isSecretEnvName, sanitizedEnv } from './sandbox-env.mjs'
+
+export const SANDBOX_REPORT_SCHEMA = 'dsh-sandbox-report/1'
+export const SANDBOX_DEGRADED = Object.freeze({
+  unshare: 'unshare-missing',
+  prlimit: 'prlimit-missing',
+  env: 'env-token-present',
+  home: 'home-not-isolated',
+  treeKill: 'process-tree-kill-unavailable',
+  execution: 'sandbox-execution-failed',
+})
+
+/** Names that must never reach a child that may import plugin code. */
+export const CREDENTIAL_ENV_NAMES = Object.freeze(['GH_TOKEN', 'NPM_TOKEN', 'GITHUB_TOKEN'])
+
+/** Inherited or caller-supplied names that look like credentials. */
+export function credentialEnvOffenders(env = process.env, names = CREDENTIAL_ENV_NAMES) {
+  const offenders = new Set()
+  for (const name of names) {
+    if (env && Object.prototype.hasOwnProperty.call(env, name) && env[name] !== undefined && env[name] !== null) {
+      offenders.add(name)
+    }
+  }
+  for (const name of Object.keys(env ?? {})) {
+    if (isSecretEnvName(name)) offenders.add(name)
+  }
+  return [...offenders].sort()
+}
+
+/** Hard gate: refuse to boot a plugin when a credential survived scrubbing. */
+export function assertNoCredentialEnv(env = process.env, names = CREDENTIAL_ENV_NAMES) {
+  const offenders = credentialEnvOffenders(env, names)
+  if (offenders.length > 0) {
+    throw new Error(`sandbox env assertion failed: ${offenders.join(', ')} present in the child environment`)
+  }
+  return { policy: 'allowlist', checked: [...names], absent: true, offenders: [] }
+}
+
+/** Count tasks (processes + threads) owned by this uid, for a safe RLIMIT_NPROC. */
+export function userTaskCount(uid = typeof process.getuid === 'function' ? process.getuid() : null) {
+  if (process.platform !== 'linux' || uid === null) return 0
+  let tasks = 0
+  try {
+    for (const entry of fs.readdirSync('/proc')) {
+      if (!/^\d+$/.test(entry)) continue
+      try {
+        if (fs.statSync(`/proc/${entry}`).uid !== uid) continue
+        const status = fs.readFileSync(`/proc/${entry}/status`, 'utf8')
+        const match = /^Threads:\s+(\d+)$/m.exec(status)
+        tasks += match ? Number(match[1]) : 1
+      } catch { /* process vanished */ }
+    }
+  } catch { return 0 }
+  return tasks
+}
+
+export function defaultNproc() {
+  // RLIMIT_NPROC counts tasks, so a fixed small value (e.g. 64) breaks Node on
+  // a busy desktop. Keep headroom above the current task count.
+  return Math.max(1024, userTaskCount() + 512)
+}
+
+function probeFailure(error) {
+  if (!error) return null
+  return String(error.message ?? error).slice(0, 300)
+}
+
+/**
+ * Try a real network namespace. `unshare -n` needs CAP_SYS_ADMIN; in an
+ * unprivileged container/WSL that fails, so `unshare -Urn` (user namespace +
+ * network namespace) is the fallback. `true` is the probe target so no plugin
+ * code runs while deciding.
+ */
+export function probeNetworkIsolation({ platform = process.platform, unshare = 'unshare', timeoutMs = 5_000 } = {}) {
+  if (platform === 'win32') {
+    return {
+      isolated: false,
+      degraded: SANDBOX_DEGRADED.unshare,
+      reason: 'unshare is not available on win32',
+      attempts: [],
+    }
+  }
+  const attempts = []
+  for (const args of [['-n'], ['-Urn']]) {
+    const command = [unshare, ...args, 'true']
+    const result = spawnSync(unshare, [...args, 'true'], {
+      encoding: 'utf8', stdio: ['ignore', 'ignore', 'pipe'], timeout: timeoutMs, env: sanitizedEnv(),
+    })
+    const exitCode = Number.isInteger(result.status) ? result.status : null
+    const attempt = {
+      command,
+      exitCode,
+      signal: result.signal ?? null,
+      error: probeFailure(result.error),
+      stderr: String(result.stderr ?? '').trim().slice(0, 300) || null,
+    }
+    attempts.push(attempt)
+    if (!result.error && result.status === 0) {
+      return {
+        isolated: true,
+        mechanism: args[0] === '-n' ? 'unshare -n (network namespace)' : 'unshare -Urn (user+network namespace)',
+        bin: unshare,
+        args,
+        probe: attempt,
+        attempts,
+      }
+    }
+  }
+  return {
+    isolated: false,
+    degraded: SANDBOX_DEGRADED.unshare,
+    reason: 'unshare -n and unshare -Urn both failed; no network namespace',
+    attempts,
+  }
+}
+
+function readLimitsProbe() {
+  return [
+    "const t = require('fs').readFileSync('/proc/self/limits', 'utf8')",
+    "const pick = (label) => { const m = new RegExp('^' + label + '\\\\s+(\\\\d+)', 'm').exec(t); return m ? Number(m[1]) : null }",
+    "console.log(JSON.stringify({ nproc: pick('Max processes'), as: pick('Max address space') }))",
+  ].join(';')
+}
+
+/**
+ * Apply and verify `prlimit --nproc --as`. The probe prints the child's own
+ * `/proc/self/limits`, so `applied` lists effects, not intentions.
+ */
+export function probeLimits({
+  platform = process.platform,
+  prlimit = 'prlimit',
+  nproc = null,
+  asBytes = 4 * 1024 ** 3,
+  node = process.execPath,
+  timeoutMs = 15_000,
+} = {}) {
+  if (platform === 'win32') {
+    return { available: false, degraded: SANDBOX_DEGRADED.prlimit, reason: 'prlimit is a util-linux tool; win32 has no equivalent here', applied: [] }
+  }
+  const requestedNproc = Number.isFinite(nproc) && nproc > 0 ? Math.trunc(nproc) : defaultNproc()
+  const requestedAs = Number.isFinite(asBytes) && asBytes > 0 ? Math.trunc(asBytes) : 4 * 1024 ** 3
+  const command = [prlimit, `--nproc=${requestedNproc}`, `--as=${requestedAs}`, '--', node, '-e', readLimitsProbe()]
+  const result = spawnSync(prlimit, command.slice(1), {
+    encoding: 'utf8', timeout: timeoutMs, env: sanitizedEnv(),
+  })
+  const exitCode = Number.isInteger(result.status) ? result.status : null
+  let observed = null
+  try {
+    const line = String(result.stdout ?? '').trim().split(/\r?\n/).filter(Boolean).pop()
+    observed = line ? JSON.parse(line) : null
+  } catch { observed = null }
+  const applied = []
+  if (observed?.nproc === requestedNproc) applied.push('nproc')
+  if (observed?.as === requestedAs) applied.push('as')
+  const available = !result.error && exitCode === 0 && applied.length === 2
+  return {
+    available,
+    ...(available ? {} : { degraded: SANDBOX_DEGRADED.prlimit }),
+    bin: prlimit,
+    nproc: requestedNproc,
+    asBytes: requestedAs,
+    applied,
+    observed,
+    probe: {
+      command,
+      exitCode,
+      signal: result.signal ?? null,
+      error: probeFailure(result.error),
+      stderr: String(result.stderr ?? '').trim().slice(0, 300) || null,
+    },
+    ...(available ? {} : { reason: 'prlimit did not apply and verify nproc+as' }),
+  }
+}
+
+export function processTreeKillCapability(platform = process.platform) {
+  if (platform === 'win32') {
+    const probe = spawnSync('taskkill', ['/?'], { stdio: 'ignore', timeout: 5_000 })
+    const available = !probe.error
+    return {
+      available,
+      mechanism: available ? 'taskkill /T /F' : 'taskkill-missing',
+      ...(available ? {} : { degraded: SANDBOX_DEGRADED.treeKill, reason: 'taskkill is unavailable' }),
+    }
+  }
+  return { available: true, mechanism: 'process-group SIGKILL (detached child, kill(-pgid))' }
+}
+
+/**
+ * Build the containment report for one collection. Degraded reasons are
+ * deduplicated; `mode` is `sandbox` only when the list is empty.
+ */
+export function buildSandboxPlan({
+  platform = process.platform,
+  env = process.env,
+  unshare = 'unshare',
+  prlimit = 'prlimit',
+  nproc = null,
+  asBytes = 4 * 1024 ** 3,
+  homeIsolated = true,
+  force = {},
+} = {}) {
+  const degraded = []
+  const envOffenders = credentialEnvOffenders(env)
+  if (envOffenders.length > 0) degraded.push(SANDBOX_DEGRADED.env)
+  if (!homeIsolated) degraded.push(SANDBOX_DEGRADED.home)
+
+  const network = force.network
+    ? { isolated: false, degraded: SANDBOX_DEGRADED.unshare, reason: 'network isolation disabled by caller', attempts: [] }
+    : probeNetworkIsolation({ platform, unshare })
+  if (!network.isolated) degraded.push(network.degraded ?? SANDBOX_DEGRADED.unshare)
+
+  const limits = force.limits
+    ? { available: false, degraded: SANDBOX_DEGRADED.prlimit, reason: 'rlimits disabled by caller', applied: [] }
+    : probeLimits({ platform, prlimit, nproc, asBytes })
+  if (!limits.available) degraded.push(limits.degraded ?? SANDBOX_DEGRADED.prlimit)
+
+  const processTreeKill = processTreeKillCapability(platform)
+  if (!processTreeKill.available) degraded.push(processTreeKill.degraded ?? SANDBOX_DEGRADED.treeKill)
+
+  const unique = [...new Set(degraded)]
+  return {
+    schema: SANDBOX_REPORT_SCHEMA,
+    mode: unique.length === 0 ? 'sandbox' : 'sandbox-degraded',
+    platform,
+    env: {
+      policy: 'allowlist',
+      checked: [...CREDENTIAL_ENV_NAMES],
+      absent: envOffenders.length === 0,
+      offenders: envOffenders,
+    },
+    home: { isolated: homeIsolated, mode: 'temporary HOME/DSH_HOME/TMPDIR' },
+    network,
+    limits,
+    processTreeKill,
+    degraded: unique,
+    note: 'containment only: no seccomp, no cgroup memory/pids accounting, no OCI image; read access is not restricted',
+  }
+}
+
+/** Wrap `command args...` in the effective prlimit + unshare prefixes. */
+export function sandboxArgv(plan, command, args = []) {
+  let argv = [command, ...args]
+  if (plan?.limits?.available) {
+    argv = [plan.limits.bin, `--nproc=${plan.limits.nproc}`, `--as=${plan.limits.asBytes}`, '--', ...argv]
+  }
+  if (plan?.network?.isolated) {
+    argv = [plan.network.bin, ...plan.network.args, ...argv]
+  }
+  return argv
+}
+
+function groupAlive(pgid, platform) {
+  try {
+    process.kill(platform === 'win32' ? pgid : -pgid, 0)
+    return true
+  } catch (error) {
+    return error?.code === 'EPERM'
+  }
+}
+
+function waitForGroupExit(pgid, platform, timeoutMs) {
+  return new Promise((resolve) => {
+    const deadline = Date.now() + timeoutMs
+    const tick = () => {
+      if (!groupAlive(pgid, platform)) { resolve(true); return }
+      if (Date.now() >= deadline) { resolve(false); return }
+      setTimeout(tick, 50)
+    }
+    tick()
+  })
+}
+
+/** Terminate the child *and its whole process group* (never just the parent). */
+export function killProcessTree(pid, { platform = process.platform, signal = 'SIGKILL' } = {}) {
+  if (!pid) return { mechanism: 'none', signalled: false, pid: null }
+  if (platform === 'win32') {
+    const result = spawnSync('taskkill', ['/pid', String(pid), '/T', '/F'], { stdio: 'ignore', timeout: 10_000 })
+    return { mechanism: 'taskkill /pid <pid> /T /F', signalled: !result.error && result.status === 0, pid, exitCode: result.status ?? null }
+  }
+  let signalled = false
+  try { process.kill(-pid, signal); signalled = true } catch { /* group already gone */ }
+  try { process.kill(pid, signal); signalled = true } catch { /* parent already gone */ }
+  return { mechanism: `process-group ${signal}`, signalled, pid, pgid: pid }
+}
+
+/**
+ * Spawn and supervise one command. On timeout the process group is SIGKILLed
+ * and `treeKill.cleared` is verified before resolving.
+ */
+export function runInProcessTree({
+  command,
+  args = [],
+  cwd = process.cwd(),
+  env = sanitizedEnv(),
+  timeoutMs = 120_000,
+  platform = process.platform,
+  maxBufferBytes = 8 * 1024 * 1024,
+  killGraceMs = 2_000,
+} = {}) {
+  return new Promise((resolve) => {
+    const startedAt = new Date().toISOString()
+    const t0 = Date.now()
+    let child
+    try {
+      child = spawn(command, args, {
+        cwd,
+        env,
+        stdio: ['ignore', 'pipe', 'pipe'],
+        detached: platform !== 'win32',
+        windowsHide: true,
+      })
+    } catch (error) {
+      resolve({
+        command: [command, ...args], exitCode: null, signal: null, killed: false, timedOut: false,
+        stdout: '', stderr: `spawn error: ${error.message}`, startedAt, endedAt: new Date().toISOString(),
+        durationMs: Date.now() - t0, treeKill: null, spawnError: error.message,
+      })
+      return
+    }
+    let stdout = ''
+    let stderr = ''
+    let stdoutBytes = 0
+    let stderrBytes = 0
+    let timedOut = false
+    let treeKill = null
+    let settled = false
+    let timer = null
+    const append = (chunk, stream) => {
+      const text = String(chunk)
+      if (stream === 'stdout') {
+        if (stdoutBytes < maxBufferBytes) stdout += text.slice(0, maxBufferBytes - stdoutBytes)
+        stdoutBytes += Buffer.byteLength(text)
+      } else {
+        if (stderrBytes < maxBufferBytes) stderr += text.slice(0, maxBufferBytes - stderrBytes)
+        stderrBytes += Buffer.byteLength(text)
+      }
+    }
+    const finalize = async (code, signal) => {
+      if (settled) return
+      settled = true
+      clearTimeout(timer)
+      if (treeKill) {
+        treeKill.cleared = await waitForGroupExit(child.pid, platform, killGraceMs)
+      }
+      resolve({
+        command: [command, ...args],
+        exitCode: Number.isInteger(code) ? code : timedOut ? 124 : null,
+        signal: signal ?? null,
+        killed: Boolean(treeKill),
+        timedOut,
+        stdout,
+        stderr,
+        startedAt,
+        endedAt: new Date().toISOString(),
+        durationMs: Date.now() - t0,
+        treeKill,
+        stdoutTruncated: stdoutBytes > maxBufferBytes,
+        stderrTruncated: stderrBytes > maxBufferBytes,
+        pid: child.pid ?? null,
+      })
+    }
+    child.stdout?.on('data', (chunk) => append(chunk, 'stdout'))
+    child.stderr?.on('data', (chunk) => append(chunk, 'stderr'))
+    child.on('error', (error) => {
+      stderr += `\n[spawn error] ${error.message}`
+      void finalize(null, null)
+    })
+    child.on('close', (code, signal) => { void finalize(code, signal) })
+    timer = setTimeout(() => {
+      timedOut = true
+      treeKill = killProcessTree(child.pid, { platform })
+    }, timeoutMs)
+    timer.unref?.()
+  })
+}

package/CHANGELOG.md

@@ -1,9 +1,16 @@
-## 未发布
+## 1.2.2 — 2026-11-06
 
+- FLOW 沙箱：`flow collect --sandbox` 在 `unshare -Urn` + `prlimit` 下运行，记录 `sandbox{}`；env 白名单硬断言 token 不在子进程；进程组超时击杀；`producer.kind=sandbox` 仅当隔离项全部生效，否则 `sandbox-degraded` 且 audit 永不 runtime。测试 152 → 159。
+- 发布包：`npm test` 改为 `run-tests.mjs`，未随包分发的 test 目录不再导致安装后测试失败。
+
+## 1.2.1 — 2026-11-06
+
+- **V2 核验修复**：`level-audit` 不再把结构自洽的 self-attested/ci-attested `dsh-flow-evidence/2` 判成 FLOW `runtime`。只有 `claims.claimLevel=sandbox-attested` 或 `producer.kind=sandbox` 才允许 `runtime`；self/ci 的 `passed` 计数保留但 state 记 `not-run`，reason 为 `<claimLevel> evidence; runtime requires sandbox-attested`。`spec/flow-evidence.schema.json` 的 `claims`/`producer.kind` 补充了该判定说明。`advice[]` 新增 `gate`（该 check 的最终结果 PASS/WARN/FAIL），`severity` 跟随 `gate`：ENTRY static claim 把 DSC-02 降为 WARN 时，C-2.1 的 FAIL detail 仍保留在 `reason`，但 advice severity 为 WARN。测试 150 → 152。
 - **FLOW 证据链**：新增 `spec/flow-evidence.schema.json`（`dsh-flow-evidence/2`）与 `40-checker/src/flow-evidence.mjs`。`level-audit --flow-evidence` 只接受 v2；v1（`dsh-flow-journey/1`、`dsh-flow-runtime/1`）与裸 `{Jx:{status}}` 标 `deprecated`，不计 pass。每个 J 须有 `checks[]` 且全部 `exitCode === 0`、断言成立、至少一条非 `static` 观测检查才计 pass（`warn`/`blocked`/`na`/`static` 不计 8/8）。v2 的 `chain.evidenceHash` 由 audit 重算，改动一个字节即 `invalid`。
 - **collector**：新增 `40-checker/bin/dsh-flow-collect.mjs`（根入口 `bin/dsh-flow-collect.mjs`，并支持 `dsh-levels flow collect`）。只读副本 + 前后 `treeSha256` 一致、`npm pack --ignore-scripts` 的 integrity/tarballSha256、`git rev-parse` commit、临时 HOME/DSH_HOME、失败五要素提示（子检查/命令/exitCode/stderr 末 20 行/日志绝对路径 + 条款锚）；前置缺失记 `blocked` 且 exit 0，真失败 exit 1。
 - **安全**：新增 `40-checker/src/sandbox-env.mjs` 白名单 env。`src/cli.mjs` 的 runtime-child/bundle-smoke 子进程、`bundle-smoke.mjs`/`runtime-child.mjs` 进程内 boot、`m2-runner.mjs`、`journey-runtime.mjs`、`journey-config-observe.mjs`、`flow-sample-ci.mjs`、`host-farm.mjs`、`entry18-web.mjs` 不再把 `process.env` 透传给被检插件/宿主 boot。
 - 测试 137 → 149（新增 `40-checker/test/flow-evidence.test.mjs`：v1 不再 pass、v2 伪造 checks/exitCode 不 pass、篡改链路 invalid、blocked 不判 fail、collector 产物可被 audit 读取、失败五要素提示、env 白名单）。
+- 发布包不再包含 `40-checker/test`：该目录依赖仓库内 fixtures，装到用户环境后无法自测，`npm test` 会在 tarball 内失败。`npm test` 152/152。
 
 ## 1.2.0 — 2026-11-06