dvalincode 0.20.1 → 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.
Files changed (123) hide show
  1. package/README.md +209 -4
  2. package/README.zh-CN.md +160 -4
  3. package/dist/agent/compact.d.ts +8 -0
  4. package/dist/agent/compact.js +44 -5
  5. package/dist/agent/compact.js.map +1 -1
  6. package/dist/agent/loop.d.ts +5 -0
  7. package/dist/agent/loop.js +16 -7
  8. package/dist/agent/loop.js.map +1 -1
  9. package/dist/agent/runner.d.ts +4 -3
  10. package/dist/agent/runner.js +81 -8
  11. package/dist/agent/runner.js.map +1 -1
  12. package/dist/agent/session.d.ts +7 -0
  13. package/dist/agent/session.js +27 -1
  14. package/dist/agent/session.js.map +1 -1
  15. package/dist/agent/types.d.ts +5 -1
  16. package/dist/agent/types.js.map +1 -1
  17. package/dist/audit/log.d.ts +5 -1
  18. package/dist/audit/log.js.map +1 -1
  19. package/dist/commands/dvalin.d.ts +7 -1
  20. package/dist/commands/dvalin.js +209 -9
  21. package/dist/commands/dvalin.js.map +1 -1
  22. package/dist/commands/provider.js +2 -0
  23. package/dist/commands/provider.js.map +1 -1
  24. package/dist/commands/run.js +4 -2
  25. package/dist/commands/run.js.map +1 -1
  26. package/dist/commands/security.d.ts +2 -0
  27. package/dist/commands/security.js +228 -14
  28. package/dist/commands/security.js.map +1 -1
  29. package/dist/core/policy.d.ts +15 -0
  30. package/dist/core/policy.js +115 -4
  31. package/dist/core/policy.js.map +1 -1
  32. package/dist/harness/run.d.ts +8 -2
  33. package/dist/harness/run.js +1 -1
  34. package/dist/harness/run.js.map +1 -1
  35. package/dist/mcp/server.js +5 -2
  36. package/dist/mcp/server.js.map +1 -1
  37. package/dist/providers/anthropic.js +14 -2
  38. package/dist/providers/anthropic.js.map +1 -1
  39. package/dist/providers/openaiCompatible.js +7 -6
  40. package/dist/providers/openaiCompatible.js.map +1 -1
  41. package/dist/providers/retry.d.ts +32 -0
  42. package/dist/providers/retry.js +150 -0
  43. package/dist/providers/retry.js.map +1 -0
  44. package/dist/providers/types.d.ts +10 -0
  45. package/dist/remediation/automate.d.ts +1 -1
  46. package/dist/remediation/automate.js +2 -1
  47. package/dist/remediation/automate.js.map +1 -1
  48. package/dist/remediation/codeQualityExport.d.ts +25 -0
  49. package/dist/remediation/codeQualityExport.js +24 -0
  50. package/dist/remediation/codeQualityExport.js.map +1 -0
  51. package/dist/remediation/evasion.d.ts +61 -0
  52. package/dist/remediation/evasion.js +190 -0
  53. package/dist/remediation/evasion.js.map +1 -0
  54. package/dist/remediation/fixLoop.d.ts +255 -0
  55. package/dist/remediation/fixLoop.js +639 -0
  56. package/dist/remediation/fixLoop.js.map +1 -0
  57. package/dist/remediation/fixLoopStats.d.ts +93 -0
  58. package/dist/remediation/fixLoopStats.js +244 -0
  59. package/dist/remediation/fixLoopStats.js.map +1 -0
  60. package/dist/remediation/rebase.d.ts +44 -0
  61. package/dist/remediation/rebase.js +114 -0
  62. package/dist/remediation/rebase.js.map +1 -0
  63. package/dist/remediation/reproduce.d.ts +47 -0
  64. package/dist/remediation/reproduce.js +75 -0
  65. package/dist/remediation/reproduce.js.map +1 -0
  66. package/dist/remediation/sarif.d.ts +4 -1
  67. package/dist/remediation/sarif.js +19 -1
  68. package/dist/remediation/sarif.js.map +1 -1
  69. package/dist/remediation/scannerSuite.d.ts +51 -3
  70. package/dist/remediation/scannerSuite.js +346 -87
  71. package/dist/remediation/scannerSuite.js.map +1 -1
  72. package/dist/remediation/verify.d.ts +8 -0
  73. package/dist/remediation/verify.js +24 -11
  74. package/dist/remediation/verify.js.map +1 -1
  75. package/dist/security/config.d.ts +8 -2
  76. package/dist/security/config.js +10 -3
  77. package/dist/security/config.js.map +1 -1
  78. package/dist/security/contracts.js +15 -0
  79. package/dist/security/contracts.js.map +1 -1
  80. package/dist/security/fixRecord.d.ts +103 -8
  81. package/dist/security/fixRecord.js +113 -11
  82. package/dist/security/fixRecord.js.map +1 -1
  83. package/dist/security/fixRecordFile.d.ts +11 -2
  84. package/dist/security/fixRecordFile.js +20 -2
  85. package/dist/security/fixRecordFile.js.map +1 -1
  86. package/dist/security/fixRecordSignature.d.ts +104 -0
  87. package/dist/security/fixRecordSignature.js +227 -0
  88. package/dist/security/fixRecordSignature.js.map +1 -0
  89. package/dist/security/guardedScan.d.ts +39 -0
  90. package/dist/security/guardedScan.js +45 -0
  91. package/dist/security/guardedScan.js.map +1 -0
  92. package/dist/security/onboarding.d.ts +28 -0
  93. package/dist/security/onboarding.js +124 -0
  94. package/dist/security/onboarding.js.map +1 -0
  95. package/dist/security/reproduceInCi.d.ts +44 -0
  96. package/dist/security/reproduceInCi.js +96 -0
  97. package/dist/security/reproduceInCi.js.map +1 -0
  98. package/dist/security/reverify.d.ts +130 -0
  99. package/dist/security/reverify.js +361 -0
  100. package/dist/security/reverify.js.map +1 -0
  101. package/dist/security/suppressionGuard.d.ts +58 -0
  102. package/dist/security/suppressionGuard.js +216 -0
  103. package/dist/security/suppressionGuard.js.map +1 -0
  104. package/dist/security/verifyRun.js +14 -3
  105. package/dist/security/verifyRun.js.map +1 -1
  106. package/dist/security/workflow.d.ts +11 -1
  107. package/dist/security/workflow.js +2 -0
  108. package/dist/security/workflow.js.map +1 -1
  109. package/dist/server/routes/config.js +2 -0
  110. package/dist/server/routes/config.js.map +1 -1
  111. package/dist/server/routes/remediation.js +6 -5
  112. package/dist/server/routes/remediation.js.map +1 -1
  113. package/dist/tools/editFile.js +9 -2
  114. package/dist/tools/editFile.js.map +1 -1
  115. package/dist/tools/registry.d.ts +4 -1
  116. package/dist/tools/registry.js +29 -9
  117. package/dist/tools/registry.js.map +1 -1
  118. package/dist/tools/runSecuritySuite.d.ts +3 -0
  119. package/dist/tools/runSecuritySuite.js +2 -2
  120. package/dist/tools/runSecuritySuite.js.map +1 -1
  121. package/dist/version.d.ts +1 -1
  122. package/dist/version.js +1 -1
  123. package/package.json +1 -1
