dvalincode 0.12.0 → 0.14.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 +122 -24
- package/README.zh-CN.md +52 -4
- package/dist/agent/compact.d.ts +4 -2
- package/dist/agent/compact.js +41 -7
- package/dist/agent/compact.js.map +1 -1
- package/dist/agent/loop.js +30 -31
- package/dist/agent/loop.js.map +1 -1
- package/dist/agent/modes.d.ts +2 -2
- package/dist/agent/modes.js +6 -3
- package/dist/agent/modes.js.map +1 -1
- package/dist/agent/runner.d.ts +14 -6
- package/dist/agent/runner.js +370 -75
- package/dist/agent/runner.js.map +1 -1
- package/dist/agent/session.d.ts +3 -1
- package/dist/agent/session.js +23 -2
- package/dist/agent/session.js.map +1 -1
- package/dist/agent/types.d.ts +10 -5
- package/dist/agent/types.js +12 -2
- package/dist/agent/types.js.map +1 -1
- package/dist/audit/log.d.ts +4 -1
- package/dist/audit/log.js.map +1 -1
- package/dist/audit/report.js +5 -0
- package/dist/audit/report.js.map +1 -1
- package/dist/cli.js +6 -1
- package/dist/cli.js.map +1 -1
- package/dist/commands/chat.js +1 -1
- package/dist/commands/chat.js.map +1 -1
- package/dist/commands/dvalin.d.ts +9 -0
- package/dist/commands/dvalin.js +222 -0
- package/dist/commands/dvalin.js.map +1 -0
- package/dist/commands/provider.js +3 -3
- package/dist/commands/provider.js.map +1 -1
- package/dist/commands/tui.js +2 -2
- package/dist/commands/tui.js.map +1 -1
- package/dist/commands/update.d.ts +2 -0
- package/dist/commands/update.js +238 -0
- package/dist/commands/update.js.map +1 -0
- package/dist/core/context.d.ts +4 -0
- package/dist/core/context.js +8 -1
- package/dist/core/context.js.map +1 -1
- package/dist/core/guiUpdate.d.ts +27 -0
- package/dist/core/guiUpdate.js +65 -0
- package/dist/core/guiUpdate.js.map +1 -0
- package/dist/core/policy.d.ts +6 -3
- package/dist/core/policy.js +8 -1
- package/dist/core/policy.js.map +1 -1
- package/dist/core/selfUpdate.d.ts +108 -0
- package/dist/core/selfUpdate.js +180 -0
- package/dist/core/selfUpdate.js.map +1 -0
- package/dist/core/subprocessSandbox.d.ts +16 -0
- package/dist/core/subprocessSandbox.js +168 -28
- package/dist/core/subprocessSandbox.js.map +1 -1
- package/dist/core/trust.d.ts +8 -0
- package/dist/core/trust.js +1 -10
- package/dist/core/trust.js.map +1 -1
- package/dist/core/workspace.js +2 -1
- package/dist/core/workspace.js.map +1 -1
- package/dist/providers/anthropic.d.ts +14 -0
- package/dist/providers/anthropic.js +244 -0
- package/dist/providers/anthropic.js.map +1 -0
- package/dist/providers/manager.d.ts +3 -0
- package/dist/providers/manager.js +13 -2
- package/dist/providers/manager.js.map +1 -1
- package/dist/providers/openaiCompatible.d.ts +12 -1
- package/dist/providers/openaiCompatible.js +21 -6
- package/dist/providers/openaiCompatible.js.map +1 -1
- package/dist/providers/pool.js +3 -4
- package/dist/providers/pool.js.map +1 -1
- package/dist/providers/trustedBaseUrls.js +1 -0
- package/dist/providers/trustedBaseUrls.js.map +1 -1
- package/dist/providers/types.d.ts +20 -4
- package/dist/remediation/automate.d.ts +18 -0
- package/dist/remediation/automate.js +78 -0
- package/dist/remediation/automate.js.map +1 -0
- package/dist/remediation/localScan.js +9 -1
- package/dist/remediation/localScan.js.map +1 -1
- package/dist/remediation/sarif.js +18 -4
- package/dist/remediation/sarif.js.map +1 -1
- package/dist/remediation/scannerSuite.d.ts +43 -0
- package/dist/remediation/scannerSuite.js +248 -0
- package/dist/remediation/scannerSuite.js.map +1 -0
- package/dist/server/routes/config.js +2 -3
- package/dist/server/routes/config.js.map +1 -1
- package/dist/server/routes/remediation.js +34 -0
- package/dist/server/routes/remediation.js.map +1 -1
- package/dist/server/scannerWorkspaceGrants.d.ts +7 -0
- package/dist/server/scannerWorkspaceGrants.js +48 -0
- package/dist/server/scannerWorkspaceGrants.js.map +1 -0
- package/dist/server/security.js +20 -6
- package/dist/server/security.js.map +1 -1
- package/dist/server/wsHandler.js.map +1 -1
- package/dist/skills/store.js +28 -0
- package/dist/skills/store.js.map +1 -1
- package/dist/tools/registry.d.ts +7 -0
- package/dist/tools/registry.js +30 -0
- package/dist/tools/registry.js.map +1 -1
- package/dist/tools/runCheck.js +1 -0
- package/dist/tools/runCheck.js.map +1 -1
- package/dist/tools/runSecuritySuite.d.ts +14 -0
- package/dist/tools/runSecuritySuite.js +35 -0
- package/dist/tools/runSecuritySuite.js.map +1 -0
- package/dist/tools/shell.d.ts +3 -1
- package/dist/tools/shell.js +16 -6
- package/dist/tools/shell.js.map +1 -1
- package/dist/tui/app.d.ts +1 -0
- package/dist/tui/app.js +110 -16
- package/dist/tui/app.js.map +1 -1
- package/dist/tui/presets.d.ts +2 -2
- package/dist/tui/presets.js +1 -0
- package/dist/tui/presets.js.map +1 -1
- package/dist/tui/render.js +2 -1
- package/dist/tui/render.js.map +1 -1
- package/dist/version.d.ts +8 -0
- package/dist/version.js +9 -0
- package/dist/version.js.map +1 -0
- package/package.json +4 -3
|
@@ -0,0 +1,78 @@
|
|
|
1
|
+
export const VERIFICATION_MARKER = 'DVALIN_VERIFICATION_PASSED';
|
|
2
|
+
function findingKey(finding) {
|
|
3
|
+
return `${finding.source}\0${finding.ruleId}\0${finding.path}`;
|
|
4
|
+
}
|
|
5
|
+
function severityWeight(finding) {
|
|
6
|
+
const score = Number.parseFloat(finding.securitySeverity ?? '');
|
|
7
|
+
if (Number.isFinite(score))
|
|
8
|
+
return score;
|
|
9
|
+
return finding.severity === 'error' ? 8 : finding.severity === 'warning' ? 5 : 1;
|
|
10
|
+
}
|
|
11
|
+
export function buildAutomatedFixPrompt(findings, worktreeContext) {
|
|
12
|
+
return [
|
|
13
|
+
'Perform an automated Dvalin remediation for the scanner findings below.',
|
|
14
|
+
worktreeContext ?? '',
|
|
15
|
+
'',
|
|
16
|
+
...findings.map((finding, index) => [
|
|
17
|
+
`${index + 1}. ${finding.source} / ${finding.ruleId}`,
|
|
18
|
+
` ${finding.path}${finding.startLine ? `:${finding.startLine}` : ''}`,
|
|
19
|
+
` ${finding.message}`,
|
|
20
|
+
].join('\n')),
|
|
21
|
+
'',
|
|
22
|
+
'Required workflow:',
|
|
23
|
+
'1. Reproduce or validate every finding against reachable source and data flow before editing. Treat scanner output as a hypothesis and explicitly reject false positives.',
|
|
24
|
+
'2. Fix confirmed vulnerabilities with the smallest behavior-preserving change. Never weaken tests, add scanner suppressions, or edit generated/vendor code to hide a result.',
|
|
25
|
+
'3. Add or update focused regression tests only when they demonstrate the vulnerable behavior without embedding live credentials.',
|
|
26
|
+
'4. Run focused checks for changed code and inspect git diff for unrelated edits.',
|
|
27
|
+
'5. Do not commit, push, publish a pull request, or merge in this phase.',
|
|
28
|
+
'Return a concise summary of confirmed fixes, rejected findings, changed files, and checks run.',
|
|
29
|
+
].filter(Boolean).join('\n');
|
|
30
|
+
}
|
|
31
|
+
export function buildAutomatedVerificationPrompt(findings, scanners) {
|
|
32
|
+
return [
|
|
33
|
+
'Verify the Dvalin remediation. Do not make further code changes unless a focused test cannot run because of a trivial fix introduced in this same remediation.',
|
|
34
|
+
'',
|
|
35
|
+
`Original findings: ${findings.map(finding => `${finding.ruleId} at ${finding.path}`).join('; ')}`,
|
|
36
|
+
`Scanner set: ${scanners.join(', ')}`,
|
|
37
|
+
'',
|
|
38
|
+
'Hard verification requirements:',
|
|
39
|
+
'1. Inspect git status and the complete diff. Fail on unrelated changes, test weakening, scanner suppression, generated artifacts, or secrets.',
|
|
40
|
+
'2. Run focused tests covering every changed area. Then run the project typecheck/build/test command that is proportionate to the change.',
|
|
41
|
+
'3. Run the Dvalin security suite again and confirm the original finding class is gone without introducing a new high/critical finding.',
|
|
42
|
+
'4. If any required command fails, evidence is missing, or a finding remains, explain the failure and end with DVALIN_VERIFICATION_FAILED.',
|
|
43
|
+
`5. Only when every requirement passes, end the response with the exact standalone line ${VERIFICATION_MARKER}.`,
|
|
44
|
+
].join('\n');
|
|
45
|
+
}
|
|
46
|
+
export function buildDraftPrPrompt(findings) {
|
|
47
|
+
return [
|
|
48
|
+
'The independent Dvalin verification gate passed. Publish this isolated remediation branch as a draft pull request.',
|
|
49
|
+
'',
|
|
50
|
+
`Remediated findings: ${findings.map(finding => `${finding.ruleId} (${finding.path})`).join('; ')}`,
|
|
51
|
+
'',
|
|
52
|
+
'Re-check git status and diff, commit only the remediation changes, push the current branch, and create a draft PR with gh.',
|
|
53
|
+
'The PR body must include vulnerability impact, source validation, changed files, tests and scanner evidence, and remaining risk.',
|
|
54
|
+
'Do not merge the PR and do not mark it ready for review. Return the draft PR URL.',
|
|
55
|
+
].join('\n');
|
|
56
|
+
}
|
|
57
|
+
export function evaluateVerificationGate(input) {
|
|
58
|
+
const reasons = [];
|
|
59
|
+
const originalKeys = new Set(input.originals.map(findingKey));
|
|
60
|
+
const baselineKeys = new Set((input.baseline ?? input.originals).map(findingKey));
|
|
61
|
+
const afterKeys = new Set(input.after.findings.map(findingKey));
|
|
62
|
+
const remaining = [...originalKeys].filter(key => afterKeys.has(key));
|
|
63
|
+
if (remaining.length)
|
|
64
|
+
reasons.push(`${remaining.length} original finding target(s) remain after re-scan`);
|
|
65
|
+
const newSevere = input.after.findings.filter(finding => severityWeight(finding) >= 7 && !baselineKeys.has(findingKey(finding)));
|
|
66
|
+
if (newSevere.length)
|
|
67
|
+
reasons.push(`${newSevere.length} new high/critical finding target(s) appeared`);
|
|
68
|
+
if (!input.hasChanges)
|
|
69
|
+
reasons.push('the remediation worktree has no code changes');
|
|
70
|
+
const markerPattern = new RegExp(`(?:^|\\n)${VERIFICATION_MARKER}(?:\\n|$)`);
|
|
71
|
+
if (!markerPattern.test(input.agentOutput.trim()))
|
|
72
|
+
reasons.push('focused tests/build were not reported as passing');
|
|
73
|
+
return { passed: reasons.length === 0, reasons };
|
|
74
|
+
}
|
|
75
|
+
export function extractDraftPrUrl(output) {
|
|
76
|
+
return output.match(/https:\/\/github\.com\/[^\s)]+\/pull\/\d+/)?.[0];
|
|
77
|
+
}
|
|
78
|
+
//# sourceMappingURL=automate.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"automate.js","sourceRoot":"","sources":["../../src/remediation/automate.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,6 +14,14 @@ const DEFAULT_IGNORES = [
|
|
|
14
14
|
'**/.next/**',
|
|
15
15
|
'**/.cache/**',
|
|
16
16
|
'**/.vite/**',
|
|
17
|
+
'**/.vitepress/cache/**',
|
|
18
|
+
'**/.venv*/**',
|
|
19
|
+
'**/venv/**',
|
|
20
|
+
'**/site-packages/**',
|
|
21
|
+
'**/.claude/worktrees/**',
|
|
22
|
+
'**/.codex/worktrees/**',
|
|
23
|
+
'**/eval/swebench/workspaces/**',
|
|
24
|
+
'**/eval/swebench/cache/**',
|
|
17
25
|
'**/*.min.js',
|
|
18
26
|
'**/*-lock.json',
|
|
19
27
|
'**/package-lock.json',
|
|
@@ -71,7 +79,7 @@ const RULES = [
|
|
|
71
79
|
securitySeverity: '8.8',
|
|
72
80
|
tags: ['security', 'sql-injection', 'cwe-089'],
|
|
73
81
|
helpUri: 'https://cwe.mitre.org/data/definitions/89.html',
|
|
74
|
-
pattern:
|
|
82
|
+
pattern: /['"`]\s*(?:SELECT|INSERT|UPDATE|DELETE)\b[^;\n]*['"`]\s*\+|\+\s*['"`]\s*(?:SELECT|INSERT|UPDATE|DELETE)\b/i,
|
|
75
83
|
message: () => 'SQL appears to be built with string concatenation. Use parameterized queries or a safe query builder.',
|
|
76
84
|
},
|
|
77
85
|
{
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"localScan.js","sourceRoot":"","sources":["../../src/remediation/localScan.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,MAAM,WAAW,CAAC;AAC3B,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,EAAE,qBAAqB,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AACnF,OAAO,EAAE,sBAAsB,EAAmD,MAAM,YAAY,CAAC;AAErG,MAAM,eAAe,GAAG;IACtB,YAAY;IACZ,oBAAoB;IACpB,YAAY;IACZ,gBAAgB;IAChB,aAAa;IACb,gBAAgB;IAChB,aAAa;IACb,cAAc;IACd,aAAa;IACb,aAAa;IACb,gBAAgB;IAChB,sBAAsB;IACtB,mBAAmB;IACnB,cAAc;CACf,CAAC;AAEF,MAAM,oBAAoB,GAAG,IAAI,GAAG,CAAC;IACnC,MAAM;IACN,KAAK;IACL,MAAM;IACN,KAAK;IACL,OAAO;IACP,KAAK;IACL,MAAM;IACN,MAAM;IACN,MAAM;IACN,KAAK;IACL,KAAK;IACL,KAAK;IACL,KAAK;IACL,KAAK;IACL,MAAM;IACN,OAAO;IACP,MAAM;CACP,CAAC,CAAC;AAEH,MAAM,SAAS,GAAG,IAAI,CAAC;AACvB,MAAM,cAAc,GAAG,GAAG,GAAG,IAAI,CAAC;AAClC,MAAM,YAAY,GAAG,GAAG,CAAC;AACzB,MAAM,cAAc,GAAG,CAAC,CAAC;AAazB,MAAM,KAAK,GAAgB;IACzB;QACE,EAAE,EAAE,yBAAyB;QAC7B,IAAI,EAAE,6BAA6B;QACnC,QAAQ,EAAE,OAAO;QACjB,gBAAgB,EAAE,KAAK;QACvB,IAAI,EAAE,CAAC,UAAU,EAAE,QAAQ,EAAE,SAAS,CAAC;QACvC,OAAO,EAAE,iDAAiD;QAC1D,OAAO,EAAE,qFAAqF;QAC9F,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,sBAAsB,KAAK,CAAC,CAAC,CAAC,6EAA6E;KAChI;IACD;QACE,EAAE,EAAE,uBAAuB;QAC3B,IAAI,EAAE,wBAAwB;QAC9B,QAAQ,EAAE,OAAO;QACjB,gBAAgB,EAAE,KAAK;QACvB,IAAI,EAAE,CAAC,UAAU,EAAE,QAAQ,EAAE,KAAK,EAAE,SAAS,CAAC;QAC9C,OAAO,EAAE,iDAAiD;QAC1D,OAAO,EAAE,sBAAsB;QAC/B,OAAO,EAAE,GAAG,EAAE,CAAC,yGAAyG;KACzH;IACD;QACE,EAAE,EAAE,iCAAiC;QACrC,IAAI,EAAE,qCAAqC;QAC3C,QAAQ,EAAE,OAAO;QACjB,gBAAgB,EAAE,KAAK;QACvB,IAAI,EAAE,CAAC,UAAU,EAAE,eAAe,EAAE,SAAS,CAAC;QAC9C,OAAO,EAAE,gDAAgD;QACzD,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"localScan.js","sourceRoot":"","sources":["../../src/remediation/localScan.ts"],"names":[],"mappings":"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"}
|
|
@@ -28,7 +28,7 @@ function normalizeLevel(level) {
|
|
|
28
28
|
return level;
|
|
29
29
|
return 'warning';
|
|
30
30
|
}
|
|
31
|
-
function normalizeSarifPath(uri) {
|
|
31
|
+
function normalizeSarifPath(uri, cwd) {
|
|
32
32
|
if (!uri)
|
|
33
33
|
return undefined;
|
|
34
34
|
const trimmed = uri.trim();
|
|
@@ -38,8 +38,22 @@ function normalizeSarifPath(uri) {
|
|
|
38
38
|
const withoutFileScheme = trimmed.startsWith('file://')
|
|
39
39
|
? trimmed.replace(/^file:\/+/, '/')
|
|
40
40
|
: trimmed;
|
|
41
|
-
|
|
42
|
-
|
|
41
|
+
let decoded;
|
|
42
|
+
try {
|
|
43
|
+
decoded = decodeURIComponent(withoutFileScheme);
|
|
44
|
+
}
|
|
45
|
+
catch {
|
|
46
|
+
return undefined;
|
|
47
|
+
}
|
|
48
|
+
const normalized = path.normalize(decoded);
|
|
49
|
+
if (path.isAbsolute(normalized) && cwd) {
|
|
50
|
+
const relative = path.relative(path.resolve(cwd), normalized);
|
|
51
|
+
if (!relative || (!relative.startsWith('..') && !path.isAbsolute(relative))) {
|
|
52
|
+
return (relative || path.basename(normalized)).replace(/\\/g, '/');
|
|
53
|
+
}
|
|
54
|
+
return undefined;
|
|
55
|
+
}
|
|
56
|
+
return normalized.replace(/\\/g, '/');
|
|
43
57
|
}
|
|
44
58
|
async function readSnippet(cwd, findingPath, startLine) {
|
|
45
59
|
if (!cwd || !startLine || path.isAbsolute(findingPath))
|
|
@@ -105,7 +119,7 @@ export async function parseSarifForRemediation(report, opts = {}) {
|
|
|
105
119
|
}
|
|
106
120
|
const location = result.locations?.[0];
|
|
107
121
|
const physical = location?.physicalLocation;
|
|
108
|
-
const findingPath = normalizeSarifPath(physical?.artifactLocation?.uri);
|
|
122
|
+
const findingPath = normalizeSarifPath(physical?.artifactLocation?.uri, opts.cwd);
|
|
109
123
|
if (!findingPath) {
|
|
110
124
|
skippedResults += 1;
|
|
111
125
|
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;AA8F9D,MAAM,YAAY,GAAG,GAAG,CAAC;AACzB,MAAM,cAAc,GAAG,CAAC,CAAC;AAEzB,SAAS,QAAQ,CAAC,KAAc;IAC9B,OAAO,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;QAChE,CAAC,CAAC,KAAgC;QAClC,CAAC,CAAC,SAAS,CAAC;AAChB,CAAC;AAED,SAAS,eAAe,CAAC,KAAe;IACtC,OAAO,KAAK;SACT,IAAI,CAAC,GAAG,CAAC;SACT,OAAO,CAAC,oBAAoB,EAAE,GAAG,CAAC;SAClC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC;SACvB,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;AACnB,CAAC;AAED,SAAS,OAAO,CAAC,GAAa;IAC5B,MAAM,KAAK,GAAG,IAAI,GAAG,EAAqB,CAAC;IAC3C,KAAK,MAAM,IAAI,IAAI,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,IAAI,EAAE,EAAE,CAAC;QACjD,IAAI,IAAI,CAAC,EAAE;YAAE,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;IACxC,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,SAAS,cAAc,CAAC,KAAc;IACpC,IAAI,KAAK,KAAK,OAAO,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,MAAM,IAAI,KAAK,KAAK,MAAM;QAAE,OAAO,KAAK,CAAC;IACnG,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,SAAS,kBAAkB,CAAC,GAAuB;
|
|
1
|
+
{"version":3,"file":"sarif.js","sourceRoot":"","sources":["../../src/remediation/sarif.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,43 @@
|
|
|
1
|
+
import { type RemediationFinding } from './sarif.js';
|
|
2
|
+
export type DvalinScannerId = 'builtin' | 'semgrep' | 'trivy' | 'osv-scanner';
|
|
3
|
+
export type DvalinScannerDescriptor = {
|
|
4
|
+
id: DvalinScannerId;
|
|
5
|
+
name: string;
|
|
6
|
+
category: 'sast' | 'supply-chain' | 'secrets' | 'misconfiguration';
|
|
7
|
+
description: string;
|
|
8
|
+
available: boolean;
|
|
9
|
+
installCommand?: string;
|
|
10
|
+
homepage: string;
|
|
11
|
+
};
|
|
12
|
+
export type DvalinScannerRun = DvalinScannerDescriptor & {
|
|
13
|
+
status: 'completed' | 'missing' | 'error';
|
|
14
|
+
findings: number;
|
|
15
|
+
durationMs: number;
|
|
16
|
+
error?: string;
|
|
17
|
+
};
|
|
18
|
+
export type DvalinScanMetrics = {
|
|
19
|
+
critical: number;
|
|
20
|
+
high: number;
|
|
21
|
+
medium: number;
|
|
22
|
+
low: number;
|
|
23
|
+
files: number;
|
|
24
|
+
rules: number;
|
|
25
|
+
};
|
|
26
|
+
export type DvalinScanSuiteResult = {
|
|
27
|
+
id: string;
|
|
28
|
+
source: 'Dvalin Security Suite';
|
|
29
|
+
startedAt: string;
|
|
30
|
+
completedAt: string;
|
|
31
|
+
score: number;
|
|
32
|
+
grade: 'A' | 'B' | 'C' | 'D' | 'F';
|
|
33
|
+
findings: RemediationFinding[];
|
|
34
|
+
totalResults: number;
|
|
35
|
+
skippedResults: number;
|
|
36
|
+
scanners: DvalinScannerRun[];
|
|
37
|
+
metrics: DvalinScanMetrics;
|
|
38
|
+
};
|
|
39
|
+
export declare function listDvalinScanners(): Promise<DvalinScannerDescriptor[]>;
|
|
40
|
+
export declare function runDvalinScanSuite(cwd: string, options?: {
|
|
41
|
+
scanners?: DvalinScannerId[];
|
|
42
|
+
timeoutMs?: number;
|
|
43
|
+
}): Promise<DvalinScanSuiteResult>;
|
|
@@ -0,0 +1,248 @@
|
|
|
1
|
+
import { access, mkdir, readFile, rm } from 'node:fs/promises';
|
|
2
|
+
import { constants } from 'node:fs';
|
|
3
|
+
import path from 'node:path';
|
|
4
|
+
import { randomUUID } from 'node:crypto';
|
|
5
|
+
import { checkCommand, loadPolicy } from '../core/policy.js';
|
|
6
|
+
import { buildShellScript, runGovernedExecutable } from '../core/subprocessSandbox.js';
|
|
7
|
+
import { resolveWorkspaceRoot } from '../core/workspace.js';
|
|
8
|
+
import { runLocalSecurityScan } from './localScan.js';
|
|
9
|
+
import { parseSarifForRemediation } from './sarif.js';
|
|
10
|
+
const EXTERNAL_SCANNERS = [
|
|
11
|
+
{
|
|
12
|
+
descriptor: {
|
|
13
|
+
id: 'semgrep',
|
|
14
|
+
name: 'Semgrep CE',
|
|
15
|
+
category: 'sast',
|
|
16
|
+
description: 'Multi-language semantic SAST using the Semgrep community rules registry.',
|
|
17
|
+
installCommand: 'python3 -m pip install semgrep',
|
|
18
|
+
homepage: 'https://semgrep.dev/products/community-edition/',
|
|
19
|
+
},
|
|
20
|
+
command: 'semgrep',
|
|
21
|
+
args: (root, output) => [
|
|
22
|
+
'scan', '--config', 'auto', '--sarif', '--output', output, '--metrics', 'off',
|
|
23
|
+
'--exclude', '.dvalin-scan-*', root,
|
|
24
|
+
],
|
|
25
|
+
acceptedExitCodes: [0],
|
|
26
|
+
},
|
|
27
|
+
{
|
|
28
|
+
descriptor: {
|
|
29
|
+
id: 'trivy',
|
|
30
|
+
name: 'Trivy',
|
|
31
|
+
category: 'misconfiguration',
|
|
32
|
+
description: 'Filesystem vulnerability, secret, and infrastructure misconfiguration scanning.',
|
|
33
|
+
installCommand: 'brew install trivy',
|
|
34
|
+
homepage: 'https://trivy.dev/docs/latest/target/filesystem/',
|
|
35
|
+
},
|
|
36
|
+
command: 'trivy',
|
|
37
|
+
args: (root, output) => [
|
|
38
|
+
'fs', '--format', 'sarif', '--output', output, '--scanners', 'vuln,misconfig,secret',
|
|
39
|
+
'--no-progress', '--skip-dirs', 'node_modules', '--skip-dirs', '.git',
|
|
40
|
+
'--skip-dirs', '.dvalin-scan-*', root,
|
|
41
|
+
],
|
|
42
|
+
acceptedExitCodes: [0],
|
|
43
|
+
},
|
|
44
|
+
{
|
|
45
|
+
descriptor: {
|
|
46
|
+
id: 'osv-scanner',
|
|
47
|
+
name: 'OSV-Scanner',
|
|
48
|
+
category: 'supply-chain',
|
|
49
|
+
description: 'Dependency vulnerability matching against the open OSV advisory database.',
|
|
50
|
+
installCommand: 'brew install osv-scanner',
|
|
51
|
+
homepage: 'https://google.github.io/osv-scanner/',
|
|
52
|
+
},
|
|
53
|
+
command: 'osv-scanner',
|
|
54
|
+
args: (root, output) => [
|
|
55
|
+
'scan', 'source', '--recursive', '--format', 'sarif', '--output-file', output, root,
|
|
56
|
+
],
|
|
57
|
+
acceptedExitCodes: [0, 1, 128],
|
|
58
|
+
},
|
|
59
|
+
];
|
|
60
|
+
const BUILTIN = {
|
|
61
|
+
id: 'builtin',
|
|
62
|
+
name: 'Dvalin Built-in',
|
|
63
|
+
category: 'secrets',
|
|
64
|
+
description: 'Fast local high-signal rules for secrets, injection, XSS, eval, and unsafe shell use.',
|
|
65
|
+
available: true,
|
|
66
|
+
homepage: 'https://github.com/arthurpanhku/dvalincode',
|
|
67
|
+
};
|
|
68
|
+
export async function listDvalinScanners() {
|
|
69
|
+
const external = await Promise.all(EXTERNAL_SCANNERS.map(async (scanner) => ({
|
|
70
|
+
...scanner.descriptor,
|
|
71
|
+
available: Boolean(await findExecutable(scanner.command)),
|
|
72
|
+
})));
|
|
73
|
+
return [BUILTIN, ...external];
|
|
74
|
+
}
|
|
75
|
+
export async function runDvalinScanSuite(cwd, options = {}) {
|
|
76
|
+
const root = await resolveWorkspaceRoot(cwd);
|
|
77
|
+
const started = new Date();
|
|
78
|
+
const selected = new Set(options.scanners?.length ? options.scanners : ['builtin', 'semgrep', 'trivy', 'osv-scanner']);
|
|
79
|
+
const findings = [];
|
|
80
|
+
const runs = [];
|
|
81
|
+
let totalResults = 0;
|
|
82
|
+
let skippedResults = 0;
|
|
83
|
+
if (selected.has('builtin')) {
|
|
84
|
+
const t0 = Date.now();
|
|
85
|
+
const result = await runLocalSecurityScan(root);
|
|
86
|
+
findings.push(...result.findings);
|
|
87
|
+
totalResults += result.totalResults;
|
|
88
|
+
skippedResults += result.skippedResults;
|
|
89
|
+
runs.push({ ...BUILTIN, status: 'completed', findings: result.findings.length, durationMs: Date.now() - t0 });
|
|
90
|
+
}
|
|
91
|
+
const outputDir = path.join(root, `.dvalin-scan-${randomUUID().slice(0, 8)}`);
|
|
92
|
+
const resolvedOutputDir = path.resolve(outputDir);
|
|
93
|
+
const outputRelative = path.relative(root, resolvedOutputDir);
|
|
94
|
+
if (outputRelative.startsWith('..') || path.isAbsolute(outputRelative)) {
|
|
95
|
+
throw new Error(`Refusing to create scanner output directory outside workspace: ${resolvedOutputDir}`);
|
|
96
|
+
}
|
|
97
|
+
await mkdir(resolvedOutputDir, { recursive: false });
|
|
98
|
+
try {
|
|
99
|
+
for (const scanner of EXTERNAL_SCANNERS) {
|
|
100
|
+
if (!selected.has(scanner.descriptor.id))
|
|
101
|
+
continue;
|
|
102
|
+
const t0 = Date.now();
|
|
103
|
+
const executable = await findExecutable(scanner.command);
|
|
104
|
+
const descriptor = { ...scanner.descriptor, available: Boolean(executable) };
|
|
105
|
+
if (!executable) {
|
|
106
|
+
runs.push({ ...descriptor, status: 'missing', findings: 0, durationMs: Date.now() - t0 });
|
|
107
|
+
continue;
|
|
108
|
+
}
|
|
109
|
+
const output = path.join(resolvedOutputDir, `${scanner.descriptor.id}.sarif`);
|
|
110
|
+
const args = scanner.args(root, output);
|
|
111
|
+
const loadedPolicy = loadPolicy(root);
|
|
112
|
+
const commandLine = buildShellScript(scanner.command, args);
|
|
113
|
+
const commandDecision = checkCommand(loadedPolicy.policy, commandLine);
|
|
114
|
+
if (!commandDecision.allowed) {
|
|
115
|
+
runs.push({
|
|
116
|
+
...descriptor,
|
|
117
|
+
status: 'error',
|
|
118
|
+
findings: 0,
|
|
119
|
+
durationMs: Date.now() - t0,
|
|
120
|
+
error: `Blocked by policy: ${commandDecision.rule}`,
|
|
121
|
+
});
|
|
122
|
+
continue;
|
|
123
|
+
}
|
|
124
|
+
try {
|
|
125
|
+
const processResult = await runGovernedExecutable({
|
|
126
|
+
command: scanner.command,
|
|
127
|
+
args,
|
|
128
|
+
cwd: root,
|
|
129
|
+
timeoutMs: options.timeoutMs ?? 300_000,
|
|
130
|
+
policy: loadedPolicy.policy,
|
|
131
|
+
toolName: 'run_security_suite',
|
|
132
|
+
preferSandboxWhenUnrestricted: true,
|
|
133
|
+
skipNetworkSandboxWhenPolicyAllows: true,
|
|
134
|
+
});
|
|
135
|
+
if (!scanner.acceptedExitCodes.includes(processResult.exitCode ?? -1)) {
|
|
136
|
+
throw new Error(processResult.output.trim() || `${scanner.descriptor.name} exited ${processResult.exitCode}`);
|
|
137
|
+
}
|
|
138
|
+
const report = JSON.parse(await readFile(output, 'utf8'));
|
|
139
|
+
const result = await parseSarifForRemediation(report, { cwd: root });
|
|
140
|
+
findings.push(...result.findings);
|
|
141
|
+
totalResults += result.totalResults;
|
|
142
|
+
skippedResults += result.skippedResults;
|
|
143
|
+
runs.push({ ...descriptor, status: 'completed', findings: result.findings.length, durationMs: Date.now() - t0 });
|
|
144
|
+
}
|
|
145
|
+
catch (error) {
|
|
146
|
+
runs.push({
|
|
147
|
+
...descriptor,
|
|
148
|
+
status: 'error',
|
|
149
|
+
findings: 0,
|
|
150
|
+
durationMs: Date.now() - t0,
|
|
151
|
+
error: compactError(error),
|
|
152
|
+
});
|
|
153
|
+
}
|
|
154
|
+
}
|
|
155
|
+
}
|
|
156
|
+
finally {
|
|
157
|
+
await rm(resolvedOutputDir, { recursive: true, force: true });
|
|
158
|
+
}
|
|
159
|
+
const deduped = dedupeFindings(findings);
|
|
160
|
+
const metrics = scanMetrics(deduped);
|
|
161
|
+
const score = scoreFindings(metrics);
|
|
162
|
+
return {
|
|
163
|
+
id: `scan-${started.toISOString().replace(/[:.]/g, '-')}`,
|
|
164
|
+
source: 'Dvalin Security Suite',
|
|
165
|
+
startedAt: started.toISOString(),
|
|
166
|
+
completedAt: new Date().toISOString(),
|
|
167
|
+
score,
|
|
168
|
+
grade: gradeFor(score),
|
|
169
|
+
findings: deduped,
|
|
170
|
+
totalResults,
|
|
171
|
+
skippedResults,
|
|
172
|
+
scanners: runs,
|
|
173
|
+
metrics,
|
|
174
|
+
};
|
|
175
|
+
}
|
|
176
|
+
function scanMetrics(findings) {
|
|
177
|
+
const metrics = { critical: 0, high: 0, medium: 0, low: 0, files: 0, rules: 0 };
|
|
178
|
+
const files = new Set();
|
|
179
|
+
const rules = new Set();
|
|
180
|
+
for (const finding of findings) {
|
|
181
|
+
const score = Number.parseFloat(finding.securitySeverity ?? '');
|
|
182
|
+
if (score >= 9)
|
|
183
|
+
metrics.critical++;
|
|
184
|
+
else if (finding.severity === 'error' || score >= 7)
|
|
185
|
+
metrics.high++;
|
|
186
|
+
else if (finding.severity === 'warning' || score >= 4)
|
|
187
|
+
metrics.medium++;
|
|
188
|
+
else
|
|
189
|
+
metrics.low++;
|
|
190
|
+
files.add(finding.path);
|
|
191
|
+
rules.add(`${finding.source}:${finding.ruleId}`);
|
|
192
|
+
}
|
|
193
|
+
metrics.files = files.size;
|
|
194
|
+
metrics.rules = rules.size;
|
|
195
|
+
return metrics;
|
|
196
|
+
}
|
|
197
|
+
function scoreFindings(metrics) {
|
|
198
|
+
return Math.max(0, 100 - metrics.critical * 22 - metrics.high * 12 - metrics.medium * 5 - metrics.low * 1);
|
|
199
|
+
}
|
|
200
|
+
function gradeFor(score) {
|
|
201
|
+
if (score >= 90)
|
|
202
|
+
return 'A';
|
|
203
|
+
if (score >= 80)
|
|
204
|
+
return 'B';
|
|
205
|
+
if (score >= 70)
|
|
206
|
+
return 'C';
|
|
207
|
+
if (score >= 60)
|
|
208
|
+
return 'D';
|
|
209
|
+
return 'F';
|
|
210
|
+
}
|
|
211
|
+
function dedupeFindings(findings) {
|
|
212
|
+
const unique = new Map();
|
|
213
|
+
for (const finding of findings) {
|
|
214
|
+
const key = `${finding.source}:${finding.ruleId}:${finding.path}:${finding.startLine ?? 0}:${finding.message}`;
|
|
215
|
+
if (!unique.has(key))
|
|
216
|
+
unique.set(key, finding);
|
|
217
|
+
}
|
|
218
|
+
return [...unique.values()].sort((a, b) => severityWeight(b) - severityWeight(a));
|
|
219
|
+
}
|
|
220
|
+
function severityWeight(finding) {
|
|
221
|
+
const score = Number.parseFloat(finding.securitySeverity ?? '');
|
|
222
|
+
if (Number.isFinite(score))
|
|
223
|
+
return score;
|
|
224
|
+
return finding.severity === 'error' ? 8 : finding.severity === 'warning' ? 5 : 1;
|
|
225
|
+
}
|
|
226
|
+
async function findExecutable(command) {
|
|
227
|
+
const extensions = process.platform === 'win32'
|
|
228
|
+
? (process.env.PATHEXT ?? '.EXE;.CMD;.BAT').split(';')
|
|
229
|
+
: [''];
|
|
230
|
+
for (const directory of (process.env.PATH ?? '').split(path.delimiter).filter(Boolean)) {
|
|
231
|
+
for (const extension of extensions) {
|
|
232
|
+
const candidate = path.join(directory, `${command}${extension}`);
|
|
233
|
+
try {
|
|
234
|
+
await access(candidate, constants.X_OK);
|
|
235
|
+
return candidate;
|
|
236
|
+
}
|
|
237
|
+
catch {
|
|
238
|
+
// Continue searching PATH.
|
|
239
|
+
}
|
|
240
|
+
}
|
|
241
|
+
}
|
|
242
|
+
return undefined;
|
|
243
|
+
}
|
|
244
|
+
function compactError(error) {
|
|
245
|
+
const message = error instanceof Error ? error.message : String(error);
|
|
246
|
+
return message.replace(/\s+/g, ' ').trim().slice(0, 500);
|
|
247
|
+
}
|
|
248
|
+
//# sourceMappingURL=scannerSuite.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"scannerSuite.js","sourceRoot":"","sources":["../../src/remediation/scannerSuite.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { Router } from 'express';
|
|
2
2
|
import { readConfig, writeConfig, maskConfig } from '../configStore.js';
|
|
3
3
|
import { resetRRCursor } from '../../providers/pool.js';
|
|
4
|
-
import {
|
|
4
|
+
import { createProviderAdapter } from '../../providers/manager.js';
|
|
5
5
|
import { resolveApiKey } from '../../providers/secrets.js';
|
|
6
6
|
import { requireTrustedProviderBaseUrl } from '../../providers/trustedBaseUrls.js';
|
|
7
7
|
export const configRouter = Router();
|
|
@@ -110,8 +110,7 @@ configRouter.post('/test', async (req, res) => {
|
|
|
110
110
|
const started = Date.now();
|
|
111
111
|
try {
|
|
112
112
|
const baseUrl = requireTrustedProviderBaseUrl(candidate.provider, candidate.baseUrl);
|
|
113
|
-
const provider =
|
|
114
|
-
name: candidate.provider,
|
|
113
|
+
const provider = createProviderAdapter(candidate.provider, {
|
|
115
114
|
apiKey: resolveApiKey(candidate),
|
|
116
115
|
baseUrl,
|
|
117
116
|
model: candidate.model,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/server/routes/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACjC,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAExE,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/server/routes/config.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,8 +3,42 @@ import { listRemediationCases, updateRemediationCase, upsertRemediationCases } f
|
|
|
3
3
|
import { runLocalSecurityScan } from '../../remediation/localScan.js';
|
|
4
4
|
import { parseSarifForRemediation } from '../../remediation/sarif.js';
|
|
5
5
|
import { createRemediationWorktree } from '../../remediation/worktree.js';
|
|
6
|
+
import { listDvalinScanners, runDvalinScanSuite } from '../../remediation/scannerSuite.js';
|
|
6
7
|
import { allowWorkspaceRoot, resolveAllowedCwd } from '../security.js';
|
|
8
|
+
import { consumeScannerWorkspaceGrant, issueScannerWorkspaceGrant } from '../scannerWorkspaceGrants.js';
|
|
7
9
|
export const remediationRouter = Router();
|
|
10
|
+
remediationRouter.get('/scanners', async (_req, res) => {
|
|
11
|
+
res.json(await listDvalinScanners());
|
|
12
|
+
});
|
|
13
|
+
remediationRouter.post('/suite/authorize', async (req, res) => {
|
|
14
|
+
const body = req.body;
|
|
15
|
+
try {
|
|
16
|
+
const cwd = await resolveAllowedCwd(body.cwd);
|
|
17
|
+
res.json({ grant: issueScannerWorkspaceGrant(cwd) });
|
|
18
|
+
}
|
|
19
|
+
catch (err) {
|
|
20
|
+
res.status(403).json({ error: err instanceof Error ? err.message : 'Workspace is not allowed' });
|
|
21
|
+
}
|
|
22
|
+
});
|
|
23
|
+
remediationRouter.post('/suite', async (req, res) => {
|
|
24
|
+
const body = req.body;
|
|
25
|
+
try {
|
|
26
|
+
const allowedScanners = new Set(['builtin', 'semgrep', 'trivy', 'osv-scanner']);
|
|
27
|
+
if (body.scanners && (!Array.isArray(body.scanners) || body.scanners.some(scanner => !allowedScanners.has(scanner)))) {
|
|
28
|
+
res.status(400).json({ error: 'scanners must contain only builtin, semgrep, trivy, or osv-scanner' });
|
|
29
|
+
return;
|
|
30
|
+
}
|
|
31
|
+
const cwd = consumeScannerWorkspaceGrant(body.grant);
|
|
32
|
+
const result = await runDvalinScanSuite(cwd, { scanners: body.scanners });
|
|
33
|
+
const cases = result.findings.length
|
|
34
|
+
? await upsertRemediationCases({ cwd, findings: result.findings })
|
|
35
|
+
: [];
|
|
36
|
+
res.json({ ...result, cases });
|
|
37
|
+
}
|
|
38
|
+
catch (err) {
|
|
39
|
+
res.status(400).json({ error: err instanceof Error ? err.message : 'Could not run Dvalin security suite' });
|
|
40
|
+
}
|
|
41
|
+
});
|
|
8
42
|
remediationRouter.get('/cases', async (req, res) => {
|
|
9
43
|
try {
|
|
10
44
|
const cwd = typeof req.query.cwd === 'string' && req.query.cwd
|