dvalincode 0.21.0 → 0.22.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 +209 -4
- package/README.zh-CN.md +160 -4
- package/dist/agent/compact.d.ts +8 -0
- package/dist/agent/compact.js +44 -5
- package/dist/agent/compact.js.map +1 -1
- package/dist/agent/loop.d.ts +5 -0
- package/dist/agent/loop.js +16 -7
- package/dist/agent/loop.js.map +1 -1
- package/dist/agent/runner.d.ts +4 -3
- package/dist/agent/runner.js +81 -8
- package/dist/agent/runner.js.map +1 -1
- package/dist/agent/session.d.ts +7 -0
- package/dist/agent/session.js +27 -1
- package/dist/agent/session.js.map +1 -1
- package/dist/agent/types.d.ts +5 -1
- package/dist/agent/types.js.map +1 -1
- package/dist/audit/log.d.ts +5 -1
- package/dist/audit/log.js.map +1 -1
- package/dist/commands/dvalin.d.ts +7 -1
- package/dist/commands/dvalin.js +209 -9
- package/dist/commands/dvalin.js.map +1 -1
- package/dist/commands/provider.js +2 -0
- package/dist/commands/provider.js.map +1 -1
- package/dist/commands/run.js +4 -2
- package/dist/commands/run.js.map +1 -1
- package/dist/commands/security.d.ts +2 -0
- package/dist/commands/security.js +228 -14
- package/dist/commands/security.js.map +1 -1
- package/dist/harness/run.d.ts +8 -2
- package/dist/harness/run.js +1 -1
- package/dist/harness/run.js.map +1 -1
- package/dist/mcp/server.js +5 -2
- package/dist/mcp/server.js.map +1 -1
- package/dist/providers/anthropic.js +14 -2
- package/dist/providers/anthropic.js.map +1 -1
- package/dist/providers/openaiCompatible.js +7 -6
- package/dist/providers/openaiCompatible.js.map +1 -1
- package/dist/providers/retry.d.ts +32 -0
- package/dist/providers/retry.js +150 -0
- package/dist/providers/retry.js.map +1 -0
- package/dist/providers/types.d.ts +10 -0
- package/dist/remediation/automate.d.ts +1 -1
- package/dist/remediation/automate.js +2 -1
- package/dist/remediation/automate.js.map +1 -1
- package/dist/remediation/codeQualityExport.d.ts +25 -0
- package/dist/remediation/codeQualityExport.js +24 -0
- package/dist/remediation/codeQualityExport.js.map +1 -0
- package/dist/remediation/evasion.d.ts +61 -0
- package/dist/remediation/evasion.js +190 -0
- package/dist/remediation/evasion.js.map +1 -0
- package/dist/remediation/fixLoop.d.ts +255 -0
- package/dist/remediation/fixLoop.js +639 -0
- package/dist/remediation/fixLoop.js.map +1 -0
- package/dist/remediation/fixLoopStats.d.ts +93 -0
- package/dist/remediation/fixLoopStats.js +244 -0
- package/dist/remediation/fixLoopStats.js.map +1 -0
- package/dist/remediation/rebase.d.ts +44 -0
- package/dist/remediation/rebase.js +114 -0
- package/dist/remediation/rebase.js.map +1 -0
- package/dist/remediation/reproduce.d.ts +47 -0
- package/dist/remediation/reproduce.js +75 -0
- package/dist/remediation/reproduce.js.map +1 -0
- package/dist/remediation/sarif.d.ts +4 -1
- package/dist/remediation/sarif.js +19 -1
- package/dist/remediation/sarif.js.map +1 -1
- package/dist/remediation/scannerSuite.d.ts +51 -3
- package/dist/remediation/scannerSuite.js +346 -87
- package/dist/remediation/scannerSuite.js.map +1 -1
- package/dist/remediation/verify.d.ts +8 -0
- package/dist/remediation/verify.js +24 -11
- package/dist/remediation/verify.js.map +1 -1
- package/dist/security/config.d.ts +8 -2
- package/dist/security/config.js +10 -3
- package/dist/security/config.js.map +1 -1
- package/dist/security/contracts.js +15 -0
- package/dist/security/contracts.js.map +1 -1
- package/dist/security/fixRecord.d.ts +103 -8
- package/dist/security/fixRecord.js +113 -11
- package/dist/security/fixRecord.js.map +1 -1
- package/dist/security/fixRecordFile.d.ts +11 -2
- package/dist/security/fixRecordFile.js +20 -2
- package/dist/security/fixRecordFile.js.map +1 -1
- package/dist/security/fixRecordSignature.d.ts +104 -0
- package/dist/security/fixRecordSignature.js +227 -0
- package/dist/security/fixRecordSignature.js.map +1 -0
- package/dist/security/guardedScan.d.ts +39 -0
- package/dist/security/guardedScan.js +45 -0
- package/dist/security/guardedScan.js.map +1 -0
- package/dist/security/onboarding.d.ts +28 -0
- package/dist/security/onboarding.js +124 -0
- package/dist/security/onboarding.js.map +1 -0
- package/dist/security/reproduceInCi.d.ts +44 -0
- package/dist/security/reproduceInCi.js +96 -0
- package/dist/security/reproduceInCi.js.map +1 -0
- package/dist/security/reverify.d.ts +130 -0
- package/dist/security/reverify.js +361 -0
- package/dist/security/reverify.js.map +1 -0
- package/dist/security/suppressionGuard.d.ts +58 -0
- package/dist/security/suppressionGuard.js +216 -0
- package/dist/security/suppressionGuard.js.map +1 -0
- package/dist/security/verifyRun.js +14 -3
- package/dist/security/verifyRun.js.map +1 -1
- package/dist/security/workflow.d.ts +11 -1
- package/dist/security/workflow.js +2 -0
- package/dist/security/workflow.js.map +1 -1
- package/dist/server/routes/config.js +2 -0
- package/dist/server/routes/config.js.map +1 -1
- package/dist/server/routes/remediation.js +6 -5
- package/dist/server/routes/remediation.js.map +1 -1
- package/dist/tools/editFile.js +9 -2
- package/dist/tools/editFile.js.map +1 -1
- package/dist/tools/registry.d.ts +4 -1
- package/dist/tools/registry.js +29 -9
- package/dist/tools/registry.js.map +1 -1
- package/dist/tools/runSecuritySuite.d.ts +3 -0
- package/dist/tools/runSecuritySuite.js +2 -2
- package/dist/tools/runSecuritySuite.js.map +1 -1
- package/dist/version.d.ts +1 -1
- package/dist/version.js +1 -1
- package/package.json +1 -1
|
@@ -16,12 +16,17 @@ export async function runProjectVerification(options) {
|
|
|
16
16
|
const timeoutMs = options.timeoutMs ?? 300_000;
|
|
17
17
|
const policy = loadPolicy(options.cwd).policy;
|
|
18
18
|
const evidence = [];
|
|
19
|
+
const outputTails = [];
|
|
19
20
|
const skipped = [];
|
|
21
|
+
const record = (run) => {
|
|
22
|
+
evidence.push(run.evidence);
|
|
23
|
+
outputTails.push(run.tail);
|
|
24
|
+
};
|
|
20
25
|
if (options.commands?.length) {
|
|
21
26
|
for (const commandLine of options.commands) {
|
|
22
|
-
|
|
27
|
+
record(await runOne('custom', splitCommand(commandLine), options.cwd, policy, timeoutMs, options.audit));
|
|
23
28
|
}
|
|
24
|
-
return { evidence, skipped };
|
|
29
|
+
return { evidence, outputTails, skipped };
|
|
25
30
|
}
|
|
26
31
|
// `kinds: []` is a project saying "run no checks", which is different from
|
|
27
32
|
// not asking. It leads to an unverifiable record, which is the honest result.
|
|
@@ -31,9 +36,9 @@ export async function runProjectVerification(options) {
|
|
|
31
36
|
skipped.push(kind);
|
|
32
37
|
continue;
|
|
33
38
|
}
|
|
34
|
-
|
|
39
|
+
record(await runOne(kind, picked, options.cwd, policy, timeoutMs, options.audit));
|
|
35
40
|
}
|
|
36
|
-
return { evidence, skipped };
|
|
41
|
+
return { evidence, outputTails, skipped };
|
|
37
42
|
}
|
|
38
43
|
async function runOne(kind, picked, cwd, policy, timeoutMs, audit) {
|
|
39
44
|
const commandLine = [picked.command, ...picked.args].join(' ');
|
|
@@ -51,16 +56,21 @@ async function runOne(kind, picked, cwd, policy, timeoutMs, audit) {
|
|
|
51
56
|
status: 'error',
|
|
52
57
|
durationMs: 0,
|
|
53
58
|
});
|
|
54
|
-
return { kind, command: commandLine, exitCode: null, passed: false };
|
|
59
|
+
return { evidence: { kind, command: commandLine, exitCode: null, passed: false }, tail: error instanceof Error ? error.message : String(error) };
|
|
55
60
|
}
|
|
56
61
|
}
|
|
62
|
+
/** Enough of a failing check's output to act on, not the whole log. */
|
|
63
|
+
const TAIL_LINES = 40;
|
|
64
|
+
function tailOf(output) {
|
|
65
|
+
return output.trimEnd().split('\n').slice(-TAIL_LINES).join('\n');
|
|
66
|
+
}
|
|
57
67
|
async function execute(kind, picked, commandLine, cwd, policy, timeoutMs, audit) {
|
|
58
68
|
// The same gate every other governed command passes. A policy that forbids a
|
|
59
69
|
// command does not get bypassed because the caller is the verifier.
|
|
60
70
|
const decision = checkCommand(policy, commandLine);
|
|
61
71
|
if (!decision.allowed) {
|
|
62
72
|
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 };
|
|
73
|
+
return { evidence: { kind, command: commandLine, exitCode: null, passed: false }, tail: `blocked by policy: ${decision.rule ?? 'command denied'}` };
|
|
64
74
|
}
|
|
65
75
|
const startedAt = Date.now();
|
|
66
76
|
const result = await runGovernedProcess({
|
|
@@ -90,11 +100,14 @@ async function execute(kind, picked, commandLine, cwd, policy, timeoutMs, audit)
|
|
|
90
100
|
sandbox: result.sandbox === 'seatbelt' || result.sandbox === 'bwrap' ? result.sandbox : 'none',
|
|
91
101
|
});
|
|
92
102
|
return {
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
103
|
+
evidence: {
|
|
104
|
+
kind,
|
|
105
|
+
command: commandLine,
|
|
106
|
+
exitCode: result.exitCode,
|
|
107
|
+
// A timeout is not a pass, whatever the exit code ends up being.
|
|
108
|
+
passed: result.exitCode === 0 && !result.timedOut,
|
|
109
|
+
},
|
|
110
|
+
tail: tailOf(`${result.timedOut ? '[timed out]\n' : ''}${result.output ?? ''}`),
|
|
98
111
|
};
|
|
99
112
|
}
|
|
100
113
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"verify.js","sourceRoot":"","sources":["../../src/remediation/verify.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAC7D,OAAO,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAClE,OAAO,EAAE,gBAAgB,EAAkB,MAAM,sBAAsB,CAAC;AACxE,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAI1C;;;;;;;;GAQG;AACH,MAAM,aAAa,GAAgB,CAAC,MAAM,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"verify.js","sourceRoot":"","sources":["../../src/remediation/verify.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type
|
|
1
|
+
import { type DvalinScannerId } from '../remediation/scannerSuite.js';
|
|
2
2
|
import type { SecurityGateMode, SecurityThreshold } from './contracts.js';
|
|
3
3
|
export declare const SECURITY_CONFIG_FILE = "dvalin.security.json";
|
|
4
4
|
export declare const DEFAULT_BASELINE_FILE = ".dvalin/baseline.json";
|
|
@@ -20,6 +20,12 @@ export type DvalinSecurityConfig = {
|
|
|
20
20
|
baseline: string;
|
|
21
21
|
checks: Array<'test' | 'typecheck' | 'build' | 'lint'>;
|
|
22
22
|
suppressions: SecuritySuppression[];
|
|
23
|
+
/**
|
|
24
|
+
* How to run only the reproduction tests the fix loop asks for, with
|
|
25
|
+
* `{files}` or `{dirs}`, e.g. `npx vitest run {files}`. Inferred from the
|
|
26
|
+
* project when absent. Set by people in the policy, never by the executor.
|
|
27
|
+
*/
|
|
28
|
+
reproduce?: string;
|
|
23
29
|
};
|
|
24
30
|
export declare const DEFAULT_SECURITY_CONFIG: DvalinSecurityConfig;
|
|
25
31
|
export declare const INITIALIZED_SECURITY_CONFIG: DvalinSecurityConfig;
|
|
@@ -27,6 +33,6 @@ export declare function loadSecurityConfig(root: string, explicitPath?: string):
|
|
|
27
33
|
config: DvalinSecurityConfig;
|
|
28
34
|
path?: string;
|
|
29
35
|
}>;
|
|
30
|
-
export declare function writeInitialSecurityConfig(root: string, force?: boolean): Promise<string>;
|
|
36
|
+
export declare function writeInitialSecurityConfig(root: string, force?: boolean, overrides?: Partial<Pick<DvalinSecurityConfig, 'scanners' | 'checks'>>): Promise<string>;
|
|
31
37
|
export declare function parseSecurityConfig(value: unknown, source?: string): DvalinSecurityConfig;
|
|
32
38
|
export declare function resolveSecurityPath(root: string, candidate: string): string;
|
package/dist/security/config.js
CHANGED
|
@@ -2,6 +2,7 @@ import { access, readFile, writeFile } from 'node:fs/promises';
|
|
|
2
2
|
import path from 'node:path';
|
|
3
3
|
import { constants } from 'node:fs';
|
|
4
4
|
import { UsageError } from '../core/exitCodes.js';
|
|
5
|
+
import { DVALIN_SCANNER_IDS } from '../remediation/scannerSuite.js';
|
|
5
6
|
export const SECURITY_CONFIG_FILE = 'dvalin.security.json';
|
|
6
7
|
export const DEFAULT_BASELINE_FILE = '.dvalin/baseline.json';
|
|
7
8
|
export const DEFAULT_SECURITY_CONFIG = {
|
|
@@ -35,7 +36,7 @@ export async function loadSecurityConfig(root, explicitPath) {
|
|
|
35
36
|
}
|
|
36
37
|
return { config: parseSecurityConfig(parsed, candidate), path: candidate };
|
|
37
38
|
}
|
|
38
|
-
export async function writeInitialSecurityConfig(root, force = false) {
|
|
39
|
+
export async function writeInitialSecurityConfig(root, force = false, overrides = {}) {
|
|
39
40
|
const target = path.join(root, SECURITY_CONFIG_FILE);
|
|
40
41
|
if (!force) {
|
|
41
42
|
try {
|
|
@@ -47,7 +48,8 @@ export async function writeInitialSecurityConfig(root, force = false) {
|
|
|
47
48
|
throw error;
|
|
48
49
|
}
|
|
49
50
|
}
|
|
50
|
-
|
|
51
|
+
const config = { ...INITIALIZED_SECURITY_CONFIG, ...overrides };
|
|
52
|
+
await writeFile(target, `${JSON.stringify(config, null, 2)}\n`, 'utf8');
|
|
51
53
|
return target;
|
|
52
54
|
}
|
|
53
55
|
export function parseSecurityConfig(value, source = SECURITY_CONFIG_FILE) {
|
|
@@ -75,6 +77,10 @@ export function parseSecurityConfig(value, source = SECURITY_CONFIG_FILE) {
|
|
|
75
77
|
const suppressions = input.suppressions ?? [];
|
|
76
78
|
if (!Array.isArray(suppressions))
|
|
77
79
|
throw new UsageError(`${source}: suppressions must be an array.`);
|
|
80
|
+
const reproduce = input.reproduce;
|
|
81
|
+
if (reproduce !== undefined && (typeof reproduce !== 'string' || !/\{(?:files|dirs)\}/.test(reproduce))) {
|
|
82
|
+
throw new UsageError(`${source}: reproduce must be a command containing {files} or {dirs}.`);
|
|
83
|
+
}
|
|
78
84
|
return {
|
|
79
85
|
version: 1,
|
|
80
86
|
scanners,
|
|
@@ -82,6 +88,7 @@ export function parseSecurityConfig(value, source = SECURITY_CONFIG_FILE) {
|
|
|
82
88
|
baseline,
|
|
83
89
|
checks: [...new Set(checks)],
|
|
84
90
|
suppressions: suppressions.map((suppression, index) => parseSuppression(suppression, `${source}: suppressions[${index}]`)),
|
|
91
|
+
...(reproduce ? { reproduce } : {}),
|
|
85
92
|
};
|
|
86
93
|
}
|
|
87
94
|
export function resolveSecurityPath(root, candidate) {
|
|
@@ -95,7 +102,7 @@ export function resolveSecurityPath(root, candidate) {
|
|
|
95
102
|
}
|
|
96
103
|
function parseScanners(value, source) {
|
|
97
104
|
const scanners = value ?? DEFAULT_SECURITY_CONFIG.scanners;
|
|
98
|
-
const allowed =
|
|
105
|
+
const allowed = DVALIN_SCANNER_IDS;
|
|
99
106
|
if (!Array.isArray(scanners) || !scanners.length || scanners.some(scanner => !allowed.includes(scanner))) {
|
|
100
107
|
throw new UsageError(`${source}: scanners must contain one or more of ${allowed.join(', ')}.`);
|
|
101
108
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/security/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC/D,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AACpC,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/security/config.ts"],"names":[],"mappings":"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"}
|
|
@@ -53,6 +53,11 @@ export function findingTargetFingerprint(finding) {
|
|
|
53
53
|
*/
|
|
54
54
|
export function scannerIdForSource(source) {
|
|
55
55
|
const name = source.toLowerCase();
|
|
56
|
+
// Snyk's SARIF names its drivers "SnykCode" and "Snyk Open Source".
|
|
57
|
+
if (name.replace(/\s+/g, '').includes('snykcode'))
|
|
58
|
+
return 'snyk-code';
|
|
59
|
+
if (name.includes('snyk'))
|
|
60
|
+
return 'snyk-oss';
|
|
56
61
|
if (name.includes('dvalin'))
|
|
57
62
|
return 'builtin';
|
|
58
63
|
if (name.includes('semgrep'))
|
|
@@ -61,6 +66,8 @@ export function scannerIdForSource(source) {
|
|
|
61
66
|
return 'trivy';
|
|
62
67
|
if (name.includes('osv'))
|
|
63
68
|
return 'osv-scanner';
|
|
69
|
+
if (name.includes('codeql'))
|
|
70
|
+
return 'codeql';
|
|
64
71
|
return undefined;
|
|
65
72
|
}
|
|
66
73
|
export function snapshotFinding(finding) {
|
|
@@ -96,9 +103,17 @@ export function deriveCoverage(result, options = {}) {
|
|
|
96
103
|
for (const scanner of incomplete) {
|
|
97
104
|
deferred.push(`${scanner.name}: ${scanner.status}${scanner.error ? ` — ${scanner.error}` : ''}`);
|
|
98
105
|
}
|
|
106
|
+
// Completed, but over less than the whole tree: still not complete coverage.
|
|
107
|
+
for (const scanner of result.scanners) {
|
|
108
|
+
for (const part of scanner.deferred ?? [])
|
|
109
|
+
deferred.push(`${scanner.name}: ${part}`);
|
|
110
|
+
}
|
|
99
111
|
if (result.skippedResults > 0) {
|
|
100
112
|
deferred.push(`${result.skippedResults} scanner result(s) dropped for lacking a safe workspace location`);
|
|
101
113
|
}
|
|
114
|
+
if (result.suppressedResults) {
|
|
115
|
+
exclusions.push(`${result.suppressedResults} result(s) suppressed by the engines' own ignore policy`);
|
|
116
|
+
}
|
|
102
117
|
if (result.scope) {
|
|
103
118
|
// A scoped run answers "did this change introduce anything?". It has never
|
|
104
119
|
// seen the rest of the repository and must not imply that it has.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"contracts.js","sourceRoot":"","sources":["../../src/security/contracts.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"contracts.js","sourceRoot":"","sources":["../../src/security/contracts.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { type SecurityCoverage, type SecurityFindingSnapshot, type SecurityGateMode, type SecurityThreshold } from './contracts.js';
|
|
2
2
|
import type { SecurityCheckEvidence } from './workflow.js';
|
|
3
|
+
import { type FixRecordSignature, type FixRecordSignatureCheck, type TrustedKey } from './fixRecordSignature.js';
|
|
3
4
|
/**
|
|
4
5
|
* A Verified Fix Record.
|
|
5
6
|
*
|
|
@@ -16,6 +17,7 @@ import type { SecurityCheckEvidence } from './workflow.js';
|
|
|
16
17
|
*/
|
|
17
18
|
export declare const FIX_RECORD_SCHEMA_V1 = "dvalin-fix-record/v1";
|
|
18
19
|
export declare const FIX_RECORD_SCHEMA_V2 = "dvalin-fix-record/v2";
|
|
20
|
+
export declare const FIX_RECORD_SCHEMA_V3 = "dvalin-fix-record/v3";
|
|
19
21
|
/**
|
|
20
22
|
* Both are readable; v2 is what new records say.
|
|
21
23
|
*
|
|
@@ -29,7 +31,7 @@ export declare const FIX_RECORD_SCHEMA_V2 = "dvalin-fix-record/v2";
|
|
|
29
31
|
* re-deriving because the rules moved under it would break the one promise this
|
|
30
32
|
* format makes; a bug in the rules is not a reason to spend that.
|
|
31
33
|
*/
|
|
32
|
-
export declare const SUPPORTED_FIX_RECORD_SCHEMAS: readonly ["dvalin-fix-record/v1", "dvalin-fix-record/v2"];
|
|
34
|
+
export declare const SUPPORTED_FIX_RECORD_SCHEMAS: readonly ["dvalin-fix-record/v1", "dvalin-fix-record/v2", "dvalin-fix-record/v3"];
|
|
33
35
|
export type FixRecordSchema = typeof SUPPORTED_FIX_RECORD_SCHEMAS[number];
|
|
34
36
|
/** @deprecated Read `record.schema`; write with `FIX_RECORD_SCHEMA_V2`. */
|
|
35
37
|
export declare const FIX_RECORD_SCHEMA = "dvalin-fix-record/v1";
|
|
@@ -52,8 +54,46 @@ export type FixRecordGate = {
|
|
|
52
54
|
* This says which of the three ways a repair can fall short actually occurred,
|
|
53
55
|
* so a machine reader does not have to parse `reasons` prose to find out.
|
|
54
56
|
*/
|
|
55
|
-
export declare const FIX_RECORD_OUTCOMES: readonly ['verified', 'target-remains', 'regressed', 'unverifiable'];
|
|
57
|
+
export declare const FIX_RECORD_OUTCOMES: readonly ['verified', 'target-remains', 'regressed', 'evaded', 'unverifiable'];
|
|
56
58
|
export type FixRecordOutcome = typeof FIX_RECORD_OUTCOMES[number];
|
|
59
|
+
/**
|
|
60
|
+
* Reproduce-then-fix evidence. **Optional, informative, outside the verdict.**
|
|
61
|
+
*
|
|
62
|
+
* The verdict rules of v1 and v2 are frozen, so this field does not feed them;
|
|
63
|
+
* what does is the after-fix run of the same command, which is recorded in
|
|
64
|
+
* `checks` with kind `reproduce` and must pass like any other check. This field
|
|
65
|
+
* carries the half `checks` cannot: that the same tests, byte-identical, failed
|
|
66
|
+
* on the vulnerable code before the fix.
|
|
67
|
+
*/
|
|
68
|
+
export type FixRecordReproduction = {
|
|
69
|
+
/** `reproduced`: observed failing before the fix and passing after it, unchanged. */
|
|
70
|
+
status: 'reproduced' | 'failed-before-fix';
|
|
71
|
+
command: string;
|
|
72
|
+
tests: Array<{
|
|
73
|
+
path: string;
|
|
74
|
+
sha256: string | null;
|
|
75
|
+
}>;
|
|
76
|
+
before: {
|
|
77
|
+
exitCode: number | null;
|
|
78
|
+
};
|
|
79
|
+
after?: {
|
|
80
|
+
exitCode: number | null;
|
|
81
|
+
};
|
|
82
|
+
};
|
|
83
|
+
/**
|
|
84
|
+
* A way the change may have hidden a finding instead of fixing it. **v3 only.**
|
|
85
|
+
*
|
|
86
|
+
* Names a location and a kind, never code: a record is not a copy of the
|
|
87
|
+
* scanned files (FV-15), so the offending line itself is not carried.
|
|
88
|
+
*/
|
|
89
|
+
export type FixRecordEvasion = {
|
|
90
|
+
kind: 'equivalent-sink' | 'target-file-deleted' | 'test-deleted' | 'assertions-removed';
|
|
91
|
+
path: string;
|
|
92
|
+
line?: number;
|
|
93
|
+
family?: string;
|
|
94
|
+
ruleId?: string;
|
|
95
|
+
removed?: number;
|
|
96
|
+
};
|
|
57
97
|
export type FixRecordScan = {
|
|
58
98
|
scanId: string;
|
|
59
99
|
completedAt: string;
|
|
@@ -92,6 +132,13 @@ export type VerifiedFixRecord = {
|
|
|
92
132
|
* to exit codes.
|
|
93
133
|
*/
|
|
94
134
|
introduced?: SecurityFindingSnapshot[] | null;
|
|
135
|
+
/**
|
|
136
|
+
* What in the change looks like hiding a finding rather than fixing it —
|
|
137
|
+
* a sibling sink, a deleted vulnerable file, deleted tests or assertions.
|
|
138
|
+
* **v3 only.** `[]` means it was looked for and none was found; `null`
|
|
139
|
+
* means it was not determined, which, as with `introduced`, cannot verify.
|
|
140
|
+
*/
|
|
141
|
+
evasion?: FixRecordEvasion[] | null;
|
|
95
142
|
};
|
|
96
143
|
/** The rule the verdict was reached under. **v2 only.** */
|
|
97
144
|
gate?: FixRecordGate;
|
|
@@ -103,6 +150,8 @@ export type VerifiedFixRecord = {
|
|
|
103
150
|
};
|
|
104
151
|
/** Commands Dvalin ran itself, with the exit codes it observed. */
|
|
105
152
|
checks: SecurityCheckEvidence[];
|
|
153
|
+
/** Reproduce-then-fix evidence, when the fix loop ran one. Informative; see the type. */
|
|
154
|
+
reproduction?: FixRecordReproduction;
|
|
106
155
|
assurance: 'scan-only' | 'scan-and-checks';
|
|
107
156
|
verdict: {
|
|
108
157
|
verified: boolean;
|
|
@@ -115,11 +164,14 @@ export type VerifiedFixRecord = {
|
|
|
115
164
|
};
|
|
116
165
|
policyHash?: string;
|
|
117
166
|
/**
|
|
118
|
-
*
|
|
119
|
-
*
|
|
120
|
-
*
|
|
167
|
+
* Who vouched for this record. Optional on every schema version.
|
|
168
|
+
*
|
|
169
|
+
* The hash makes a record tamper-*evident*; it cannot say who issued it,
|
|
170
|
+
* because nothing in it is beyond a forger's reach. A signature binds a key
|
|
171
|
+
* to the hash. Excluded from `recordHash`, so signing never changes the hash
|
|
172
|
+
* and a record may carry several signatures. See `fixRecordSignature.ts`.
|
|
121
173
|
*/
|
|
122
|
-
signatures?:
|
|
174
|
+
signatures?: FixRecordSignature[];
|
|
123
175
|
recordHash: string;
|
|
124
176
|
};
|
|
125
177
|
export type FixRecordInput = {
|
|
@@ -142,11 +194,19 @@ export type FixRecordInput = {
|
|
|
142
194
|
gate: FixRecordGate;
|
|
143
195
|
introduced: SecurityFindingSnapshot[] | null;
|
|
144
196
|
};
|
|
197
|
+
/**
|
|
198
|
+
* Supplying this (with `regression`) issues a v3 record. `null` says the
|
|
199
|
+
* producer could not determine it — e.g. no git history to diff — and v3
|
|
200
|
+
* treats that as unverifiable. A producer that cannot look should issue v2,
|
|
201
|
+
* whose renderers say plainly that evasion was not evaluated.
|
|
202
|
+
*/
|
|
203
|
+
evasion?: FixRecordEvasion[] | null;
|
|
145
204
|
changes?: {
|
|
146
205
|
files: string[];
|
|
147
206
|
diffHash: string;
|
|
148
207
|
};
|
|
149
208
|
checks: SecurityCheckEvidence[];
|
|
209
|
+
reproduction?: FixRecordReproduction;
|
|
150
210
|
audit?: {
|
|
151
211
|
runId: string;
|
|
152
212
|
headHash: string;
|
|
@@ -199,6 +259,24 @@ export declare function evaluateFixVerdictV2(input: {
|
|
|
199
259
|
reasons: string[];
|
|
200
260
|
outcome: FixRecordOutcome;
|
|
201
261
|
};
|
|
262
|
+
/**
|
|
263
|
+
* The v3 rule: v2, plus "did the change hide a finding instead of fixing it?"
|
|
264
|
+
*
|
|
265
|
+
* v2 asks what the scanner sees. A scanner can be made not to see: the
|
|
266
|
+
* dangerous call moved to a sibling its rule does not match, the vulnerable
|
|
267
|
+
* file deleted, the test that would have failed deleted. Each leaves v2's
|
|
268
|
+
* evidence clean while the vulnerability, or the check of it, is gone in the
|
|
269
|
+
* wrong way. v3 records what the diff shows of that and fails on it.
|
|
270
|
+
*
|
|
271
|
+
* `evasion: null` fails, for the same reason `introduced: null` does.
|
|
272
|
+
*/
|
|
273
|
+
export declare function evaluateFixVerdictV3(input: Parameters<typeof evaluateFixVerdictV2>[0] & {
|
|
274
|
+
evasion: FixRecordEvasion[] | null | undefined;
|
|
275
|
+
}): {
|
|
276
|
+
verified: boolean;
|
|
277
|
+
reasons: string[];
|
|
278
|
+
outcome: FixRecordOutcome;
|
|
279
|
+
};
|
|
202
280
|
/**
|
|
203
281
|
* Re-derive a record's verdict under the rules of its own schema version.
|
|
204
282
|
*
|
|
@@ -211,12 +289,29 @@ export declare function deriveFixVerdict(record: Pick<VerifiedFixRecord, 'schema
|
|
|
211
289
|
outcome?: FixRecordOutcome;
|
|
212
290
|
};
|
|
213
291
|
export declare function buildFixRecord(input: FixRecordInput): VerifiedFixRecord;
|
|
214
|
-
/**
|
|
292
|
+
/**
|
|
293
|
+
* Hash of everything except the hash itself and the signatures over it, in
|
|
294
|
+
* canonical JSON so key order cannot change it.
|
|
295
|
+
*
|
|
296
|
+
* Signatures sign the hash, so they cannot also be inside it. Records issued
|
|
297
|
+
* before signing existed never carried the field, so excluding it leaves every
|
|
298
|
+
* one of their hashes unchanged.
|
|
299
|
+
*/
|
|
215
300
|
export declare function fixRecordHash(record: Omit<VerifiedFixRecord, 'recordHash'> | VerifiedFixRecord): string;
|
|
216
301
|
export type FixRecordVerification = {
|
|
217
302
|
ok: boolean;
|
|
218
303
|
reasons: string[];
|
|
219
304
|
record?: VerifiedFixRecord;
|
|
305
|
+
/** One entry per signature the record carries; empty for an unsigned record. */
|
|
306
|
+
signatures?: FixRecordSignatureCheck[];
|
|
307
|
+
};
|
|
308
|
+
export type FixRecordVerifyOptions = {
|
|
309
|
+
/**
|
|
310
|
+
* Keys the reader accepts. Naming any makes a trusted signature required:
|
|
311
|
+
* a reader who says whose word it takes has said an unsigned record, or one
|
|
312
|
+
* signed only by somebody else, is not enough.
|
|
313
|
+
*/
|
|
314
|
+
trustedKeys?: TrustedKey[];
|
|
220
315
|
};
|
|
221
316
|
/**
|
|
222
317
|
* Re-derive a record offline.
|
|
@@ -226,6 +321,6 @@ export type FixRecordVerification = {
|
|
|
226
321
|
* It answers "is this record internally sound and unmodified", not "is the
|
|
227
322
|
* repair still good"; re-running the scanners is a separate, explicit step.
|
|
228
323
|
*/
|
|
229
|
-
export declare function verifyFixRecord(value: unknown): FixRecordVerification;
|
|
324
|
+
export declare function verifyFixRecord(value: unknown, options?: FixRecordVerifyOptions): FixRecordVerification;
|
|
230
325
|
/** One-line summary for a terminal or a pull-request comment. */
|
|
231
326
|
export declare function renderFixRecord(record: VerifiedFixRecord): string;
|