@@ -0,0 +1,150 @@
1
+ /**
2
+ * Transient provider failures -- a rate limit, an overloaded API, a dropped
3
+ * connection -- are retried with backoff instead of ending the turn. Every
4
+ * attempt is its own `governedProviderFetch` call, so the egress check and the
5
+ * `provider_request` audit record apply to each try; nothing here touches the
6
+ * network itself.
7
+ */
8
+ const DEFAULT_MAX_RETRIES = 3;
9
+ const DEFAULT_BASE_DELAY_MS = 1_000;
10
+ const DEFAULT_MAX_DELAY_MS = 30_000;
11
+ /** Timeout, rate limit, server error, and Anthropic's 529 overload. */
12
+ const RETRYABLE_STATUS = new Set([408, 429, 500, 502, 503, 504, 529]);
13
+ const RETRYABLE_STREAM_ERROR = /overloaded|rate.?limit|server.?error|api_error|timeout|unavailable/i;
14
+ const NETWORK_ERROR_CODES = new Set([
15
+ 'ECONNRESET',
16
+ 'ECONNREFUSED',
17
+ 'ETIMEDOUT',
18
+ 'EPIPE',
19
+ 'EAI_AGAIN',
20
+ 'ENETUNREACH',
21
+ 'UND_ERR_SOCKET',
22
+ 'UND_ERR_CONNECT_TIMEOUT',
23
+ 'UND_ERR_HEADERS_TIMEOUT',
24
+ 'UND_ERR_BODY_TIMEOUT',
25
+ ]);
26
+ /** The provider answered with a non-2xx status. */
27
+ export class ProviderHttpError extends Error {
28
+ status;
29
+ body;
30
+ retryAfterMs;
31
+ constructor(status, body, retryAfterMs) {
32
+ super(`Provider API error ${status}: ${body}`);
33
+ this.status = status;
34
+ this.body = body;
35
+ this.retryAfterMs = retryAfterMs;
36
+ this.name = 'ProviderHttpError';
37
+ }
38
+ }
39
+ /** The provider reported an error, or stopped early, inside a stream that had started. */
40
+ export class ProviderStreamError extends Error {
41
+ errorType;
42
+ retryable;
43
+ constructor(errorType, detail, retryable) {
44
+ super(`Provider stream error (${errorType}): ${detail}`);
45
+ this.errorType = errorType;
46
+ this.retryable = retryable;
47
+ this.name = 'ProviderStreamError';
48
+ }
49
+ }
50
+ /** The error for an `error` payload found inside an event stream. */
51
+ export function providerStreamError(error) {
52
+ const detail = (error && typeof error === 'object' ? error : {});
53
+ const type = String(detail.type ?? detail.code ?? 'error');
54
+ const message = typeof detail.message === 'string' ? detail.message : JSON.stringify(error);
55
+ return new ProviderStreamError(type, message, RETRYABLE_STREAM_ERROR.test(`${type} ${String(detail.code ?? '')}`));
56
+ }
57
+ /** `retry-after-ms`, or `retry-after` in seconds or as an HTTP date. */
58
+ export function retryAfterMs(headers) {
59
+ const ms = headers.get('retry-after-ms');
60
+ if (ms !== null && Number.isFinite(Number(ms)))
61
+ return Math.max(0, Number(ms));
62
+ const value = headers.get('retry-after');
63
+ if (value === null)
64
+ return undefined;
65
+ if (Number.isFinite(Number(value)))
66
+ return Math.max(0, Number(value) * 1_000);
67
+ const date = Date.parse(value);
68
+ return Number.isNaN(date) ? undefined : Math.max(0, date - Date.now());
69
+ }
70
+ const CONTEXT_OVERFLOW = /context.?length|context window|maximum context|prompt is too long|too many tokens|input is too long|reduce the length/i;
71
+ /** The provider refused the request because the prompt exceeds the model's context window. */
72
+ export function isContextOverflowError(err) {
73
+ return err instanceof ProviderHttpError && (err.status === 400 || err.status === 413) && CONTEXT_OVERFLOW.test(err.body);
74
+ }
75
+ export function isRetryableProviderError(err) {
76
+ if (err instanceof ProviderHttpError)
77
+ return RETRYABLE_STATUS.has(err.status);
78
+ if (err instanceof ProviderStreamError)
79
+ return err.retryable;
80
+ if (!(err instanceof Error))
81
+ return false;
82
+ const code = err.code ?? err.cause?.code;
83
+ if (typeof code === 'string')
84
+ return NETWORK_ERROR_CODES.has(code);
85
+ // undici reports a refused or dropped connection as `fetch failed` / `terminated`.
86
+ return err instanceof TypeError && /fetch failed|terminated|network/i.test(err.message);
87
+ }
88
+ /**
89
+ * Run `attempt`, retrying transient failures with jittered exponential backoff.
90
+ * `canRetry` lets a streaming caller refuse once output has reached its consumer.
91
+ */
92
+ export async function withProviderRetry(attempt, signal, options = {}, canRetry = () => true) {
93
+ const maxRetries = options.maxRetries ?? DEFAULT_MAX_RETRIES;
94
+ for (let retry = 0;; retry++) {
95
+ try {
96
+ return await attempt();
97
+ }
98
+ catch (err) {
99
+ if (signal?.aborted || retry >= maxRetries || !canRetry() || !isRetryableProviderError(err))
100
+ throw err;
101
+ await sleep(backoffMs(err, retry, options), signal);
102
+ }
103
+ }
104
+ }
105
+ /**
106
+ * One adapter call with retries. A streamed call is retried only until its
107
+ * first delta reaches the caller: after that a retry would repeat output the
108
+ * caller has already shown.
109
+ */
110
+ export function chatWithRetry(request, once, options) {
111
+ const onDelta = request.onDelta;
112
+ if (!onDelta)
113
+ return withProviderRetry(() => once(request), request.signal, options);
114
+ let emitted = false;
115
+ const tracked = {
116
+ ...request,
117
+ onDelta: delta => {
118
+ emitted = true;
119
+ onDelta(delta);
120
+ },
121
+ };
122
+ return withProviderRetry(() => once(tracked), request.signal, options, () => !emitted);
123
+ }
124
+ function backoffMs(err, retry, options) {
125
+ const maxDelay = options.maxDelayMs ?? DEFAULT_MAX_DELAY_MS;
126
+ const hinted = err instanceof ProviderHttpError ? err.retryAfterMs : undefined;
127
+ if (hinted !== undefined)
128
+ return Math.min(hinted, maxDelay);
129
+ const exponential = Math.min(maxDelay, (options.baseDelayMs ?? DEFAULT_BASE_DELAY_MS) * 2 ** retry);
130
+ // Equal jitter, so runs that failed together do not all retry together.
131
+ return exponential / 2 + Math.random() * (exponential / 2);
132
+ }
133
+ function sleep(ms, signal) {
134
+ return new Promise((resolve, reject) => {
135
+ if (signal?.aborted) {
136
+ reject(signal.reason);
137
+ return;
138
+ }
139
+ const onAbort = () => {
140
+ clearTimeout(timer);
141
+ reject(signal.reason);
142
+ };
143
+ const timer = setTimeout(() => {
144
+ signal?.removeEventListener('abort', onAbort);
145
+ resolve();
146
+ }, ms);
147
+ signal?.addEventListener('abort', onAbort, { once: true });
148
+ });
149
+ }
150
+ //# sourceMappingURL=retry.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"retry.js","sourceRoot":"","sources":["../../src/providers/retry.ts"],"names":[],"mappings":"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"}
@@ -1,9 +1,19 @@
1
1
  import type { AuditSink } from '../audit/log.js';
