dvalincode 0.17.0 → 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 +202 -46
- package/README.zh-CN.md +170 -39
- package/THIRD_PARTY_NOTICES.md +98 -43
- package/dist/cli.js +4 -0
- package/dist/cli.js.map +1 -1
- package/dist/commands/dvalin.d.ts +9 -1
- package/dist/commands/dvalin.js +177 -37
- package/dist/commands/dvalin.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/security.d.ts +47 -0
- package/dist/commands/security.js +415 -0
- package/dist/commands/security.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/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 +10 -1
- package/dist/mcp/server.js +215 -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/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
|
@@ -1,6 +1,12 @@
|
|
|
1
1
|
export type RemediationFinding = {
|
|
2
2
|
id: string;
|
|
3
3
|
source: string;
|
|
4
|
+
/**
|
|
5
|
+
* The fleet engine that produced this finding, stamped by the suite. Absent
|
|
6
|
+
* for SARIF imported from a tool outside the fleet, where no engine of ours
|
|
7
|
+
* can be said to have covered it.
|
|
8
|
+
*/
|
|
9
|
+
scanner?: 'builtin' | 'semgrep' | 'trivy' | 'osv-scanner';
|
|
4
10
|
ruleId: string;
|
|
5
11
|
ruleName?: string;
|
|
6
12
|
severity: 'error' | 'warning' | 'note' | 'none';
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { readFile } from 'node:fs/promises';
|
|
2
2
|
import path from 'node:path';
|
|
3
|
-
import {
|
|
3
|
+
import { fileURLToPath } from 'node:url';
|
|
4
|
+
import { resolveInsideWorkspace, resolveWorkspaceRoot } from '../core/workspace.js';
|
|
4
5
|
const MAX_FINDINGS = 200;
|
|
5
6
|
const CONTEXT_RADIUS = 4;
|
|
6
7
|
function asObject(value) {
|
|
@@ -28,32 +29,53 @@ function normalizeLevel(level) {
|
|
|
28
29
|
return level;
|
|
29
30
|
return 'warning';
|
|
30
31
|
}
|
|
31
|
-
function normalizeSarifPath(uri, cwd) {
|
|
32
|
+
async function normalizeSarifPath(uri, cwd) {
|
|
32
33
|
if (!uri)
|
|
33
34
|
return undefined;
|
|
34
35
|
const trimmed = uri.trim();
|
|
35
|
-
if (!trimmed || trimmed.includes('\0')
|
|
36
|
+
if (!trimmed || trimmed.includes('\0')) {
|
|
36
37
|
return undefined;
|
|
37
38
|
}
|
|
38
|
-
const withoutFileScheme = trimmed.startsWith('file://')
|
|
39
|
-
? trimmed.replace(/^file:\/+/, '/')
|
|
40
|
-
: trimmed;
|
|
41
39
|
let decoded;
|
|
42
40
|
try {
|
|
43
|
-
|
|
41
|
+
if (/^file:/i.test(trimmed))
|
|
42
|
+
decoded = fileURLToPath(trimmed);
|
|
43
|
+
else {
|
|
44
|
+
const looksLikeWindowsPath = path.win32.isAbsolute(trimmed);
|
|
45
|
+
if (!looksLikeWindowsPath && /^[a-z][a-z0-9+.-]*:/i.test(trimmed))
|
|
46
|
+
return undefined;
|
|
47
|
+
decoded = decodeURIComponent(trimmed);
|
|
48
|
+
}
|
|
44
49
|
}
|
|
45
50
|
catch {
|
|
46
51
|
return undefined;
|
|
47
52
|
}
|
|
48
53
|
const normalized = path.normalize(decoded);
|
|
49
|
-
if (
|
|
50
|
-
const
|
|
51
|
-
if (
|
|
52
|
-
|
|
53
|
-
|
|
54
|
+
if (!cwd) {
|
|
55
|
+
const portable = normalized.replace(/\\/g, '/');
|
|
56
|
+
if (path.isAbsolute(normalized) || path.win32.isAbsolute(normalized)
|
|
57
|
+
|| portable === '..' || portable.startsWith('../'))
|
|
58
|
+
return undefined;
|
|
59
|
+
return portable.replace(/^\.\//, '');
|
|
60
|
+
}
|
|
61
|
+
const root = await resolveWorkspaceRoot(cwd);
|
|
62
|
+
if (path.win32.isAbsolute(normalized) && !path.isAbsolute(normalized))
|
|
54
63
|
return undefined;
|
|
64
|
+
const candidates = path.isAbsolute(normalized)
|
|
65
|
+
? [path.relative(path.resolve(cwd), normalized), path.relative(root, normalized)]
|
|
66
|
+
: [normalized];
|
|
67
|
+
for (const candidate of new Set(candidates)) {
|
|
68
|
+
try {
|
|
69
|
+
const resolved = await resolveInsideWorkspace(root, candidate);
|
|
70
|
+
const relative = path.relative(root, resolved).replace(/\\/g, '/');
|
|
71
|
+
if (relative && relative !== '..' && !relative.startsWith('../'))
|
|
72
|
+
return relative;
|
|
73
|
+
}
|
|
74
|
+
catch {
|
|
75
|
+
// Try the canonical-root-relative form before rejecting an absolute URI.
|
|
76
|
+
}
|
|
55
77
|
}
|
|
56
|
-
return
|
|
78
|
+
return undefined;
|
|
57
79
|
}
|
|
58
80
|
async function readSnippet(cwd, findingPath, startLine) {
|
|
59
81
|
if (!cwd || !startLine || path.isAbsolute(findingPath))
|
|
@@ -119,7 +141,7 @@ export async function parseSarifForRemediation(report, opts = {}) {
|
|
|
119
141
|
}
|
|
120
142
|
const location = result.locations?.[0];
|
|
121
143
|
const physical = location?.physicalLocation;
|
|
122
|
-
const findingPath = normalizeSarifPath(physical?.artifactLocation?.uri, opts.cwd);
|
|
144
|
+
const findingPath = await normalizeSarifPath(physical?.artifactLocation?.uri, opts.cwd);
|
|
123
145
|
if (!findingPath) {
|
|
124
146
|
skippedResults += 1;
|
|
125
147
|
continue;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sarif.js","sourceRoot":"","sources":["../../src/remediation/sarif.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,sBAAsB,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"sarif.js","sourceRoot":"","sources":["../../src/remediation/sarif.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,7 @@
|
|
|
1
|
+
import { type DiffScope } from './diffScope.js';
|
|
1
2
|
import { type RemediationFinding } from './sarif.js';
|
|
2
3
|
export type DvalinScannerId = 'builtin' | 'semgrep' | 'trivy' | 'osv-scanner';
|
|
4
|
+
export declare const DVALIN_SCANNER_IDS: DvalinScannerId[];
|
|
3
5
|
export type DvalinScannerDescriptor = {
|
|
4
6
|
id: DvalinScannerId;
|
|
5
7
|
name: string;
|
|
@@ -9,6 +11,12 @@ export type DvalinScannerDescriptor = {
|
|
|
9
11
|
installCommand?: string;
|
|
10
12
|
homepage: string;
|
|
11
13
|
};
|
|
14
|
+
export type DvalinScannerInstallPlan = {
|
|
15
|
+
scanner: DvalinScannerId;
|
|
16
|
+
supported: boolean;
|
|
17
|
+
command?: string;
|
|
18
|
+
reason?: string;
|
|
19
|
+
};
|
|
12
20
|
export type DvalinScannerRun = DvalinScannerDescriptor & {
|
|
13
21
|
status: 'completed' | 'missing' | 'error';
|
|
14
22
|
findings: number;
|
|
@@ -35,9 +43,22 @@ export type DvalinScanSuiteResult = {
|
|
|
35
43
|
skippedResults: number;
|
|
36
44
|
scanners: DvalinScannerRun[];
|
|
37
45
|
metrics: DvalinScanMetrics;
|
|
46
|
+
/** Set when the scan was narrowed to a diff; absent for a whole-workspace scan. */
|
|
47
|
+
scope?: {
|
|
48
|
+
ref: string;
|
|
49
|
+
files: number;
|
|
50
|
+
};
|
|
38
51
|
};
|
|
39
52
|
export declare function listDvalinScanners(): Promise<DvalinScannerDescriptor[]>;
|
|
53
|
+
/**
|
|
54
|
+
* Return a reviewable install plan. Dvalin never downloads or executes an
|
|
55
|
+
* installer merely because a scan discovered that an optional engine is absent.
|
|
56
|
+
*/
|
|
57
|
+
export declare function dvalinScannerInstallPlan(id: DvalinScannerId): DvalinScannerInstallPlan;
|
|
58
|
+
/** Execute a previously reviewed, fixed installer argv under the resolved policy. */
|
|
59
|
+
export declare function installDvalinScanner(cwd: string, id: DvalinScannerId): Promise<void>;
|
|
40
60
|
export declare function runDvalinScanSuite(cwd: string, options?: {
|
|
41
61
|
scanners?: DvalinScannerId[];
|
|
42
62
|
timeoutMs?: number;
|
|
63
|
+
scope?: DiffScope;
|
|
43
64
|
}): Promise<DvalinScanSuiteResult>;
|
|
@@ -5,8 +5,10 @@ import { randomUUID } from 'node:crypto';
|
|
|
5
5
|
import { checkCommand, loadPolicy } from '../core/policy.js';
|
|
6
6
|
import { buildShellScript, runGovernedExecutable } from '../core/subprocessSandbox.js';
|
|
7
7
|
import { resolveWorkspaceRoot } from '../core/workspace.js';
|
|
8
|
+
import { isWithinDiffScope } from './diffScope.js';
|
|
8
9
|
import { runLocalSecurityScan } from './localScan.js';
|
|
9
10
|
import { parseSarifForRemediation } from './sarif.js';
|
|
11
|
+
export const DVALIN_SCANNER_IDS = ['builtin', 'semgrep', 'trivy', 'osv-scanner'];
|
|
10
12
|
const EXTERNAL_SCANNERS = [
|
|
11
13
|
{
|
|
12
14
|
descriptor: {
|
|
@@ -73,6 +75,47 @@ export async function listDvalinScanners() {
|
|
|
73
75
|
})));
|
|
74
76
|
return [BUILTIN, ...external];
|
|
75
77
|
}
|
|
78
|
+
/**
|
|
79
|
+
* Return a reviewable install plan. Dvalin never downloads or executes an
|
|
80
|
+
* installer merely because a scan discovered that an optional engine is absent.
|
|
81
|
+
*/
|
|
82
|
+
export function dvalinScannerInstallPlan(id) {
|
|
83
|
+
if (id === 'builtin') {
|
|
84
|
+
return { scanner: id, supported: true, reason: 'Dvalin Built-in ships with the CLI; no installation is required.' };
|
|
85
|
+
}
|
|
86
|
+
const scanner = EXTERNAL_SCANNERS.find(candidate => candidate.descriptor.id === id);
|
|
87
|
+
if (!scanner)
|
|
88
|
+
return { scanner: id, supported: false, reason: `Unknown scanner: ${id}` };
|
|
89
|
+
if (!scanner.descriptor.installCommand) {
|
|
90
|
+
return { scanner: id, supported: false, reason: `No managed install command is available for ${scanner.descriptor.name}.` };
|
|
91
|
+
}
|
|
92
|
+
return { scanner: id, supported: true, command: scanner.descriptor.installCommand };
|
|
93
|
+
}
|
|
94
|
+
/** Execute a previously reviewed, fixed installer argv under the resolved policy. */
|
|
95
|
+
export async function installDvalinScanner(cwd, id) {
|
|
96
|
+
const launch = scannerInstaller(id);
|
|
97
|
+
if (!launch) {
|
|
98
|
+
if (id === 'builtin')
|
|
99
|
+
return;
|
|
100
|
+
throw new Error(`No managed installer is available for ${id}.`);
|
|
101
|
+
}
|
|
102
|
+
const policy = loadPolicy(cwd).policy;
|
|
103
|
+
const commandLine = buildShellScript(launch.command, launch.args);
|
|
104
|
+
const decision = checkCommand(policy, commandLine);
|
|
105
|
+
if (!decision.allowed)
|
|
106
|
+
throw new Error(`Scanner installation blocked by policy: ${decision.rule}`);
|
|
107
|
+
const result = await runGovernedExecutable({
|
|
108
|
+
...launch,
|
|
109
|
+
cwd,
|
|
110
|
+
timeoutMs: 600_000,
|
|
111
|
+
policy,
|
|
112
|
+
toolName: 'install_security_scanner',
|
|
113
|
+
preferSandboxWhenUnrestricted: false,
|
|
114
|
+
skipNetworkSandboxWhenPolicyAllows: true,
|
|
115
|
+
});
|
|
116
|
+
if (result.exitCode !== 0)
|
|
117
|
+
throw new Error(result.output.trim() || `${launch.command} exited ${result.exitCode}`);
|
|
118
|
+
}
|
|
76
119
|
export async function runDvalinScanSuite(cwd, options = {}) {
|
|
77
120
|
const root = await resolveWorkspaceRoot(cwd);
|
|
78
121
|
const started = new Date();
|
|
@@ -83,8 +126,8 @@ export async function runDvalinScanSuite(cwd, options = {}) {
|
|
|
83
126
|
let skippedResults = 0;
|
|
84
127
|
if (selected.has('builtin')) {
|
|
85
128
|
const t0 = Date.now();
|
|
86
|
-
const result = await runLocalSecurityScan(root);
|
|
87
|
-
findings.push(...result.findings);
|
|
129
|
+
const result = await runLocalSecurityScan(root, options.scope);
|
|
130
|
+
findings.push(...result.findings.map(finding => ({ ...finding, scanner: 'builtin' })));
|
|
88
131
|
totalResults += result.totalResults;
|
|
89
132
|
skippedResults += result.skippedResults;
|
|
90
133
|
runs.push({ ...BUILTIN, status: 'completed', findings: result.findings.length, durationMs: Date.now() - t0 });
|
|
@@ -147,7 +190,9 @@ export async function runDvalinScanSuite(cwd, options = {}) {
|
|
|
147
190
|
}
|
|
148
191
|
const report = JSON.parse(await readFile(output, 'utf8'));
|
|
149
192
|
const result = await parseSarifForRemediation(report, { cwd: root });
|
|
150
|
-
|
|
193
|
+
// Stamp the engine here, where it is known. The delta needs it to tell
|
|
194
|
+
// "we looked and it is gone" from "this engine never ran".
|
|
195
|
+
findings.push(...result.findings.map(finding => ({ ...finding, scanner: scanner.descriptor.id })));
|
|
151
196
|
totalResults += result.totalResults;
|
|
152
197
|
skippedResults += result.skippedResults;
|
|
153
198
|
runs.push({ ...descriptor, status: 'completed', findings: result.findings.length, durationMs: Date.now() - t0 });
|
|
@@ -166,7 +211,13 @@ export async function runDvalinScanSuite(cwd, options = {}) {
|
|
|
166
211
|
finally {
|
|
167
212
|
await rm(resolvedOutputDir, { recursive: true, force: true });
|
|
168
213
|
}
|
|
169
|
-
|
|
214
|
+
// The builtin scanner is narrowed before it reads anything, but the external
|
|
215
|
+
// ones only take a root. Filtering here catches all of them at once, because
|
|
216
|
+
// `normalizeSarifPath` has already made every path workspace-relative.
|
|
217
|
+
const scoped = options.scope === undefined
|
|
218
|
+
? findings
|
|
219
|
+
: findings.filter(finding => isWithinDiffScope(options.scope, finding.path, finding.startLine));
|
|
220
|
+
const deduped = dedupeFindings(scoped);
|
|
170
221
|
const metrics = scanMetrics(deduped);
|
|
171
222
|
const score = scoreFindings(metrics);
|
|
172
223
|
return {
|
|
@@ -181,6 +232,7 @@ export async function runDvalinScanSuite(cwd, options = {}) {
|
|
|
181
232
|
skippedResults,
|
|
182
233
|
scanners: runs,
|
|
183
234
|
metrics,
|
|
235
|
+
...(options.scope === undefined ? {} : { scope: { ref: options.scope.ref, files: options.scope.files.size } }),
|
|
184
236
|
};
|
|
185
237
|
}
|
|
186
238
|
function scanMetrics(findings) {
|
|
@@ -255,4 +307,13 @@ function compactError(error) {
|
|
|
255
307
|
const message = error instanceof Error ? error.message : String(error);
|
|
256
308
|
return message.replace(/\s+/g, ' ').trim().slice(0, 500);
|
|
257
309
|
}
|
|
310
|
+
function scannerInstaller(id) {
|
|
311
|
+
if (id === 'semgrep')
|
|
312
|
+
return { command: 'python3', args: ['-m', 'pip', 'install', 'semgrep'] };
|
|
313
|
+
if (id === 'trivy')
|
|
314
|
+
return { command: 'brew', args: ['install', 'trivy'] };
|
|
315
|
+
if (id === 'osv-scanner')
|
|
316
|
+
return { command: 'brew', args: ['install', 'osv-scanner'] };
|
|
317
|
+
return null;
|
|
318
|
+
}
|
|
258
319
|
//# sourceMappingURL=scannerSuite.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scannerSuite.js","sourceRoot":"","sources":["../../src/remediation/scannerSuite.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"scannerSuite.js","sourceRoot":"","sources":["../../src/remediation/scannerSuite.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,kBAAkB,CAAC;AAC/D,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AACpC,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAC7D,OAAO,EAAE,gBAAgB,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAC;AACvF,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,EAAE,iBAAiB,EAAkB,MAAM,gBAAgB,CAAC;AACnE,OAAO,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AACtD,OAAO,EAAE,wBAAwB,EAA2B,MAAM,YAAY,CAAC;AAI/E,MAAM,CAAC,MAAM,kBAAkB,GAAsB,CAAC,SAAS,EAAE,SAAS,EAAE,OAAO,EAAE,aAAa,CAAC,CAAC;AA2DpG,MAAM,iBAAiB,GAAsB;IAC3C;QACE,UAAU,EAAE;YACV,EAAE,EAAE,SAAS;YACb,IAAI,EAAE,YAAY;YAClB,QAAQ,EAAE,MAAM;YAChB,WAAW,EAAE,0EAA0E;YACvF,cAAc,EAAE,gCAAgC;YAChD,QAAQ,EAAE,iDAAiD;SAC5D;QACD,OAAO,EAAE,SAAS;QAClB,IAAI,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,CAAC;YACtB,MAAM,EAAE,UAAU,EAAE,WAAW,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,EAAE,WAAW,EAAE,KAAK;YAClF,WAAW,EAAE,gBAAgB,EAAE,IAAI;SACpC;QACD,iBAAiB,EAAE,CAAC,CAAC,CAAC;KACvB;IACD;QACE,UAAU,EAAE;YACV,EAAE,EAAE,OAAO;YACX,IAAI,EAAE,OAAO;YACb,QAAQ,EAAE,kBAAkB;YAC5B,WAAW,EAAE,iFAAiF;YAC9F,cAAc,EAAE,oBAAoB;YACpC,QAAQ,EAAE,kDAAkD;SAC7D;QACD,OAAO,EAAE,OAAO;QAChB,IAAI,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,CAAC;YACtB,IAAI,EAAE,UAAU,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,YAAY,EAAE,uBAAuB;YACpF,eAAe,EAAE,aAAa,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM;YACrE,aAAa,EAAE,gBAAgB,EAAE,IAAI;SACtC;QACD,iBAAiB,EAAE,CAAC,CAAC,CAAC;KACvB;IACD;QACE,UAAU,EAAE;YACV,EAAE,EAAE,aAAa;YACjB,IAAI,EAAE,aAAa;YACnB,QAAQ,EAAE,cAAc;YACxB,WAAW,EAAE,2EAA2E;YACxF,cAAc,EAAE,0BAA0B;YAC1C,QAAQ,EAAE,uCAAuC;SAClD;QACD,OAAO,EAAE,aAAa;QACtB,IAAI,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,CAAC;YACtB,MAAM,EAAE,QAAQ,EAAE,aAAa,EAAE,UAAU,EAAE,OAAO,EAAE,eAAe,EAAE,MAAM,EAAE,IAAI;SACpF;QACD,iBAAiB,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,GAAG,CAAC;QAC9B,kBAAkB,EAAE,IAAI;KACzB;CACF,CAAC;AAEF,MAAM,OAAO,GAA4B;IACvC,EAAE,EAAE,SAAS;IACb,IAAI,EAAE,iBAAiB;IACvB,QAAQ,EAAE,SAAS;IACnB,WAAW,EAAE,uFAAuF;IACpG,SAAS,EAAE,IAAI;IACf,QAAQ,EAAE,4CAA4C;CACvD,CAAC;AAEF,MAAM,CAAC,KAAK,UAAU,kBAAkB;IACtC,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC,GAAG,CAAC,KAAK,EAAC,OAAO,EAAC,EAAE,CAAC,CAAC;QACzE,GAAG,OAAO,CAAC,UAAU;QACrB,SAAS,EAAE,OAAO,CAAC,MAAM,cAAc,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;KAC1D,CAAC,CAAC,CAAC,CAAC;IACL,OAAO,CAAC,OAAO,EAAE,GAAG,QAAQ,CAAC,CAAC;AAChC,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,wBAAwB,CAAC,EAAmB;IAC1D,IAAI,EAAE,KAAK,SAAS,EAAE,CAAC;QACrB,OAAO,EAAE,OAAO,EAAE,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,EAAE,kEAAkE,EAAE,CAAC;IACtH,CAAC;IACD,MAAM,OAAO,GAAG,iBAAiB,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,SAAS,CAAC,UAAU,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;IACpF,IAAI,CAAC,OAAO;QAAE,OAAO,EAAE,OAAO,EAAE,EAAE,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,EAAE,oBAAoB,EAAE,EAAE,EAAE,CAAC;IACzF,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,cAAc,EAAE,CAAC;QACvC,OAAO,EAAE,OAAO,EAAE,EAAE,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,EAAE,+CAA+C,OAAO,CAAC,UAAU,CAAC,IAAI,GAAG,EAAE,CAAC;IAC9H,CAAC;IACD,OAAO,EAAE,OAAO,EAAE,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,UAAU,CAAC,cAAc,EAAE,CAAC;AACtF,CAAC;AAED,qFAAqF;AACrF,MAAM,CAAC,KAAK,UAAU,oBAAoB,CAAC,GAAW,EAAE,EAAmB;IACzE,MAAM,MAAM,GAAG,gBAAgB,CAAC,EAAE,CAAC,CAAC;IACpC,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,IAAI,EAAE,KAAK,SAAS;YAAE,OAAO;QAC7B,MAAM,IAAI,KAAK,CAAC,yCAAyC,EAAE,GAAG,CAAC,CAAC;IAClE,CAAC;IACD,MAAM,MAAM,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC;IACtC,MAAM,WAAW,GAAG,gBAAgB,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;IAClE,MAAM,QAAQ,GAAG,YAAY,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;IACnD,IAAI,CAAC,QAAQ,CAAC,OAAO;QAAE,MAAM,IAAI,KAAK,CAAC,2CAA2C,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC;IACnG,MAAM,MAAM,GAAG,MAAM,qBAAqB,CAAC;QACzC,GAAG,MAAM;QACT,GAAG;QACH,SAAS,EAAE,OAAO;QAClB,MAAM;QACN,QAAQ,EAAE,0BAA0B;QACpC,6BAA6B,EAAE,KAAK;QACpC,kCAAkC,EAAE,IAAI;KACzC,CAAC,CAAC;IACH,IAAI,MAAM,CAAC,QAAQ,KAAK,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM,CAAC,OAAO,WAAW,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC;AACpH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,GAAW,EACX,OAAO,GAA4E,EAAE;IAErF,MAAM,IAAI,GAAG,MAAM,oBAAoB,CAAC,GAAG,CAAC,CAAC;IAC7C,MAAM,OAAO,GAAG,IAAI,IAAI,EAAE,CAAC;IAC3B,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,SAAS,EAAE,SAAS,EAAE,OAAO,EAAE,aAAa,CAAC,CAAC,CAAC;IACvH,MAAM,QAAQ,GAAyB,EAAE,CAAC;IAC1C,MAAM,IAAI,GAAuB,EAAE,CAAC;IACpC,IAAI,YAAY,GAAG,CAAC,CAAC;IACrB,IAAI,cAAc,GAAG,CAAC,CAAC;IAEvB,IAAI,QAAQ,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC;QAC5B,MAAM,EAAE,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACtB,MAAM,MAAM,GAAG,MAAM,oBAAoB,CAAC,IAAI,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC;QAC/D,QAAQ,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,EAAE,GAAG,OAAO,EAAE,OAAO,EAAE,SAAkB,EAAE,CAAC,CAAC,CAAC,CAAC;QAChG,YAAY,IAAI,MAAM,CAAC,YAAY,CAAC;QACpC,cAAc,IAAI,MAAM,CAAC,cAAc,CAAC;QACxC,IAAI,CAAC,IAAI,CAAC,EAAE,GAAG,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,UAAU,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC;IAChH,CAAC;IAED,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,gBAAgB,UAAU,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;IAC9E,MAAM,iBAAiB,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IAClD,MAAM,cAAc,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,iBAAiB,CAAC,CAAC;IAC9D,IAAI,cAAc,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,EAAE,CAAC;QACvE,MAAM,IAAI,KAAK,CAAC,kEAAkE,iBAAiB,EAAE,CAAC,CAAC;IACzG,CAAC;IACD,MAAM,KAAK,CAAC,iBAAiB,EAAE,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,CAAC;IACrD,IAAI,CAAC;QACH,KAAK,MAAM,OAAO,IAAI,iBAAiB,EAAE,CAAC;YACxC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC;gBAAE,SAAS;YACnD,MAAM,EAAE,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YACtB,MAAM,UAAU,GAAG,MAAM,cAAc,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;YACzD,MAAM,UAAU,GAA4B,EAAE,GAAG,OAAO,CAAC,UAAU,EAAE,SAAS,EAAE,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC;YACtG,IAAI,CAAC,UAAU,EAAE,CAAC;gBAChB,IAAI,CAAC,IAAI,CAAC,EAAE,GAAG,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,CAAC,EAAE,UAAU,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC;gBAC1F,SAAS;YACX,CAAC;YAED,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,GAAG,OAAO,CAAC,UAAU,CAAC,EAAE,QAAQ,CAAC,CAAC;YAC9E,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;YACxC,MAAM,YAAY,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC;YACtC,MAAM,WAAW,GAAG,gBAAgB,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;YAC5D,MAAM,eAAe,GAAG,YAAY,CAAC,YAAY,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;YACvE,IAAI,CAAC,eAAe,CAAC,OAAO,EAAE,CAAC;gBAC7B,IAAI,CAAC,IAAI,CAAC;oBACR,GAAG,UAAU;oBACb,MAAM,EAAE,OAAO;oBACf,QAAQ,EAAE,CAAC;oBACX,UAAU,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,EAAE;oBAC3B,KAAK,EAAE,sBAAsB,eAAe,CAAC,IAAI,EAAE;iBACpD,CAAC,CAAC;gBACH,SAAS;YACX,CAAC;YAED,IAAI,CAAC;gBACH,MAAM,aAAa,GAAG,MAAM,qBAAqB,CAAC;oBAChD,OAAO,EAAE,OAAO,CAAC,OAAO;oBACxB,IAAI;oBACJ,GAAG,EAAE,IAAI;oBACT,SAAS,EAAE,OAAO,CAAC,SAAS,IAAI,OAAO;oBACvC,MAAM,EAAE,YAAY,CAAC,MAAM;oBAC3B,QAAQ,EAAE,oBAAoB;oBAC9B,6BAA6B,EAAE,IAAI;oBACnC,kCAAkC,EAAE,IAAI;iBACzC,CAAC,CAAC;gBACH,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,QAAQ,CAAC,aAAa,CAAC,QAAQ,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;oBACtE,MAAM,IAAI,KAAK,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,UAAU,CAAC,IAAI,WAAW,aAAa,CAAC,QAAQ,EAAE,CAAC,CAAC;gBAChH,CAAC;gBACD,IAAI,OAAO,CAAC,kBAAkB,EAAE,CAAC;oBAC/B,IAAI,CAAC;wBACH,MAAM,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,IAAI,CAAC,CAAC;oBACvC,CAAC;oBAAC,MAAM,CAAC;wBACP,IAAI,CAAC,IAAI,CAAC,EAAE,GAAG,UAAU,EAAE,MAAM,EAAE,WAAW,EAAE,QAAQ,EAAE,CAAC,EAAE,UAAU,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC;wBAC5F,SAAS;oBACX,CAAC;gBACH,CAAC;gBACD,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,CAAY,CAAC;gBACrE,MAAM,MAAM,GAAG,MAAM,wBAAwB,CAAC,MAAM,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC;gBACrE,uEAAuE;gBACvE,2DAA2D;gBAC3D,QAAQ,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,EAAE,GAAG,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,UAAU,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC;gBACnG,YAAY,IAAI,MAAM,CAAC,YAAY,CAAC;gBACpC,cAAc,IAAI,MAAM,CAAC,cAAc,CAAC;gBACxC,IAAI,CAAC,IAAI,CAAC,EAAE,GAAG,UAAU,EAAE,MAAM,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,UAAU,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC;YACnH,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,IAAI,CAAC,IAAI,CAAC;oBACR,GAAG,UAAU;oBACb,MAAM,EAAE,OAAO;oBACf,QAAQ,EAAE,CAAC;oBACX,UAAU,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,EAAE;oBAC3B,KAAK,EAAE,YAAY,CAAC,KAAK,CAAC;iBAC3B,CAAC,CAAC;YACL,CAAC;QACH,CAAC;IACH,CAAC;YAAS,CAAC;QACT,MAAM,EAAE,CAAC,iBAAiB,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IAChE,CAAC;IAED,6EAA6E;IAC7E,6EAA6E;IAC7E,uEAAuE;IACvE,MAAM,MAAM,GAAG,OAAO,CAAC,KAAK,KAAK,SAAS;QACxC,CAAC,CAAC,QAAQ;QACV,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,iBAAiB,CAAC,OAAO,CAAC,KAAM,EAAE,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC;IACnG,MAAM,OAAO,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC;IACvC,MAAM,OAAO,GAAG,WAAW,CAAC,OAAO,CAAC,CAAC;IACrC,MAAM,KAAK,GAAG,aAAa,CAAC,OAAO,CAAC,CAAC;IACrC,OAAO;QACL,EAAE,EAAE,QAAQ,OAAO,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC,EAAE;QACzD,MAAM,EAAE,uBAAuB;QAC/B,SAAS,EAAE,OAAO,CAAC,WAAW,EAAE;QAChC,WAAW,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;QACrC,KAAK;QACL,KAAK,EAAE,QAAQ,CAAC,KAAK,CAAC;QACtB,QAAQ,EAAE,OAAO;QACjB,YAAY;QACZ,cAAc;QACd,QAAQ,EAAE,IAAI;QACd,OAAO;QACP,GAAG,CAAC,OAAO,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,GAAG,EAAE,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,EAAE,EAAE,CAAC;KAC/G,CAAC;AACJ,CAAC;AAED,SAAS,WAAW,CAAC,QAA8B;IACjD,MAAM,OAAO,GAAsB,EAAE,QAAQ,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC;IACnG,MAAM,KAAK,GAAG,IAAI,GAAG,EAAU,CAAC;IAChC,MAAM,KAAK,GAAG,IAAI,GAAG,EAAU,CAAC;IAChC,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;QAC/B,MAAM,KAAK,GAAG,MAAM,CAAC,UAAU,CAAC,OAAO,CAAC,gBAAgB,IAAI,EAAE,CAAC,CAAC;QAChE,IAAI,KAAK,IAAI,CAAC;YAAE,OAAO,CAAC,QAAQ,EAAE,CAAC;aAC9B,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,IAAI,KAAK,IAAI,CAAC;YAAE,OAAO,CAAC,IAAI,EAAE,CAAC;aAC/D,IAAI,OAAO,CAAC,QAAQ,KAAK,SAAS,IAAI,KAAK,IAAI,CAAC;YAAE,OAAO,CAAC,MAAM,EAAE,CAAC;;YACnE,OAAO,CAAC,GAAG,EAAE,CAAC;QACnB,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QACxB,KAAK,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,MAAM,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IACnD,CAAC;IACD,OAAO,CAAC,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC;IAC3B,OAAO,CAAC,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC;IAC3B,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,SAAS,aAAa,CAAC,OAA0B;IAC/C,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,GAAG,OAAO,CAAC,QAAQ,GAAG,EAAE,GAAG,OAAO,CAAC,IAAI,GAAG,EAAE,GAAG,OAAO,CAAC,MAAM,GAAG,CAAC,GAAG,OAAO,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC;AAC7G,CAAC;AAED,SAAS,QAAQ,CAAC,KAAa;IAC7B,IAAI,KAAK,IAAI,EAAE;QAAE,OAAO,GAAG,CAAC;IAC5B,IAAI,KAAK,IAAI,EAAE;QAAE,OAAO,GAAG,CAAC;IAC5B,IAAI,KAAK,IAAI,EAAE;QAAE,OAAO,GAAG,CAAC;IAC5B,IAAI,KAAK,IAAI,EAAE;QAAE,OAAO,GAAG,CAAC;IAC5B,OAAO,GAAG,CAAC;AACb,CAAC;AAED,SAAS,cAAc,CAAC,QAA8B;IACpD,MAAM,MAAM,GAAG,IAAI,GAAG,EAA8B,CAAC;IACrD,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;QAC/B,MAAM,GAAG,GAAG,GAAG,OAAO,CAAC,MAAM,IAAI,OAAO,CAAC,MAAM,IAAI,OAAO,CAAC,IAAI,IAAI,OAAO,CAAC,SAAS,IAAI,CAAC,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;QAC/G,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC;YAAE,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IACjD,CAAC;IACD,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,cAAc,CAAC,CAAC,CAAC,GAAG,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC;AACpF,CAAC;AAED,SAAS,cAAc,CAAC,OAA2B;IACjD,MAAM,KAAK,GAAG,MAAM,CAAC,UAAU,CAAC,OAAO,CAAC,gBAAgB,IAAI,EAAE,CAAC,CAAC;IAChE,IAAI,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC;QAAE,OAAO,KAAK,CAAC;IACzC,OAAO,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AACnF,CAAC;AAED,KAAK,UAAU,cAAc,CAAC,OAAe;IAC3C,MAAM,UAAU,GAAG,OAAO,CAAC,QAAQ,KAAK,OAAO;QAC7C,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,IAAI,gBAAgB,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC;QACtD,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;IACT,KAAK,MAAM,SAAS,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC;QACvF,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;YACnC,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,GAAG,OAAO,GAAG,SAAS,EAAE,CAAC,CAAC;YACjE,IAAI,CAAC;gBACH,MAAM,MAAM,CAAC,SAAS,EAAE,SAAS,CAAC,IAAI,CAAC,CAAC;gBACxC,OAAO,SAAS,CAAC;YACnB,CAAC;YAAC,MAAM,CAAC;gBACP,2BAA2B;YAC7B,CAAC;QACH,CAAC;IACH,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,SAAS,YAAY,CAAC,KAAc;IAClC,MAAM,OAAO,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IACvE,OAAO,OAAO,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;AAC3D,CAAC;AAED,SAAS,gBAAgB,CAAC,EAAmB;IAC3C,IAAI,EAAE,KAAK,SAAS;QAAE,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,IAAI,EAAE,KAAK,EAAE,SAAS,EAAE,SAAS,CAAC,EAAE,CAAC;IAC/F,IAAI,EAAE,KAAK,OAAO;QAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,SAAS,EAAE,OAAO,CAAC,EAAE,CAAC;IAC3E,IAAI,EAAE,KAAK,aAAa;QAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,SAAS,EAAE,aAAa,CAAC,EAAE,CAAC;IACvF,OAAO,IAAI,CAAC;AACd,CAAC"}
|
|
@@ -0,0 +1,38 @@
|
|
|
1
|
+
import { type CheckKind } from '../tools/runCheck.js';
|
|
2
|
+
import type { AuditSink } from '../audit/log.js';
|
|
3
|
+
import type { SecurityCheckEvidence } from '../security/workflow.js';
|
|
4
|
+
export type VerificationRun = {
|
|
5
|
+
evidence: SecurityCheckEvidence[];
|
|
6
|
+
/** Checks that could not be found in this project, so nothing was run for them. */
|
|
7
|
+
skipped: CheckKind[];
|
|
8
|
+
};
|
|
9
|
+
export type VerifyOptions = {
|
|
10
|
+
cwd: string;
|
|
11
|
+
/** Explicit commands, for projects whose checks cannot be detected. */
|
|
12
|
+
commands?: string[];
|
|
13
|
+
/** Which project checks to look for. Defaults to test, typecheck, build. */
|
|
14
|
+
kinds?: CheckKind[];
|
|
15
|
+
timeoutMs?: number;
|
|
16
|
+
/**
|
|
17
|
+
* Write each executed check into the hash-chained audit log.
|
|
18
|
+
*
|
|
19
|
+
* Without this the exit codes exist only in memory: the verdict is sound but
|
|
20
|
+
* nothing afterwards can show what was run. A Verified Fix Record anchors to
|
|
21
|
+
* the chain, so the chain has to contain the checks.
|
|
22
|
+
*/
|
|
23
|
+
audit?: AuditSink;
|
|
24
|
+
};
|
|
25
|
+
export declare function runProjectVerification(options: VerifyOptions): Promise<VerificationRun>;
|
|
26
|
+
/**
|
|
27
|
+
* Split a configured command into argv.
|
|
28
|
+
*
|
|
29
|
+
* Deliberately not a shell: a check command is a program and its arguments, and
|
|
30
|
+
* running it through a shell would hand the project's own configuration a way
|
|
31
|
+
* to run something else. Quotes are honoured only so an argument may contain a
|
|
32
|
+
* space — `npm test -- --grep "two words"` — and nothing else about them is
|
|
33
|
+
* interpreted.
|
|
34
|
+
*/
|
|
35
|
+
export declare function splitCommand(commandLine: string): {
|
|
36
|
+
command: string;
|
|
37
|
+
args: string[];
|
|
38
|
+
};
|
|
@@ -0,0 +1,116 @@
|
|
|
1
|
+
import { checkCommand, loadPolicy } from '../core/policy.js';
|
|
2
|
+
import { runGovernedProcess } from '../core/subprocessSandbox.js';
|
|
3
|
+
import { pickProjectCheck } from '../tools/runCheck.js';
|
|
4
|
+
import { sha256 } from '../audit/hash.js';
|
|
5
|
+
/**
|
|
6
|
+
* Dvalin runs the project's checks itself.
|
|
7
|
+
*
|
|
8
|
+
* Asking the agent that just wrote a patch whether its patch is good is the one
|
|
9
|
+
* question it is least able to answer honestly, and no amount of prompt
|
|
10
|
+
* wording fixes that. Running the commands here means the exit codes in the
|
|
11
|
+
* verification gate are observed, not reported — which is what lets the choice
|
|
12
|
+
* of remediation executor be a question of cost and quality rather than trust.
|
|
13
|
+
*/
|
|
14
|
+
const DEFAULT_KINDS = ['test', 'typecheck', 'build'];
|
|
15
|
+
export async function runProjectVerification(options) {
|
|
16
|
+
const timeoutMs = options.timeoutMs ?? 300_000;
|
|
17
|
+
const policy = loadPolicy(options.cwd).policy;
|
|
18
|
+
const evidence = [];
|
|
19
|
+
const skipped = [];
|
|
20
|
+
if (options.commands?.length) {
|
|
21
|
+
for (const commandLine of options.commands) {
|
|
22
|
+
evidence.push(await runOne('custom', splitCommand(commandLine), options.cwd, policy, timeoutMs, options.audit));
|
|
23
|
+
}
|
|
24
|
+
return { evidence, skipped };
|
|
25
|
+
}
|
|
26
|
+
// `kinds: []` is a project saying "run no checks", which is different from
|
|
27
|
+
// not asking. It leads to an unverifiable record, which is the honest result.
|
|
28
|
+
for (const kind of options.kinds ?? DEFAULT_KINDS) {
|
|
29
|
+
const picked = await pickProjectCheck(options.cwd, kind, []);
|
|
30
|
+
if (!picked) {
|
|
31
|
+
skipped.push(kind);
|
|
32
|
+
continue;
|
|
33
|
+
}
|
|
34
|
+
evidence.push(await runOne(kind, picked, options.cwd, policy, timeoutMs, options.audit));
|
|
35
|
+
}
|
|
36
|
+
return { evidence, skipped };
|
|
37
|
+
}
|
|
38
|
+
async function runOne(kind, picked, cwd, policy, timeoutMs, audit) {
|
|
39
|
+
const commandLine = [picked.command, ...picked.args].join(' ');
|
|
40
|
+
try {
|
|
41
|
+
return await execute(kind, picked, commandLine, cwd, policy, timeoutMs, audit);
|
|
42
|
+
}
|
|
43
|
+
catch (error) {
|
|
44
|
+
// A check that could not be executed did not pass. Letting the throw escape
|
|
45
|
+
// would abandon the remaining checks and lose the verification entirely,
|
|
46
|
+
// when the honest record is simply that this one produced no exit code.
|
|
47
|
+
audit?.append({
|
|
48
|
+
type: 'tool_call',
|
|
49
|
+
tool: 'run_check',
|
|
50
|
+
argsSummary: `${kind}: ${error instanceof Error ? error.message : String(error)}`,
|
|
51
|
+
status: 'error',
|
|
52
|
+
durationMs: 0,
|
|
53
|
+
});
|
|
54
|
+
return { kind, command: commandLine, exitCode: null, passed: false };
|
|
55
|
+
}
|
|
56
|
+
}
|
|
57
|
+
async function execute(kind, picked, commandLine, cwd, policy, timeoutMs, audit) {
|
|
58
|
+
// The same gate every other governed command passes. A policy that forbids a
|
|
59
|
+
// command does not get bypassed because the caller is the verifier.
|
|
60
|
+
const decision = checkCommand(policy, commandLine);
|
|
61
|
+
if (!decision.allowed) {
|
|
62
|
+
audit?.append({ type: 'policy_violation', rule: decision.rule ?? 'command denied', tool: 'run_check', target: picked.command });
|
|
63
|
+
return { kind, command: commandLine, exitCode: null, passed: false };
|
|
64
|
+
}
|
|
65
|
+
const startedAt = Date.now();
|
|
66
|
+
const result = await runGovernedProcess({
|
|
67
|
+
command: picked.command,
|
|
68
|
+
args: picked.args,
|
|
69
|
+
cwd,
|
|
70
|
+
timeoutMs,
|
|
71
|
+
policy,
|
|
72
|
+
toolName: 'dvalin_verify',
|
|
73
|
+
preferSandboxWhenUnrestricted: true,
|
|
74
|
+
});
|
|
75
|
+
// Same shape the tool-layer tap emits for `run_check`, so anything already
|
|
76
|
+
// reading the chain for check evidence keeps working.
|
|
77
|
+
audit?.append({
|
|
78
|
+
type: 'tool_call',
|
|
79
|
+
tool: 'run_check',
|
|
80
|
+
argsSummary: kind,
|
|
81
|
+
status: result.exitCode === 0 && !result.timedOut ? 'ok' : 'error',
|
|
82
|
+
durationMs: Date.now() - startedAt,
|
|
83
|
+
});
|
|
84
|
+
audit?.append({
|
|
85
|
+
type: 'shell_exec',
|
|
86
|
+
command: picked.command,
|
|
87
|
+
argsCount: picked.args.length,
|
|
88
|
+
inputHash: sha256(commandLine),
|
|
89
|
+
exitCode: result.exitCode,
|
|
90
|
+
sandbox: result.sandbox === 'seatbelt' || result.sandbox === 'bwrap' ? result.sandbox : 'none',
|
|
91
|
+
});
|
|
92
|
+
return {
|
|
93
|
+
kind,
|
|
94
|
+
command: commandLine,
|
|
95
|
+
exitCode: result.exitCode,
|
|
96
|
+
// A timeout is not a pass, whatever the exit code ends up being.
|
|
97
|
+
passed: result.exitCode === 0 && !result.timedOut,
|
|
98
|
+
};
|
|
99
|
+
}
|
|
100
|
+
/**
|
|
101
|
+
* Split a configured command into argv.
|
|
102
|
+
*
|
|
103
|
+
* Deliberately not a shell: a check command is a program and its arguments, and
|
|
104
|
+
* running it through a shell would hand the project's own configuration a way
|
|
105
|
+
* to run something else. Quotes are honoured only so an argument may contain a
|
|
106
|
+
* space — `npm test -- --grep "two words"` — and nothing else about them is
|
|
107
|
+
* interpreted.
|
|
108
|
+
*/
|
|
109
|
+
export function splitCommand(commandLine) {
|
|
110
|
+
const parts = commandLine.match(/"[^"]*"|'[^']*'|\S+/g) ?? [];
|
|
111
|
+
const argv = parts.map(part => (part.startsWith('"') && part.endsWith('"')) || (part.startsWith("'") && part.endsWith("'"))
|
|
112
|
+
? part.slice(1, -1)
|
|
113
|
+
: part);
|
|
114
|
+
return { command: argv[0] ?? '', args: argv.slice(1) };
|
|
115
|
+
}
|
|
116
|
+
//# sourceMappingURL=verify.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"verify.js","sourceRoot":"","sources":["../../src/remediation/verify.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
import type { DvalinScanSuiteResult } from '../remediation/scannerSuite.js';
|
|
2
|
+
import { type SecurityBaseline } from './contracts.js';
|
|
3
|
+
export declare function readSecurityBaseline(root: string, file: string): Promise<SecurityBaseline>;
|
|
4
|
+
export declare function writeSecurityBaseline(root: string, file: string, result: DvalinScanSuiteResult): Promise<{
|
|
5
|
+
path: string;
|
|
6
|
+
baseline: SecurityBaseline;
|
|
7
|
+
}>;
|
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
import { mkdir, readFile, writeFile } from 'node:fs/promises';
|
|
2
|
+
import path from 'node:path';
|
|
3
|
+
import { UsageError } from '../core/exitCodes.js';
|
|
4
|
+
import { createBaseline, isSecurityBaseline } from './contracts.js';
|
|
5
|
+
import { resolveSecurityPath } from './config.js';
|
|
6
|
+
export async function readSecurityBaseline(root, file) {
|
|
7
|
+
const target = resolveSecurityPath(root, file);
|
|
8
|
+
let parsed;
|
|
9
|
+
try {
|
|
10
|
+
parsed = JSON.parse(await readFile(target, 'utf8'));
|
|
11
|
+
}
|
|
12
|
+
catch (error) {
|
|
13
|
+
throw new UsageError(`Cannot read security baseline ${target}: ${error instanceof Error ? error.message : String(error)}`);
|
|
14
|
+
}
|
|
15
|
+
if (!isSecurityBaseline(parsed))
|
|
16
|
+
throw new UsageError(`Invalid or unsupported security baseline: ${target}`);
|
|
17
|
+
return parsed;
|
|
18
|
+
}
|
|
19
|
+
export async function writeSecurityBaseline(root, file, result) {
|
|
20
|
+
const target = resolveSecurityPath(root, file);
|
|
21
|
+
const baseline = createBaseline(result);
|
|
22
|
+
await mkdir(path.dirname(target), { recursive: true });
|
|
23
|
+
await writeFile(target, `${JSON.stringify(baseline, null, 2)}\n`, 'utf8');
|
|
24
|
+
return { path: target, baseline };
|
|
25
|
+
}
|
|
26
|
+
//# sourceMappingURL=baseline.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"baseline.js","sourceRoot":"","sources":["../../src/security/baseline.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC9D,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAElD,OAAO,EAAE,cAAc,EAAE,kBAAkB,EAAyB,MAAM,gBAAgB,CAAC;AAC3F,OAAO,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAElD,MAAM,CAAC,KAAK,UAAU,oBAAoB,CAAC,IAAY,EAAE,IAAY;IACnE,MAAM,MAAM,GAAG,mBAAmB,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAC/C,IAAI,MAAe,CAAC;IACpB,IAAI,CAAC;QACH,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,CAAY,CAAC;IACjE,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,IAAI,UAAU,CAAC,iCAAiC,MAAM,KAAK,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;IAC7H,CAAC;IACD,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC;QAAE,MAAM,IAAI,UAAU,CAAC,6CAA6C,MAAM,EAAE,CAAC,CAAC;IAC7G,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,qBAAqB,CAAC,IAAY,EAAE,IAAY,EAAE,MAA6B;IAInG,MAAM,MAAM,GAAG,mBAAmB,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAC/C,MAAM,QAAQ,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC;IACxC,MAAM,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IACvD,MAAM,SAAS,CAAC,MAAM,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAC1E,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC;AACpC,CAAC"}
|
|
@@ -0,0 +1,32 @@
|
|
|
1
|
+
import type { DvalinScannerId } from '../remediation/scannerSuite.js';
|
|
2
|
+
import type { SecurityGateMode, SecurityThreshold } from './contracts.js';
|
|
3
|
+
export declare const SECURITY_CONFIG_FILE = "dvalin.security.json";
|
|
4
|
+
export declare const DEFAULT_BASELINE_FILE = ".dvalin/baseline.json";
|
|
5
|
+
export type SecuritySuppression = {
|
|
6
|
+
fingerprint?: string;
|
|
7
|
+
ruleId?: string;
|
|
8
|
+
path?: string;
|
|
9
|
+
reason: string;
|
|
10
|
+
owner?: string;
|
|
11
|
+
expiresAt?: string;
|
|
12
|
+
};
|
|
13
|
+
export type DvalinSecurityConfig = {
|
|
14
|
+
version: 1;
|
|
15
|
+
scanners: DvalinScannerId[];
|
|
16
|
+
gate: {
|
|
17
|
+
severity: SecurityThreshold;
|
|
18
|
+
mode: SecurityGateMode;
|
|
19
|
+
};
|
|
20
|
+
baseline: string;
|
|
21
|
+
checks: Array<'test' | 'typecheck' | 'build' | 'lint'>;
|
|
22
|
+
suppressions: SecuritySuppression[];
|
|
23
|
+
};
|
|
24
|
+
export declare const DEFAULT_SECURITY_CONFIG: DvalinSecurityConfig;
|
|
25
|
+
export declare const INITIALIZED_SECURITY_CONFIG: DvalinSecurityConfig;
|
|
26
|
+
export declare function loadSecurityConfig(root: string, explicitPath?: string): Promise<{
|
|
27
|
+
config: DvalinSecurityConfig;
|
|
28
|
+
path?: string;
|
|
29
|
+
}>;
|
|
30
|
+
export declare function writeInitialSecurityConfig(root: string, force?: boolean): Promise<string>;
|
|
31
|
+
export declare function parseSecurityConfig(value: unknown, source?: string): DvalinSecurityConfig;
|
|
32
|
+
export declare function resolveSecurityPath(root: string, candidate: string): string;
|