dvalincode 0.16.1 → 0.18.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +203 -44
- package/README.zh-CN.md +171 -38
- package/THIRD_PARTY_NOTICES.md +98 -43
- package/dist/agent/loop.d.ts +1 -1
- package/dist/agent/loop.js +2 -1
- package/dist/agent/loop.js.map +1 -1
- package/dist/agent/runner.js +2 -2
- package/dist/agent/runner.js.map +1 -1
- package/dist/cli.js +6 -1
- package/dist/cli.js.map +1 -1
- package/dist/commands/chat.js +3 -2
- package/dist/commands/chat.js.map +1 -1
- package/dist/commands/data.js +2 -1
- package/dist/commands/data.js.map +1 -1
- package/dist/commands/dvalin.d.ts +9 -1
- package/dist/commands/dvalin.js +185 -44
- package/dist/commands/dvalin.js.map +1 -1
- package/dist/commands/evidence.js +17 -3
- package/dist/commands/evidence.js.map +1 -1
- package/dist/commands/mcpInstall.d.ts +2 -0
- package/dist/commands/mcpInstall.js +69 -0
- package/dist/commands/mcpInstall.js.map +1 -0
- package/dist/commands/mcpServe.js +3 -2
- package/dist/commands/mcpServe.js.map +1 -1
- package/dist/commands/policy.js +2 -1
- package/dist/commands/policy.js.map +1 -1
- package/dist/commands/report.js +6 -3
- package/dist/commands/report.js.map +1 -1
- package/dist/commands/runTool.d.ts +20 -0
- package/dist/commands/runTool.js +73 -13
- package/dist/commands/runTool.js.map +1 -1
- package/dist/commands/security.d.ts +47 -0
- package/dist/commands/security.js +415 -0
- package/dist/commands/security.js.map +1 -0
- package/dist/commands/tools.d.ts +11 -1
- package/dist/commands/tools.js +24 -3
- package/dist/commands/tools.js.map +1 -1
- package/dist/commands/update.js +2 -1
- package/dist/commands/update.js.map +1 -1
- package/dist/core/exitCodes.d.ts +38 -0
- package/dist/core/exitCodes.js +38 -0
- package/dist/core/exitCodes.js.map +1 -0
- package/dist/dvalinCli.d.ts +3 -0
- package/dist/dvalinCli.js +36 -0
- package/dist/dvalinCli.js.map +1 -0
- package/dist/dvalinIndex.d.ts +2 -0
- package/dist/dvalinIndex.js +9 -0
- package/dist/dvalinIndex.js.map +1 -0
- package/dist/evidence/pack.d.ts +8 -0
- package/dist/evidence/pack.js +16 -0
- package/dist/evidence/pack.js.map +1 -1
- package/dist/index.js +2 -1
- package/dist/index.js.map +1 -1
- package/dist/mcp/install.d.ts +48 -0
- package/dist/mcp/install.js +74 -0
- package/dist/mcp/install.js.map +1 -0
- package/dist/mcp/server.d.ts +12 -1
- package/dist/mcp/server.js +233 -14
- package/dist/mcp/server.js.map +1 -1
- package/dist/remediation/automate.d.ts +4 -1
- package/dist/remediation/automate.js +35 -18
- package/dist/remediation/automate.js.map +1 -1
- package/dist/remediation/diffScope.d.ts +29 -0
- package/dist/remediation/diffScope.js +107 -0
- package/dist/remediation/diffScope.js.map +1 -0
- package/dist/remediation/executor.d.ts +60 -0
- package/dist/remediation/executor.js +144 -0
- package/dist/remediation/executor.js.map +1 -0
- package/dist/remediation/localScan.d.ts +2 -1
- package/dist/remediation/localScan.js +73 -3
- package/dist/remediation/localScan.js.map +1 -1
- package/dist/remediation/sarif.d.ts +6 -0
- package/dist/remediation/sarif.js +36 -14
- package/dist/remediation/sarif.js.map +1 -1
- package/dist/remediation/scannerSuite.d.ts +21 -0
- package/dist/remediation/scannerSuite.js +65 -4
- package/dist/remediation/scannerSuite.js.map +1 -1
- package/dist/remediation/verify.d.ts +38 -0
- package/dist/remediation/verify.js +116 -0
- package/dist/remediation/verify.js.map +1 -0
- package/dist/security/baseline.d.ts +7 -0
- package/dist/security/baseline.js +26 -0
- package/dist/security/baseline.js.map +1 -0
- package/dist/security/config.d.ts +32 -0
- package/dist/security/config.js +131 -0
- package/dist/security/config.js.map +1 -0
- package/dist/security/contracts.d.ts +149 -0
- package/dist/security/contracts.js +231 -0
- package/dist/security/contracts.js.map +1 -0
- package/dist/security/fixRecord.d.ts +125 -0
- package/dist/security/fixRecord.js +169 -0
- package/dist/security/fixRecord.js.map +1 -0
- package/dist/security/fixRecordFile.d.ts +8 -0
- package/dist/security/fixRecordFile.js +37 -0
- package/dist/security/fixRecordFile.js.map +1 -0
- package/dist/security/fixRecordStore.d.ts +23 -0
- package/dist/security/fixRecordStore.js +74 -0
- package/dist/security/fixRecordStore.js.map +1 -0
- package/dist/security/render.d.ts +8 -0
- package/dist/security/render.js +20 -0
- package/dist/security/render.js.map +1 -0
- package/dist/security/suppressions.d.ts +12 -0
- package/dist/security/suppressions.js +60 -0
- package/dist/security/suppressions.js.map +1 -0
- package/dist/security/verifyRun.d.ts +21 -0
- package/dist/security/verifyRun.js +74 -0
- package/dist/security/verifyRun.js.map +1 -0
- package/dist/security/workflow.d.ts +98 -0
- package/dist/security/workflow.js +263 -0
- package/dist/security/workflow.js.map +1 -0
- package/dist/server/routes/remediation.d.ts +19 -0
- package/dist/server/routes/remediation.js +90 -18
- package/dist/server/routes/remediation.js.map +1 -1
- package/dist/tools/registry.d.ts +9 -0
- package/dist/tools/registry.js +11 -0
- package/dist/tools/registry.js.map +1 -1
- package/dist/tools/runCheck.d.ts +6 -0
- package/dist/tools/runCheck.js +1 -1
- package/dist/tools/runCheck.js.map +1 -1
- package/dist/tools/runSecuritySuite.d.ts +3 -0
- package/dist/tools/runSecuritySuite.js +18 -11
- package/dist/tools/runSecuritySuite.js.map +1 -1
- package/dist/tui/app.js +21 -2
- package/dist/tui/app.js.map +1 -1
- package/dist/tui/render.js +2 -0
- package/dist/tui/render.js.map +1 -1
- package/dist/version.d.ts +1 -1
- package/dist/version.js +1 -1
- package/package.json +17 -10
|
@@ -0,0 +1,415 @@
|
|
|
1
|
+
import { access, mkdir, open, writeFile } from 'node:fs/promises';
|
|
2
|
+
import { constants } from 'node:fs';
|
|
3
|
+
import path from 'node:path';
|
|
4
|
+
import { EXIT, UsageError } from '../core/exitCodes.js';
|
|
5
|
+
import { FIX_EXECUTORS, renderFixRecord } from '../security/fixRecord.js';
|
|
6
|
+
import { renderSecurityGate } from '../security/render.js';
|
|
7
|
+
import { renderFixRecordVerification, verifyFixRecordFile } from '../security/fixRecordFile.js';
|
|
8
|
+
import { runWorkflowVerification } from '../security/verifyRun.js';
|
|
9
|
+
import { resolveWorkspaceRoot } from '../core/workspace.js';
|
|
10
|
+
import { parseDvalinScannerIds, renderDvalinResult } from './dvalin.js';
|
|
11
|
+
import { DVALIN_SCANNER_IDS, dvalinScannerInstallPlan, installDvalinScanner, listDvalinScanners, runDvalinScanSuite, } from '../remediation/scannerSuite.js';
|
|
12
|
+
import { buildDvalinSarif } from '../remediation/sarifExport.js';
|
|
13
|
+
import { parseSarifForRemediation } from '../remediation/sarif.js';
|
|
14
|
+
import { upsertRemediationCases } from '../remediation/cases.js';
|
|
15
|
+
import { readSecurityBaseline, writeSecurityBaseline } from '../security/baseline.js';
|
|
16
|
+
import { loadSecurityConfig, resolveSecurityPath, writeInitialSecurityConfig, } from '../security/config.js';
|
|
17
|
+
import { SECURITY_SCHEMA_VERSION, compareWithBaseline, deriveCoverage, evaluateSecurityGate, } from '../security/contracts.js';
|
|
18
|
+
import { applySecuritySuppressions } from '../security/suppressions.js';
|
|
19
|
+
import { createSecurityWorkflow, loadSecurityWorkflow, } from '../security/workflow.js';
|
|
20
|
+
export const MAX_SECURITY_SARIF_IMPORT_BYTES = 64 * 1024 * 1024;
|
|
21
|
+
export function registerSecurityCommand(program) {
|
|
22
|
+
const security = program.command('security').description('Deterministic security verification for human- and agent-written code');
|
|
23
|
+
registerSecuritySubcommands(security);
|
|
24
|
+
}
|
|
25
|
+
/** Shared by `dvalincode security ...` and the focused `dvalin ...` binary. */
|
|
26
|
+
export function registerSecuritySubcommands(parent) {
|
|
27
|
+
parent
|
|
28
|
+
.command('init')
|
|
29
|
+
.description('Create a versioned Dvalin security policy')
|
|
30
|
+
.argument('[path]', 'workspace path', '.')
|
|
31
|
+
.option('--force', 'replace an existing policy')
|
|
32
|
+
.action(async (inputPath, options) => {
|
|
33
|
+
const root = await resolveWorkspaceRoot(path.resolve(process.cwd(), inputPath));
|
|
34
|
+
const target = await writeInitialSecurityConfig(root, Boolean(options.force));
|
|
35
|
+
console.log(`Created ${target}`);
|
|
36
|
+
console.log('Next: run `dvalin baseline` once, then use `dvalin scan` as a new-findings gate.');
|
|
37
|
+
});
|
|
38
|
+
parent
|
|
39
|
+
.command('scan')
|
|
40
|
+
.description('Scan code, apply suppressions/baseline policy, and evaluate the gate')
|
|
41
|
+
.argument('[path]', 'workspace path', '.')
|
|
42
|
+
.option('--config <file>', 'security config path (default: dvalin.security.json)')
|
|
43
|
+
.option('--scanners <ids>', `override scanner set: ${DVALIN_SCANNER_IDS.join(', ')}`)
|
|
44
|
+
.option('--timeout <seconds>', 'timeout for each external scanner', '300')
|
|
45
|
+
.option('--limit <count>', 'maximum findings shown in text output', '20')
|
|
46
|
+
.option('--json', 'print the versioned result envelope as JSON')
|
|
47
|
+
.option('--sarif <file>', 'also write SARIF 2.1.0')
|
|
48
|
+
.option('--fail-on <severity>', 'override gate severity: critical, high, medium, low, none')
|
|
49
|
+
.option('--new-only', 'evaluate only findings not present in the baseline')
|
|
50
|
+
.option('--no-workflow', 'do not persist a resumable security workflow')
|
|
51
|
+
.action(async (inputPath, options) => {
|
|
52
|
+
const execution = await executeSecurityScan({
|
|
53
|
+
root: path.resolve(process.cwd(), inputPath),
|
|
54
|
+
configPath: options.config,
|
|
55
|
+
scanners: options.scanners ? parseDvalinScannerIds(options.scanners) : undefined,
|
|
56
|
+
timeoutMs: positiveInteger(options.timeout, '--timeout') * 1000,
|
|
57
|
+
threshold: options.failOn ? parseThreshold(options.failOn) : undefined,
|
|
58
|
+
mode: options.newOnly ? 'new' : undefined,
|
|
59
|
+
saveWorkflow: options.workflow,
|
|
60
|
+
});
|
|
61
|
+
const limit = positiveInteger(options.limit, '--limit');
|
|
62
|
+
if (options.json) {
|
|
63
|
+
console.log(JSON.stringify({
|
|
64
|
+
schemaVersion: execution.schemaVersion,
|
|
65
|
+
scan: execution.scan,
|
|
66
|
+
coverage: execution.coverage,
|
|
67
|
+
delta: execution.delta,
|
|
68
|
+
gate: execution.gate,
|
|
69
|
+
workflowId: execution.workflow?.id,
|
|
70
|
+
suppressed: execution.suppressed,
|
|
71
|
+
expiredSuppressions: execution.expiredSuppressions,
|
|
72
|
+
}, null, 2));
|
|
73
|
+
}
|
|
74
|
+
else {
|
|
75
|
+
console.log(renderSecurityExecution(execution, limit));
|
|
76
|
+
}
|
|
77
|
+
if (options.sarif)
|
|
78
|
+
await writeSarif(execution.scan, execution.root, options.sarif, !options.json);
|
|
79
|
+
if (!execution.gate.passed)
|
|
80
|
+
process.exitCode = EXIT.gateNotMet;
|
|
81
|
+
});
|
|
82
|
+
parent
|
|
83
|
+
.command('import')
|
|
84
|
+
.description('Import a SARIF handoff into Dvalin remediation cases')
|
|
85
|
+
.argument('<report>', 'SARIF 2.1 report exported by Codex Security or another compatible scanner')
|
|
86
|
+
.argument('[path]', 'workspace path used to resolve finding locations', '.')
|
|
87
|
+
.option('--json', 'print the versioned import envelope as JSON')
|
|
88
|
+
.option('--no-persist', 'parse the report without creating remediation cases')
|
|
89
|
+
.action(async (report, inputPath, options) => {
|
|
90
|
+
const imported = await executeSecuritySarifImport({
|
|
91
|
+
root: path.resolve(process.cwd(), inputPath),
|
|
92
|
+
reportPath: path.resolve(process.cwd(), report),
|
|
93
|
+
persist: options.persist,
|
|
94
|
+
});
|
|
95
|
+
if (options.json) {
|
|
96
|
+
console.log(JSON.stringify(imported, null, 2));
|
|
97
|
+
}
|
|
98
|
+
else {
|
|
99
|
+
console.log(`Imported ${imported.findings.length}/${imported.totalResults} finding(s) from ${imported.source}.`);
|
|
100
|
+
if (imported.skippedResults)
|
|
101
|
+
console.log(`Skipped ${imported.skippedResults} result(s) without a safe workspace location.`);
|
|
102
|
+
console.log(imported.persisted
|
|
103
|
+
? `Created or updated ${imported.cases.length} remediation case(s).`
|
|
104
|
+
: 'Persistence disabled; no remediation cases were changed.');
|
|
105
|
+
console.log('Next: review the external evidence, then run `dvalin scan .` as the independent release gate.');
|
|
106
|
+
}
|
|
107
|
+
});
|
|
108
|
+
parent
|
|
109
|
+
.command('baseline')
|
|
110
|
+
.description('Record the current accepted findings for a new-findings gate')
|
|
111
|
+
.argument('[path]', 'workspace path', '.')
|
|
112
|
+
.option('--config <file>', 'security config path (default: dvalin.security.json)')
|
|
113
|
+
.option('--scanners <ids>', `override scanner set: ${DVALIN_SCANNER_IDS.join(', ')}`)
|
|
114
|
+
.option('--timeout <seconds>', 'timeout for each external scanner', '300')
|
|
115
|
+
.option('--output <file>', 'override baseline output path')
|
|
116
|
+
.option('--json', 'print baseline metadata as JSON')
|
|
117
|
+
.action(async (inputPath, options) => {
|
|
118
|
+
const root = await resolveWorkspaceRoot(path.resolve(process.cwd(), inputPath));
|
|
119
|
+
const loaded = await loadSecurityConfig(root, options.config);
|
|
120
|
+
const scanners = options.scanners ? parseDvalinScannerIds(options.scanners) : loaded.config.scanners;
|
|
121
|
+
const raw = await runDvalinScanSuite(root, { scanners, timeoutMs: positiveInteger(options.timeout, '--timeout') * 1000 });
|
|
122
|
+
const suppressed = applySecuritySuppressions(raw, loaded.config.suppressions);
|
|
123
|
+
const output = options.output ?? loaded.config.baseline;
|
|
124
|
+
const written = await writeSecurityBaseline(root, output, suppressed.result);
|
|
125
|
+
const body = { path: written.path, scanId: written.baseline.scanId, findings: written.baseline.findings.length, scanners };
|
|
126
|
+
console.log(options.json ? JSON.stringify(body, null, 2) : `Baseline written to ${written.path} · ${body.findings} accepted finding(s)`);
|
|
127
|
+
});
|
|
128
|
+
parent
|
|
129
|
+
.command('verify')
|
|
130
|
+
.description('Resume a workflow, re-scan it, run the project checks, and issue a fix record')
|
|
131
|
+
.argument('<workflow-id>', 'security workflow id returned by scan')
|
|
132
|
+
.option('--timeout <seconds>', 'timeout for each external scanner', '300')
|
|
133
|
+
.option('--record <file>', 'write the Verified Fix Record as JSON')
|
|
134
|
+
.option('--executor <name>', `who performed the repair, recorded but never consulted: ${FIX_EXECUTORS.join(', ')}`)
|
|
135
|
+
.option('--json', 'print workflow state as JSON')
|
|
136
|
+
.action(async (workflowId, options) => {
|
|
137
|
+
const workflow = await loadSecurityWorkflow(workflowId);
|
|
138
|
+
const loaded = await loadSecurityConfig(workflow.root);
|
|
139
|
+
const timeoutMs = positiveInteger(options.timeout, '--timeout') * 1000;
|
|
140
|
+
const updated = await runWorkflowVerification({
|
|
141
|
+
workflow,
|
|
142
|
+
checks: loaded.config.checks,
|
|
143
|
+
timeoutMs,
|
|
144
|
+
executor: options.executor ? parseExecutor(options.executor) : undefined,
|
|
145
|
+
});
|
|
146
|
+
if (options.record)
|
|
147
|
+
await writeFixRecord(updated, options.record, !options.json);
|
|
148
|
+
if (options.json)
|
|
149
|
+
console.log(JSON.stringify(updated, null, 2));
|
|
150
|
+
else {
|
|
151
|
+
console.log(`Workflow ${updated.id} · ${updated.state} · ${updated.verification?.assurance} · ${updated.latestScan.findings.length} finding(s)`);
|
|
152
|
+
if (updated.verification?.record)
|
|
153
|
+
console.log(renderFixRecord(updated.verification.record));
|
|
154
|
+
}
|
|
155
|
+
if (updated.state !== 'passed')
|
|
156
|
+
process.exitCode = EXIT.gateNotMet;
|
|
157
|
+
});
|
|
158
|
+
parent
|
|
159
|
+
.command('verify-fix')
|
|
160
|
+
.description('Re-derive a Verified Fix Record offline — no workspace, no network, no Dvalin state')
|
|
161
|
+
.argument('<record>', 'fix record JSON issued by `dvalin verify --record`')
|
|
162
|
+
.option('--json', 'print the verification result as JSON')
|
|
163
|
+
.action(async (recordPath, options) => {
|
|
164
|
+
const check = await verifyFixRecordFile(recordPath);
|
|
165
|
+
if (options.json) {
|
|
166
|
+
// A machine caller gets an answer in every case, including this one;
|
|
167
|
+
// the exit code, not the presence of output, carries the distinction.
|
|
168
|
+
console.log(JSON.stringify({ schemaVersion: SECURITY_SCHEMA_VERSION, ...check }, null, 2));
|
|
169
|
+
process.exitCode = check.record ? (check.ok ? EXIT.ok : EXIT.gateNotMet) : EXIT.usageError;
|
|
170
|
+
return;
|
|
171
|
+
}
|
|
172
|
+
// Pointing at the wrong file is a usage error; a real record that fails
|
|
173
|
+
// to re-derive is a gate result. A pipeline has to tell those apart.
|
|
174
|
+
if (!check.record)
|
|
175
|
+
throw new UsageError(`Not a Dvalin fix record: ${check.path}`);
|
|
176
|
+
console.log(renderFixRecordVerification(check));
|
|
177
|
+
// A record that does not re-derive is an answer, not a broken command.
|
|
178
|
+
if (!check.ok)
|
|
179
|
+
process.exitCode = EXIT.gateNotMet;
|
|
180
|
+
});
|
|
181
|
+
parent
|
|
182
|
+
.command('doctor')
|
|
183
|
+
.description('Show security policy, baseline, and scanner readiness')
|
|
184
|
+
.argument('[path]', 'workspace path', '.')
|
|
185
|
+
.option('--config <file>', 'security config path')
|
|
186
|
+
.option('--json', 'print diagnostics as JSON')
|
|
187
|
+
.action(async (inputPath, options) => {
|
|
188
|
+
const root = await resolveWorkspaceRoot(path.resolve(process.cwd(), inputPath));
|
|
189
|
+
const loaded = await loadSecurityConfig(root, options.config);
|
|
190
|
+
const baselinePath = resolveSecurityPath(root, loaded.config.baseline);
|
|
191
|
+
const baselineAvailable = await exists(baselinePath);
|
|
192
|
+
const scanners = await listDvalinScanners();
|
|
193
|
+
const body = { root, configPath: loaded.path, config: loaded.config, baseline: { path: baselinePath, available: baselineAvailable }, scanners };
|
|
194
|
+
if (options.json)
|
|
195
|
+
console.log(JSON.stringify(body, null, 2));
|
|
196
|
+
else {
|
|
197
|
+
console.log(`Dvalin security doctor · ${root}`);
|
|
198
|
+
console.log(`Policy: ${loaded.path ?? 'defaults (builtin scanner, non-blocking)'}`);
|
|
199
|
+
console.log(`Baseline: ${baselineAvailable ? 'ready' : 'missing'} · ${baselinePath}`);
|
|
200
|
+
for (const scanner of scanners) {
|
|
201
|
+
console.log(` ${scanner.available ? '✓' : '!'} ${scanner.name}${scanner.available ? '' : ` · ${scanner.installCommand ?? 'install manually'}`}`);
|
|
202
|
+
}
|
|
203
|
+
}
|
|
204
|
+
});
|
|
205
|
+
const scanners = parent.command('scanners').description('Inspect and install optional scanner engines');
|
|
206
|
+
scanners
|
|
207
|
+
.command('list')
|
|
208
|
+
.description('List scanner readiness and install commands')
|
|
209
|
+
.option('--json', 'print scanner descriptors as JSON')
|
|
210
|
+
.action(async (options) => {
|
|
211
|
+
const listed = await listDvalinScanners();
|
|
212
|
+
console.log(options.json ? JSON.stringify(listed, null, 2) : listed.map(scanner => `${scanner.available ? '✓' : '!'} ${scanner.id} · ${scanner.available ? 'ready' : scanner.installCommand ?? 'install manually'}`).join('\n'));
|
|
213
|
+
});
|
|
214
|
+
scanners
|
|
215
|
+
.command('install')
|
|
216
|
+
.description('Print a fixed install command; execute it only with --yes')
|
|
217
|
+
.argument('<scanner>', `one of ${DVALIN_SCANNER_IDS.join(', ')}`)
|
|
218
|
+
.option('--yes', 'execute the reviewed command under Dvalin policy')
|
|
219
|
+
.action(async (scanner, options) => {
|
|
220
|
+
const id = parseDvalinScannerIds(scanner)[0];
|
|
221
|
+
const plan = dvalinScannerInstallPlan(id);
|
|
222
|
+
if (!plan.command) {
|
|
223
|
+
console.log(plan.reason);
|
|
224
|
+
return;
|
|
225
|
+
}
|
|
226
|
+
console.log(`Install plan: ${plan.command}`);
|
|
227
|
+
if (!options.yes) {
|
|
228
|
+
console.log('Review the command, then rerun with --yes to execute it.');
|
|
229
|
+
return;
|
|
230
|
+
}
|
|
231
|
+
await installDvalinScanner(process.cwd(), id);
|
|
232
|
+
console.log(`${id} installation command completed.`);
|
|
233
|
+
});
|
|
234
|
+
}
|
|
235
|
+
export async function executeSecurityScan(input) {
|
|
236
|
+
const root = await resolveWorkspaceRoot(input.root);
|
|
237
|
+
const loaded = await loadSecurityConfig(root, input.configPath);
|
|
238
|
+
const config = {
|
|
239
|
+
...loaded.config,
|
|
240
|
+
scanners: input.scanners ?? loaded.config.scanners,
|
|
241
|
+
gate: {
|
|
242
|
+
severity: input.threshold ?? loaded.config.gate.severity,
|
|
243
|
+
mode: input.mode ?? loaded.config.gate.mode,
|
|
244
|
+
},
|
|
245
|
+
};
|
|
246
|
+
const raw = await runDvalinScanSuite(root, { scanners: config.scanners, timeoutMs: input.timeoutMs });
|
|
247
|
+
const suppression = applySecuritySuppressions(raw, config.suppressions);
|
|
248
|
+
let delta;
|
|
249
|
+
if (config.gate.mode === 'new') {
|
|
250
|
+
try {
|
|
251
|
+
delta = compareWithBaseline(suppression.result, await readSecurityBaseline(root, config.baseline), { suppressed: suppression.suppressed });
|
|
252
|
+
}
|
|
253
|
+
catch (error) {
|
|
254
|
+
throw new UsageError(`${error instanceof Error ? error.message : String(error)}. Run \`dvalin baseline\` before using a new-findings gate.`);
|
|
255
|
+
}
|
|
256
|
+
}
|
|
257
|
+
const gate = evaluateSecurityGate({ result: suppression.result, threshold: config.gate.severity, mode: config.gate.mode, delta });
|
|
258
|
+
const coverage = deriveCoverage(suppression.result, { suppressed: suppression.suppressed });
|
|
259
|
+
const workflow = input.saveWorkflow === false
|
|
260
|
+
? undefined
|
|
261
|
+
: await createSecurityWorkflow({ root, result: suppression.result, gate, delta, coverage });
|
|
262
|
+
return {
|
|
263
|
+
schemaVersion: SECURITY_SCHEMA_VERSION,
|
|
264
|
+
scan: suppression.result,
|
|
265
|
+
coverage,
|
|
266
|
+
delta,
|
|
267
|
+
gate,
|
|
268
|
+
root,
|
|
269
|
+
config,
|
|
270
|
+
workflow,
|
|
271
|
+
suppressed: suppression.suppressed.length,
|
|
272
|
+
expiredSuppressions: suppression.expired.length,
|
|
273
|
+
};
|
|
274
|
+
}
|
|
275
|
+
export async function executeSecuritySarifImport(input) {
|
|
276
|
+
const root = await resolveWorkspaceRoot(input.root);
|
|
277
|
+
const reportPath = path.resolve(input.reportPath);
|
|
278
|
+
let reportText;
|
|
279
|
+
try {
|
|
280
|
+
reportText = await readUtf8FileWithLimit(reportPath, MAX_SECURITY_SARIF_IMPORT_BYTES);
|
|
281
|
+
}
|
|
282
|
+
catch (error) {
|
|
283
|
+
if (error instanceof UsageError)
|
|
284
|
+
throw error;
|
|
285
|
+
throw new UsageError(`Cannot read SARIF report ${reportPath}: ${error instanceof Error ? error.message : String(error)}`);
|
|
286
|
+
}
|
|
287
|
+
let report;
|
|
288
|
+
try {
|
|
289
|
+
report = JSON.parse(reportText);
|
|
290
|
+
}
|
|
291
|
+
catch (error) {
|
|
292
|
+
throw new UsageError(`Invalid SARIF JSON in ${reportPath}: ${error instanceof Error ? error.message : String(error)}`);
|
|
293
|
+
}
|
|
294
|
+
const parsed = await parseSarifForRemediation(report, { cwd: root }).catch(error => {
|
|
295
|
+
throw new UsageError(`Cannot import SARIF report ${reportPath}: ${error instanceof Error ? error.message : String(error)}`);
|
|
296
|
+
});
|
|
297
|
+
const persisted = input.persist !== false;
|
|
298
|
+
const cases = persisted
|
|
299
|
+
? await upsertRemediationCases({ cwd: root, findings: parsed.findings })
|
|
300
|
+
: [];
|
|
301
|
+
return {
|
|
302
|
+
schemaVersion: 1,
|
|
303
|
+
kind: 'dvalin-security-import',
|
|
304
|
+
root,
|
|
305
|
+
reportPath,
|
|
306
|
+
source: parsed.source,
|
|
307
|
+
totalResults: parsed.totalResults,
|
|
308
|
+
skippedResults: parsed.skippedResults,
|
|
309
|
+
findings: parsed.findings,
|
|
310
|
+
cases,
|
|
311
|
+
persisted,
|
|
312
|
+
};
|
|
313
|
+
}
|
|
314
|
+
async function readUtf8FileWithLimit(file, maxBytes) {
|
|
315
|
+
const handle = await open(file, 'r');
|
|
316
|
+
try {
|
|
317
|
+
const info = await handle.stat();
|
|
318
|
+
if (!info.isFile())
|
|
319
|
+
throw new UsageError(`SARIF report is not a regular file: ${file}`);
|
|
320
|
+
if (info.size > maxBytes) {
|
|
321
|
+
throw new UsageError(`SARIF report exceeds the ${Math.floor(maxBytes / 1024 / 1024)} MiB import limit: ${file}`);
|
|
322
|
+
}
|
|
323
|
+
const chunks = [];
|
|
324
|
+
let totalBytes = 0;
|
|
325
|
+
while (true) {
|
|
326
|
+
const remaining = maxBytes + 1 - totalBytes;
|
|
327
|
+
if (remaining <= 0) {
|
|
328
|
+
throw new UsageError(`SARIF report exceeds the ${Math.floor(maxBytes / 1024 / 1024)} MiB import limit: ${file}`);
|
|
329
|
+
}
|
|
330
|
+
const chunk = Buffer.allocUnsafe(Math.min(64 * 1024, remaining));
|
|
331
|
+
const { bytesRead } = await handle.read(chunk, 0, chunk.length, null);
|
|
332
|
+
if (bytesRead === 0)
|
|
333
|
+
break;
|
|
334
|
+
totalBytes += bytesRead;
|
|
335
|
+
if (totalBytes > maxBytes) {
|
|
336
|
+
throw new UsageError(`SARIF report exceeds the ${Math.floor(maxBytes / 1024 / 1024)} MiB import limit: ${file}`);
|
|
337
|
+
}
|
|
338
|
+
chunks.push(chunk.subarray(0, bytesRead));
|
|
339
|
+
}
|
|
340
|
+
return Buffer.concat(chunks, totalBytes).toString('utf8');
|
|
341
|
+
}
|
|
342
|
+
finally {
|
|
343
|
+
await handle.close();
|
|
344
|
+
}
|
|
345
|
+
}
|
|
346
|
+
export function renderSecurityExecution(execution, limit) {
|
|
347
|
+
const lines = [renderDvalinResult(execution.scan, execution.root, limit, execution.coverage)];
|
|
348
|
+
if (execution.delta) {
|
|
349
|
+
const delta = execution.delta;
|
|
350
|
+
const parts = [
|
|
351
|
+
`${delta.new.length} new`,
|
|
352
|
+
`${delta.existing.length} existing`,
|
|
353
|
+
`${delta.resolved.length} resolved`,
|
|
354
|
+
];
|
|
355
|
+
if (delta.reopened.length)
|
|
356
|
+
parts.push(`${delta.reopened.length} reopened`);
|
|
357
|
+
if (delta.dismissed.length)
|
|
358
|
+
parts.push(`${delta.dismissed.length} dismissed`);
|
|
359
|
+
// Never fold this into "resolved": these were not looked for.
|
|
360
|
+
if (delta.unknown.length)
|
|
361
|
+
parts.push(`${delta.unknown.length} unknown`);
|
|
362
|
+
lines.push('', `Baseline delta · ${parts.join(' · ')}`);
|
|
363
|
+
}
|
|
364
|
+
if (execution.suppressed)
|
|
365
|
+
lines.push(`Suppressed: ${execution.suppressed}`);
|
|
366
|
+
if (execution.expiredSuppressions)
|
|
367
|
+
lines.push(`Expired suppressions: ${execution.expiredSuppressions}`);
|
|
368
|
+
lines.push(renderSecurityGate(execution.gate));
|
|
369
|
+
if (execution.workflow)
|
|
370
|
+
lines.push(`Workflow: ${execution.workflow.id}`);
|
|
371
|
+
return lines.join('\n');
|
|
372
|
+
}
|
|
373
|
+
function parseThreshold(value) {
|
|
374
|
+
if (['critical', 'high', 'medium', 'low', 'none'].includes(value))
|
|
375
|
+
return value;
|
|
376
|
+
throw new UsageError('--fail-on must be one of critical, high, medium, low, none.');
|
|
377
|
+
}
|
|
378
|
+
function positiveInteger(value, label) {
|
|
379
|
+
const parsed = Number(value);
|
|
380
|
+
if (!Number.isInteger(parsed) || parsed <= 0)
|
|
381
|
+
throw new UsageError(`${label} must be a positive integer.`);
|
|
382
|
+
return parsed;
|
|
383
|
+
}
|
|
384
|
+
async function writeSarif(result, root, file, announce) {
|
|
385
|
+
const target = path.resolve(process.cwd(), file);
|
|
386
|
+
await mkdir(path.dirname(target), { recursive: true });
|
|
387
|
+
await writeFile(target, `${JSON.stringify(buildDvalinSarif(result, root), null, 2)}\n`, 'utf8');
|
|
388
|
+
if (announce)
|
|
389
|
+
console.log(`SARIF written to ${target}`);
|
|
390
|
+
}
|
|
391
|
+
export function parseExecutor(value) {
|
|
392
|
+
if (FIX_EXECUTORS.includes(value))
|
|
393
|
+
return value;
|
|
394
|
+
throw new UsageError(`--executor must be one of ${FIX_EXECUTORS.join(', ')}.`);
|
|
395
|
+
}
|
|
396
|
+
async function writeFixRecord(workflow, file, announce) {
|
|
397
|
+
const record = workflow.verification?.record;
|
|
398
|
+
if (!record)
|
|
399
|
+
throw new UsageError('This workflow has no fix record to write.');
|
|
400
|
+
const target = path.resolve(process.cwd(), file);
|
|
401
|
+
await mkdir(path.dirname(target), { recursive: true });
|
|
402
|
+
await writeFile(target, `${JSON.stringify(record, null, 2)}\n`, 'utf8');
|
|
403
|
+
if (announce)
|
|
404
|
+
console.log(`Fix record written to ${target}`);
|
|
405
|
+
}
|
|
406
|
+
async function exists(file) {
|
|
407
|
+
try {
|
|
408
|
+
await access(file, constants.R_OK);
|
|
409
|
+
return true;
|
|
410
|
+
}
|
|
411
|
+
catch {
|
|
412
|
+
return false;
|
|
413
|
+
}
|
|
414
|
+
}
|
|
415
|
+
//# sourceMappingURL=security.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"security.js","sourceRoot":"","sources":["../../src/commands/security.ts"],"names":[],"mappings":"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"}
|
package/dist/commands/tools.d.ts
CHANGED
|
@@ -1,3 +1,13 @@
|
|
|
1
1
|
import type { Command } from 'commander';
|
|
2
|
-
import type
|
|
2
|
+
import { type ToolRegistry } from '../tools/registry.js';
|
|
3
|
+
/** One tool as `dvalincode tools --json` reports it. */
|
|
4
|
+
export type ToolListEntry = {
|
|
5
|
+
name: string;
|
|
6
|
+
access: string;
|
|
7
|
+
description: string;
|
|
8
|
+
/** JSON Schema for `run-tool -i`. The same schema the model is given. */
|
|
9
|
+
parameters: Record<string, unknown>;
|
|
10
|
+
/** True when the tool needs `run-tool --yes` to run at all. */
|
|
11
|
+
requiresYes: boolean;
|
|
12
|
+
};
|
|
3
13
|
export declare function registerToolsCommand(program: Command, registry: ToolRegistry): void;
|
package/dist/commands/tools.js
CHANGED
|
@@ -1,11 +1,32 @@
|
|
|
1
|
+
import { toolParametersSchema } from '../tools/registry.js';
|
|
1
2
|
export function registerToolsCommand(program, registry) {
|
|
2
3
|
program
|
|
3
4
|
.command('tools')
|
|
4
5
|
.description('List available tools')
|
|
5
|
-
.
|
|
6
|
-
|
|
7
|
-
|
|
6
|
+
.option('--json', 'print the tool list as JSON, including each input schema')
|
|
7
|
+
.action((options) => {
|
|
8
|
+
const tools = registry.list();
|
|
9
|
+
if (options.json) {
|
|
10
|
+
console.log(JSON.stringify({ tools: tools.map(toEntry) }, null, 2));
|
|
11
|
+
return;
|
|
12
|
+
}
|
|
13
|
+
// Width from the longest name rather than a fixed 14: `list_remediation_cases`
|
|
14
|
+
// overflowed it and pushed the rest of that row out of alignment, which
|
|
15
|
+
// silently breaks anything parsing these columns by position.
|
|
16
|
+
const nameWidth = Math.max(...tools.map(tool => tool.name.length), 4);
|
|
17
|
+
const accessWidth = Math.max(...tools.map(tool => tool.access.length), 6);
|
|
18
|
+
for (const tool of tools) {
|
|
19
|
+
console.log(`${tool.name.padEnd(nameWidth)} ${tool.access.padEnd(accessWidth)} ${tool.description}`);
|
|
8
20
|
}
|
|
9
21
|
});
|
|
10
22
|
}
|
|
23
|
+
function toEntry(tool) {
|
|
24
|
+
return {
|
|
25
|
+
name: tool.name,
|
|
26
|
+
access: tool.access,
|
|
27
|
+
description: tool.description,
|
|
28
|
+
parameters: toolParametersSchema(tool),
|
|
29
|
+
requiresYes: tool.access === 'write' || tool.access === 'execute',
|
|
30
|
+
};
|
|
31
|
+
}
|
|
11
32
|
//# sourceMappingURL=tools.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tools.js","sourceRoot":"","sources":["../../src/commands/tools.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"tools.js","sourceRoot":"","sources":["../../src/commands/tools.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAqB,MAAM,sBAAsB,CAAC;AAa/E,MAAM,UAAU,oBAAoB,CAAC,OAAgB,EAAE,QAAsB;IAC3E,OAAO;SACJ,OAAO,CAAC,OAAO,CAAC;SAChB,WAAW,CAAC,sBAAsB,CAAC;SACnC,MAAM,CAAC,QAAQ,EAAE,0DAA0D,CAAC;SAC5E,MAAM,CAAC,CAAC,OAA2B,EAAE,EAAE;QACtC,MAAM,KAAK,GAAG,QAAQ,CAAC,IAAI,EAAE,CAAC;QAC9B,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;YACjB,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;YACpE,OAAO;QACT,CAAC;QACD,+EAA+E;QAC/E,wEAAwE;QACxE,8DAA8D;QAC9D,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC;QACtE,MAAM,WAAW,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC;QAC1E,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;YACzB,OAAO,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,KAAK,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,KAAK,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC;QACzG,CAAC;IACH,CAAC,CAAC,CAAC;AACP,CAAC;AAED,SAAS,OAAO,CAAC,IAA8C;IAC7D,OAAO;QACL,IAAI,EAAE,IAAI,CAAC,IAAI;QACf,MAAM,EAAE,IAAI,CAAC,MAAM;QACnB,WAAW,EAAE,IAAI,CAAC,WAAW;QAC7B,UAAU,EAAE,oBAAoB,CAAC,IAAI,CAAC;QACtC,WAAW,EAAE,IAAI,CAAC,MAAM,KAAK,OAAO,IAAI,IAAI,CAAC,MAAM,KAAK,SAAS;KAClE,CAAC;AACJ,CAAC"}
|
package/dist/commands/update.js
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { EXIT } from '../core/exitCodes.js';
|
|
1
2
|
import { fileURLToPath } from 'node:url';
|
|
2
3
|
import { Readable } from 'node:stream';
|
|
3
4
|
import { pipeline } from 'node:stream/promises';
|
|
@@ -32,7 +33,7 @@ export function registerUpdateCommand(program) {
|
|
|
32
33
|
else {
|
|
33
34
|
console.error(`update: ${message}`);
|
|
34
35
|
}
|
|
35
|
-
process.exitCode =
|
|
36
|
+
process.exitCode = EXIT.runtimeError;
|
|
36
37
|
}
|
|
37
38
|
});
|
|
38
39
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update.js","sourceRoot":"","sources":["../../src/commands/update.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAChD,OAAO,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AACrF,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACtC,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AACxC,OAAO,EACL,YAAY,EACZ,aAAa,EACb,SAAS,EACT,aAAa,EACb,cAAc,EACd,kBAAkB,EAClB,OAAO,EACP,SAAS,EACT,UAAU,GAGX,MAAM,uBAAuB,CAAC;AAE/B,MAAM,aAAa,GAAG,SAAS,CAAC,QAAQ,CAAC,CAAC;AAU1C,MAAM,UAAU,qBAAqB,CAAC,OAAgB;IACpD,OAAO;SACJ,OAAO,CAAC,QAAQ,CAAC;SACjB,KAAK,CAAC,SAAS,CAAC;SAChB,WAAW,CAAC,mDAAmD,CAAC;SAChE,MAAM,CAAC,SAAS,EAAE,mEAAmE,CAAC;SACtF,MAAM,CAAC,WAAW,EAAE,sDAAsD,CAAC;SAC3E,MAAM,CAAC,SAAS,EAAE,iDAAiD,CAAC;SACpE,MAAM,CAAC,cAAc,EAAE,uDAAuD,CAAC;SAC/E,MAAM,CAAC,QAAQ,EAAE,mDAAmD,CAAC;SACrE,MAAM,CAAC,KAAK,EAAE,OAAsB,EAAE,EAAE;QACvC,IAAI,CAAC;YACH,MAAM,SAAS,CAAC,OAAO,CAAC,CAAC;QAC3B,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,OAAO,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YACvE,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;gBACjB,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;YACtE,CAAC;iBAAM,CAAC;gBACN,OAAO,CAAC,KAAK,CAAC,WAAW,OAAO,EAAE,CAAC,CAAC;YACtC,CAAC;YACD,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"update.js","sourceRoot":"","sources":["../../src/commands/update.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,38 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* One exit-code convention for every command.
|
|
3
|
+
*
|
|
4
|
+
* These were previously per-command and disagreed with each other: a scan that
|
|
5
|
+
* found problems exited 2, an Evidence Pack that failed verification exited 1,
|
|
6
|
+
* and 2 also meant "bad flag" — so a CI step could not tell a real finding from
|
|
7
|
+
* a typo. The codes below are the contract; `docs/HARNESS-MODE.md` carries the
|
|
8
|
+
* table and `dvalincode --help` points at it.
|
|
9
|
+
*/
|
|
10
|
+
export declare const EXIT: {
|
|
11
|
+
/** Completed, and the answer was yes. */
|
|
12
|
+
readonly ok: 0;
|
|
13
|
+
/** The command tried to do its job and something went wrong. */
|
|
14
|
+
readonly runtimeError: 1;
|
|
15
|
+
/** The invocation was wrong: bad flag, missing argument, unknown session. */
|
|
16
|
+
readonly usageError: 2;
|
|
17
|
+
/** Org policy denied the mode, model, provider, tool, command, or path. */
|
|
18
|
+
readonly policyViolation: 3;
|
|
19
|
+
/** Wall-clock timeout, SIGINT, or an aborted run. */
|
|
20
|
+
readonly interrupted: 4;
|
|
21
|
+
/**
|
|
22
|
+
* The command ran correctly and the answer was no — findings at or above
|
|
23
|
+
* `--fail-on`, an Evidence Pack that did not verify. Distinct from 1 and 2 on
|
|
24
|
+
* purpose: a gate result is not an error, and a pipeline needs to tell
|
|
25
|
+
* "we found something" apart from "the tool broke" and "you typed it wrong".
|
|
26
|
+
*/
|
|
27
|
+
readonly gateNotMet: 5;
|
|
28
|
+
};
|
|
29
|
+
export type ExitCode = (typeof EXIT)[keyof typeof EXIT];
|
|
30
|
+
/**
|
|
31
|
+
* Thrown for a bad argument *value* — a valid flag given something invalid.
|
|
32
|
+
* Commander only maps its own parse failures to `usageError`; anything a
|
|
33
|
+
* command validates itself used to surface as a runtime error, so
|
|
34
|
+
* `--scanners nessus` and a crashed scanner were indistinguishable.
|
|
35
|
+
*/
|
|
36
|
+
export declare class UsageError extends Error {
|
|
37
|
+
readonly exitCode: 2;
|
|
38
|
+
}
|