2
2
  import type { ResolvedPolicy } from '../core/policy.js';
3
+ /** How an adapter retries transient provider failures. The defaults suit live use. */
4
+ export type RetryOptions = {
5
+ /** Retries after the first attempt (default 3). */
6
+ maxRetries?: number;
7
+ /** First backoff delay before jitter (default 1s); doubles on each retry. */
8
+ baseDelayMs?: number;
9
+ /** Ceiling for one delay, including a provider's retry-after hint (default 30s). */
10
+ maxDelayMs?: number;
11
+ };
3
12
  export type ProviderConfig = {
4
13
  apiKey?: string;
5
14
  baseUrl?: string;
6
15
  model?: string;
16
+ retry?: RetryOptions;
7
17
  };
8
18
  export type CacheControl = {
9
19
  type: 'ephemeral';
@@ -3,7 +3,7 @@ import type { RemediationFinding } from './sarif.js';
3
3
  import type { SecurityCheckEvidence } from '../security/workflow.js';
4
4
  export declare const VERIFICATION_MARKER = "DVALIN_VERIFICATION_PASSED";
5
5
  export declare function buildAutomatedFixPrompt(findings: RemediationFinding[], worktreeContext?: string): string;
6
- export declare function buildDraftPrPrompt(findings: RemediationFinding[]): string;
6
+ export declare function buildDraftPrPrompt(findings: RemediationFinding[], recordPath?: string): string;
7
7
  export type VerificationGate = {
8
8
  passed: boolean;
9
9
  reasons: string[];
@@ -29,13 +29,14 @@ export function buildAutomatedFixPrompt(findings, worktreeContext) {
29
29
  'Return a concise summary of confirmed fixes, rejected findings, changed files, and checks run.',
30
30
  ].filter(Boolean).join('\n');
31
31
  }
32
- export function buildDraftPrPrompt(findings) {
32
+ export function buildDraftPrPrompt(findings, recordPath) {
33
33
  return [
34
34
  'The independent Dvalin verification gate passed. Publish this isolated remediation branch as a draft pull request.',
35
35
  '',
36
36
  `Remediated findings: ${findings.map(finding => `${finding.ruleId} (${finding.path})`).join('; ')}`,
37
37
  '',
38
38
  'Re-check git status and diff, commit only the remediation changes, push the current branch, and create a draft PR with gh.',
39
+ ...(recordPath ? [`Include ${recordPath} in the commit unchanged: it is the Verified Fix Record CI re-executes with \`reverify\`, and editing it invalidates it.`] : []),
39
40
  'The PR body must include vulnerability impact, source validation, changed files, tests and scanner evidence, and remaining risk.',
40
41
  'Do not merge the PR and do not mark it ready for review. Return the draft PR URL.',
41
42
  ].join('\n');
@@ -1 +1 @@
1
- {"version":3,"file":"automate.js","sourceRoot":"","sources":["../../src/remediation/automate.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"automate.js","sourceRoot":"","sources":["../../src/remediation/automate.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,25 @@
1
+ import type { DvalinScanSuiteResult } from './scannerSuite.js';
2
+ /**
3
+ * Emit a scan as a GitLab Code Quality report.
4
+ *
5
+ * GitLab's free tier renders this format in the merge request widget and on
6
+ * the diff, the way GitHub renders SARIF; its own SARIF ingestion needs the
7
+ * Ultimate tier. The fingerprint is the one the baseline uses, so GitLab's
8
+ * "new in this merge request" comparison agrees with Dvalin's.
9
+ *
10
+ * Format: https://docs.gitlab.com/ci/testing/code_quality/#code-quality-report-format
11
+ */
12
+ export type CodeQualitySeverity = 'info' | 'minor' | 'major' | 'critical' | 'blocker';
13
+ export type CodeQualityIssue = {
14
+ description: string;
15
+ check_name: string;
16
+ fingerprint: string;
17
+ severity: CodeQualitySeverity;
18
+ location: {
19
+ path: string;
20
+ lines: {
21
+ begin: number;
22
+ };
23
+ };
24
+ };
25
+ export declare function buildGitlabCodeQuality(result: DvalinScanSuiteResult, root: string): CodeQualityIssue[];
@@ -0,0 +1,24 @@
1
+ import path from 'node:path';
2
+ import { findingFingerprint, severityOfFinding } from '../security/contracts.js';
3
+ const SEVERITY = {
4
+ critical: 'blocker',
5
+ high: 'critical',
6
+ medium: 'major',
7
+ low: 'minor',
8
+ };
9
+ export function buildGitlabCodeQuality(result, root) {
10
+ return result.findings.map(finding => {
11
+ const relative = path.isAbsolute(finding.path) ? path.relative(root, finding.path) : finding.path;
12
+ return {
13
+ description: `${finding.ruleName ?? finding.ruleId}: ${finding.message}`,
14
+ check_name: finding.ruleId,
15
+ fingerprint: findingFingerprint(finding),
16
+ severity: SEVERITY[severityOfFinding(finding)],
17
+ location: {
18
+ path: relative.split(path.sep).join('/'),
19
+ lines: { begin: finding.startLine && finding.startLine > 0 ? finding.startLine : 1 },
20
+ },
21
+ };
22
+ });
23
+ }
24
+ //# sourceMappingURL=codeQualityExport.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"codeQualityExport.js","sourceRoot":"","sources":["../../src/remediation/codeQualityExport.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,kBAAkB,EAAE,iBAAiB,EAAyB,MAAM,0BAA0B,CAAC;AAwBxG,MAAM,QAAQ,GAAkD;IAC9D,QAAQ,EAAE,SAAS;IACnB,IAAI,EAAE,UAAU;IAChB,MAAM,EAAE,OAAO;IACf,GAAG,EAAE,OAAO;CACb,CAAC;AAEF,MAAM,UAAU,sBAAsB,CAAC,MAA6B,EAAE,IAAY;IAChF,OAAO,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE;QACnC,MAAM,QAAQ,GAAG,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC;QAClG,OAAO;YACL,WAAW,EAAE,GAAG,OAAO,CAAC,QAAQ,IAAI,OAAO,CAAC,MAAM,KAAK,OAAO,CAAC,OAAO,EAAE;YACxE,UAAU,EAAE,OAAO,CAAC,MAAM;YAC1B,WAAW,EAAE,kBAAkB,CAAC,OAAO,CAAC;YACxC,QAAQ,EAAE,QAAQ,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;YAC9C,QAAQ,EAAE;gBACR,IAAI,EAAE,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC;gBACxC,KAAK,EAAE,EAAE,KAAK,EAAE,OAAO,CAAC,SAAS,IAAI,OAAO,CAAC,SAAS,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE;aACrF;SACF,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC"}
@@ -0,0 +1,61 @@
1
+ import type { SecurityFindingSnapshot } from '../security/contracts.js';
2
+ import type { FixRecordEvasion } from '../security/fixRecord.js';
3
+ /**
4
+ * Ways to make a finding stop being reported without fixing it.
5
+ *
6
+ * The suppression guard handles the bluntest one — telling the scanner to
7
+ * look away. These are the next ones an agent under "until the scanner is
8
+ * clean" pressure reaches for, and each is visible in the diff:
9
+ *
10
+ * - **equivalent sink**: the dangerous call is rewritten into a sibling the
11
+ * rule does not match — `eval(x)` becomes `new Function(x)()`, `exec(cmd)`
12
+ * becomes `spawn(cmd, { shell: true })`. The vulnerability is the same; only
13
+ * the spelling moved. Flagged when the change adds a sink of the same family
14
+ * as a target it claims to fix.
15
+ * - **target file deleted**: the finding is gone because the code is. Removing
16
+ * functionality may be right, but it is a product decision, not a repair, and
17
+ * it is made by a person in its own change.
18
+ * - **tests deleted or assertions removed**: the checks pass because they ask
19
+ * less. A fix that needs a test to stop asserting is not a fix.
20
+ *
21
+ * These are heuristics, and say so: a signal is a reason the loop will not
22
+ * call the change verified, with the evidence attached, not a claim of intent.
23
+ * What is not detected here — a sink in a family not listed, logic deleted
24
+ * inside a file that survives, untested changed lines — is not detected.
25
+ */
26
+ export type EvasionSignal = {
27
+ kind: 'equivalent-sink';
28
+ path: string;
29
+ line: number;
30
+ family: SinkFamily;
31
+ text: string;
32
+ } | {
33
+ kind: 'target-file-deleted';
34
+ path: string;
35
+ ruleId: string;
36
+ } | {
37
+ kind: 'test-deleted';
38
+ path: string;
39
+ } | {
40
+ kind: 'assertions-removed';
41
+ path: string;
42
+ removed: number;
43
+ };
44
+ export type SinkFamily = 'code-execution' | 'command-execution' | 'sql' | 'html' | 'deserialization';
45
+ export declare function isTestPath(file: string): boolean;
46
+ export declare function sinkFamilyOf(finding: Pick<SecurityFindingSnapshot, 'ruleId' | 'message'>): SinkFamily | undefined;
47
+ export declare function detectEvasion(cwd: string, baseCommit: string, targets: SecurityFindingSnapshot[], options?: {
48
+ exempt?: string[];
49
+ }): Promise<EvasionSignal[]>;
50
+ /** The record's form of a signal: location and kind, no code (FV-15). */
51
+ export declare function toRecordEvasion(signal: EvasionSignal): FixRecordEvasion;
52
+ export declare function describeEvasion(signal: EvasionSignal): string;
53
+ export declare function evasionKey(signal: EvasionSignal): string;
54
+ /** Added and removed lines per file from a zero-context diff, new-side line numbers for additions. */
55
+ export declare function parseDiff(diff: string): {
56
+ added: Map<string, Array<{
57
+ line: number;
58
+ text: string;
59
+ }>>;
60
+ removed: Map<string, string[]>;
61
+ };
@@ -0,0 +1,190 @@
1
+ import { execFile } from 'node:child_process';
2
+ import { readFile } from 'node:fs/promises';
3
+ import path from 'node:path';
4
+ import { promisify } from 'node:util';
5
+ const execFileAsync = promisify(execFile);
6
+ /** Which family a finding belongs to, read from its rule and message. */
7
+ const FAMILY_OF_FINDING = [
8
+ { family: 'code-execution', pattern: /\beval\b|code[-_ ]?injection|dynamic code|function constructor/i },
9
+ { family: 'command-execution', pattern: /command[-_ ]?injection|os[-_ ]?command|shell|child[-_ ]?process|subprocess/i },
10
+ { family: 'sql', pattern: /\bsql\b|sqli/i },
11
+ { family: 'html', pattern: /xss|cross[-_ ]?site|html[-_ ]?injection|innerhtml|dangerously/i },
12
+ { family: 'deserialization', pattern: /deserializ|pickle|unserialize|yaml\.load/i },
13
+ ];
14
+ /** Dangerous calls per family. A fix for that family that adds one of these has moved the sink, not removed it. */
15
+ const SINKS = {
16
+ 'code-execution': [
17
+ /\beval\s*\(/,
18
+ /\bnew\s+Function\s*\(/,
19
+ /\b(?:setTimeout|setInterval)\s*\(\s*['"`]/,
20
+ /\bvm\.(?:runIn\w*|compileFunction)\s*\(/,
21
+ /\bexec\s*\(\s*compile\s*\(/,
22
+ ],
23
+ 'command-execution': [
24
+ /\bshell\s*:\s*true\b/,
25
+ /\bshell\s*=\s*True\b/,
26
+ /\bexecSync\s*\(/,
27
+ /\bchild_process\.exec\s*\(/,
28
+ /\bos\.(?:system|popen)\s*\(/,
29
+ /\bRuntime\.getRuntime\(\)\.exec\s*\(/,
30
+ ],
31
+ sql: [
32
+ /['"`]\s*(?:SELECT|INSERT|UPDATE|DELETE)\b[^'"`]*['"`]\s*\+/i,
33
+ /\$\{[^}]+\}[^`]*\b(?:FROM|WHERE|VALUES|SET)\b|\b(?:SELECT|INSERT|UPDATE|DELETE)\b[^`]*\$\{/i,
34
+ /\.(?:raw|unsafe|queryRaw|executeRaw)\w*\s*\(/,
35
+ /\bf['"]\s*(?:SELECT|INSERT|UPDATE|DELETE)\b/i,
36
+ ],
37
+ html: [
38
+ /\b(?:innerHTML|outerHTML)\s*=/,
39
+ /\bdangerouslySetInnerHTML\b/,
40
+ /\binsertAdjacentHTML\s*\(/,
41
+ /\bdocument\.write(?:ln)?\s*\(/,
42
+ /\bv-html\b/,
43
+ /\|\s*safe\b|\bmark_safe\s*\(/,
44
+ ],
45
+ deserialization: [
46
+ /\bpickle\.loads?\s*\(/,
47
+ /\byaml\.load\s*\((?![^)]*SafeLoader)/,
48
+ /\bunserialize\s*\(/,
49
+ /\bObjectInputStream\b/,
50
+ /\bMarshal\.load\b/,
51
+ ],
52
+ };
53
+ const TEST_PATH = /(?:^|\/)(?:tests?|specs?|__tests__|testdata)\/|(?:^|\/)[^/]*\.(?:test|spec)\.[cm]?[jt]sx?$|(?:^|\/)test_[^/]*\.py$|(?:^|\/)[^/]*_test\.(?:py|go)$|(?:^|\/)[^/]*Tests?\.(?:java|kt|cs)$/i;
54
+ const ASSERTION = /\b(?:expect|assert\w*|should|t\.(?:Error|Fatal)\w*|require\.\w+|verify)\b/;
55
+ export function isTestPath(file) {
56
+ return TEST_PATH.test(file.split('\\').join('/'));
57
+ }
58
+ export function sinkFamilyOf(finding) {
59
+ const text = `${finding.ruleId} ${finding.message}`;
60
+ return FAMILY_OF_FINDING.find(entry => entry.pattern.test(text))?.family;
61
+ }
62
+ export async function detectEvasion(cwd, baseCommit, targets, options = {}) {
63
+ const exempt = new Set(options.exempt ?? []);
64
+ const signals = [];
65
+ const status = await git(cwd, ['diff', '--name-status', '--no-renames', '--relative', baseCommit, '--', '.']);
66
+ const deleted = new Set();
67
+ for (const line of status.split('\n').filter(Boolean)) {
68
+ const [code, file] = line.split('\t');
69
+ if (code?.startsWith('D') && file)
70
+ deleted.add(file);
71
+ }
72
+ for (const target of targets) {
73
+ if (deleted.has(target.path))
74
+ signals.push({ kind: 'target-file-deleted', path: target.path, ruleId: target.ruleId });
75
+ }
76
+ for (const file of deleted) {
77
+ if (isTestPath(file) && !exempt.has(file))
78
+ signals.push({ kind: 'test-deleted', path: file });
79
+ }
80
+ const diff = parseDiff(await git(cwd, ['diff', '--unified=0', '--no-color', '--no-ext-diff', '--relative', baseCommit, '--', '.']));
81
+ const untracked = (await git(cwd, ['ls-files', '--others', '--exclude-standard'])).split('\n').filter(Boolean);
82
+ const families = new Set(targets.map(sinkFamilyOf).filter((family) => Boolean(family)));
83
+ const addedLines = new Map(diff.added);
84
+ for (const file of untracked) {
85
+ if (addedLines.has(file))
86
+ continue;
87
+ const content = await readTracked(cwd, file);
88
+ addedLines.set(file, content.split('\n').map((text, index) => ({ line: index + 1, text })));
89
+ }
90
+ for (const [file, lines] of addedLines) {
91
+ // A test that exercises the vulnerable call is how reproduction works.
92
+ if (isTestPath(file) || exempt.has(file))
93
+ continue;
94
+ for (const { line, text } of lines) {
95
+ for (const family of families) {
96
+ if (SINKS[family].some(pattern => pattern.test(text))) {
97
+ signals.push({ kind: 'equivalent-sink', path: file, line, family, text: text.trim().slice(0, 160) });
98
+ break;
99
+ }
100
+ }
101
+ }
102
+ }
103
+ for (const [file, removed] of diff.removed) {
104
+ if (!isTestPath(file) || exempt.has(file) || deleted.has(file))
105
+ continue;
106
+ const lostAssertions = removed.filter(text => ASSERTION.test(text)).length
107
+ - (diff.added.get(file) ?? []).filter(({ text }) => ASSERTION.test(text)).length;
108
+ if (lostAssertions > 0)
109
+ signals.push({ kind: 'assertions-removed', path: file, removed: lostAssertions });
110
+ }
111
+ return signals;
112
+ }
113
+ /** The record's form of a signal: location and kind, no code (FV-15). */
114
+ export function toRecordEvasion(signal) {
115
+ switch (signal.kind) {
116
+ case 'equivalent-sink': return { kind: signal.kind, path: signal.path, line: signal.line, family: signal.family };
117
+ case 'target-file-deleted': return { kind: signal.kind, path: signal.path, ruleId: signal.ruleId };
118
+ case 'test-deleted': return { kind: signal.kind, path: signal.path };
119
+ case 'assertions-removed': return { kind: signal.kind, path: signal.path, removed: signal.removed };
120
+ }
121
+ }
122
+ export function describeEvasion(signal) {
123
+ switch (signal.kind) {
124
+ case 'equivalent-sink':
125
+ return `${signal.path}:${signal.line} adds a ${signal.family} sink (\`${signal.text}\`) — the same kind of call the fix was meant to remove`;
126
+ case 'target-file-deleted':
127
+ return `${signal.path} was deleted; ${signal.ruleId} is gone because the code is, which is a product decision for a person, not a repair`;
128
+ case 'test-deleted':
129
+ return `${signal.path} (a test) was deleted`;
130
+ case 'assertions-removed':
131
+ return `${signal.path} lost ${signal.removed} assertion(s)`;
132
+ }
133
+ }
134
+ export function evasionKey(signal) {
135
+ return signal.kind === 'equivalent-sink'
136
+ ? `evasion:${signal.kind}:${signal.path}:${signal.text}`
137
+ : `evasion:${signal.kind}:${signal.path}`;
138
+ }
139
+ /** Added and removed lines per file from a zero-context diff, new-side line numbers for additions. */
140
+ export function parseDiff(diff) {
141
+ const added = new Map();
142
+ const removed = new Map();
143
+ let oldFile;
144
+ let newFile;
145
+ let next = 0;
146
+ let inHeader = false;
147
+ for (const raw of diff.split('\n')) {
148
+ if (raw.startsWith('diff --git ')) {
149
+ inHeader = true;
150
+ oldFile = newFile = undefined;
151
+ continue;
152
+ }
153
+ if (inHeader) {
154
+ if (raw.startsWith('--- ')) {
155
+ const name = raw.slice(4).trim();
156
+ oldFile = name === '/dev/null' ? undefined : name.replace(/^a\//, '');
157
+ continue;
158
+ }
159
+ if (raw.startsWith('+++ ')) {
160
+ const name = raw.slice(4).trim();
161
+ newFile = name === '/dev/null' ? undefined : name.replace(/^b\//, '');
162
+ continue;
163
+ }
164
+ if (!raw.startsWith('@@'))
165
+ continue;
166
+ }
167
+ const hunk = /^@@ -\d+(?:,\d+)? \+(\d+)(?:,\d+)? @@/.exec(raw);
168
+ if (hunk) {
169
+ inHeader = false;
170
+ next = Number(hunk[1]);
171
+ continue;
172
+ }
173
+ if (raw.startsWith('+') && newFile) {
174
+ added.set(newFile, [...(added.get(newFile) ?? []), { line: next, text: raw.slice(1) }]);
175
+ next += 1;
176
+ }
177
+ else if (raw.startsWith('-') && oldFile) {
178
+ removed.set(oldFile, [...(removed.get(oldFile) ?? []), raw.slice(1)]);
179
+ }
180
+ }
181
+ return { added, removed };
182
+ }
183
+ async function readTracked(cwd, file) {
184
+ return readFile(path.join(cwd, file), 'utf8').catch(() => '');
185
+ }
186
+ async function git(cwd, args) {
187
+ const { stdout } = await execFileAsync('git', args, { cwd, maxBuffer: 64 * 1024 * 1024 });
188
+ return stdout;
189
+ }
190
+ //# sourceMappingURL=evasion.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"evasion.js","sourceRoot":"","sources":["../../src/remediation/evasion.ts"],"names":[],"mappings":"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"}