dvalincode 0.16.1 → 0.18.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (129) hide show
  1. package/README.md +203 -44
  2. package/README.zh-CN.md +171 -38
  3. package/THIRD_PARTY_NOTICES.md +98 -43
  4. package/dist/agent/loop.d.ts +1 -1
  5. package/dist/agent/loop.js +2 -1
  6. package/dist/agent/loop.js.map +1 -1
  7. package/dist/agent/runner.js +2 -2
  8. package/dist/agent/runner.js.map +1 -1
  9. package/dist/cli.js +6 -1
  10. package/dist/cli.js.map +1 -1
  11. package/dist/commands/chat.js +3 -2
  12. package/dist/commands/chat.js.map +1 -1
  13. package/dist/commands/data.js +2 -1
  14. package/dist/commands/data.js.map +1 -1
  15. package/dist/commands/dvalin.d.ts +9 -1
  16. package/dist/commands/dvalin.js +185 -44
  17. package/dist/commands/dvalin.js.map +1 -1
  18. package/dist/commands/evidence.js +17 -3
  19. package/dist/commands/evidence.js.map +1 -1
  20. package/dist/commands/mcpInstall.d.ts +2 -0
  21. package/dist/commands/mcpInstall.js +69 -0
  22. package/dist/commands/mcpInstall.js.map +1 -0
  23. package/dist/commands/mcpServe.js +3 -2
  24. package/dist/commands/mcpServe.js.map +1 -1
  25. package/dist/commands/policy.js +2 -1
  26. package/dist/commands/policy.js.map +1 -1
  27. package/dist/commands/report.js +6 -3
  28. package/dist/commands/report.js.map +1 -1
  29. package/dist/commands/runTool.d.ts +20 -0
  30. package/dist/commands/runTool.js +73 -13
  31. package/dist/commands/runTool.js.map +1 -1
  32. package/dist/commands/security.d.ts +47 -0
  33. package/dist/commands/security.js +415 -0
  34. package/dist/commands/security.js.map +1 -0
  35. package/dist/commands/tools.d.ts +11 -1
  36. package/dist/commands/tools.js +24 -3
  37. package/dist/commands/tools.js.map +1 -1
  38. package/dist/commands/update.js +2 -1
  39. package/dist/commands/update.js.map +1 -1
  40. package/dist/core/exitCodes.d.ts +38 -0
  41. package/dist/core/exitCodes.js +38 -0
  42. package/dist/core/exitCodes.js.map +1 -0
  43. package/dist/dvalinCli.d.ts +3 -0
  44. package/dist/dvalinCli.js +36 -0
  45. package/dist/dvalinCli.js.map +1 -0
  46. package/dist/dvalinIndex.d.ts +2 -0
  47. package/dist/dvalinIndex.js +9 -0
  48. package/dist/dvalinIndex.js.map +1 -0
  49. package/dist/evidence/pack.d.ts +8 -0
  50. package/dist/evidence/pack.js +16 -0
  51. package/dist/evidence/pack.js.map +1 -1
  52. package/dist/index.js +2 -1
  53. package/dist/index.js.map +1 -1
  54. package/dist/mcp/install.d.ts +48 -0
  55. package/dist/mcp/install.js +74 -0
  56. package/dist/mcp/install.js.map +1 -0
  57. package/dist/mcp/server.d.ts +12 -1
  58. package/dist/mcp/server.js +233 -14
  59. package/dist/mcp/server.js.map +1 -1
  60. package/dist/remediation/automate.d.ts +4 -1
  61. package/dist/remediation/automate.js +35 -18
  62. package/dist/remediation/automate.js.map +1 -1
  63. package/dist/remediation/diffScope.d.ts +29 -0
  64. package/dist/remediation/diffScope.js +107 -0
  65. package/dist/remediation/diffScope.js.map +1 -0
  66. package/dist/remediation/executor.d.ts +60 -0
  67. package/dist/remediation/executor.js +144 -0
  68. package/dist/remediation/executor.js.map +1 -0
  69. package/dist/remediation/localScan.d.ts +2 -1
  70. package/dist/remediation/localScan.js +73 -3
  71. package/dist/remediation/localScan.js.map +1 -1
  72. package/dist/remediation/sarif.d.ts +6 -0
  73. package/dist/remediation/sarif.js +36 -14
  74. package/dist/remediation/sarif.js.map +1 -1
  75. package/dist/remediation/scannerSuite.d.ts +21 -0
  76. package/dist/remediation/scannerSuite.js +65 -4
  77. package/dist/remediation/scannerSuite.js.map +1 -1
  78. package/dist/remediation/verify.d.ts +38 -0
  79. package/dist/remediation/verify.js +116 -0
  80. package/dist/remediation/verify.js.map +1 -0
  81. package/dist/security/baseline.d.ts +7 -0
  82. package/dist/security/baseline.js +26 -0
  83. package/dist/security/baseline.js.map +1 -0
  84. package/dist/security/config.d.ts +32 -0
  85. package/dist/security/config.js +131 -0
  86. package/dist/security/config.js.map +1 -0
  87. package/dist/security/contracts.d.ts +149 -0
  88. package/dist/security/contracts.js +231 -0
  89. package/dist/security/contracts.js.map +1 -0
  90. package/dist/security/fixRecord.d.ts +125 -0
  91. package/dist/security/fixRecord.js +169 -0
  92. package/dist/security/fixRecord.js.map +1 -0
  93. package/dist/security/fixRecordFile.d.ts +8 -0
  94. package/dist/security/fixRecordFile.js +37 -0
  95. package/dist/security/fixRecordFile.js.map +1 -0
  96. package/dist/security/fixRecordStore.d.ts +23 -0
  97. package/dist/security/fixRecordStore.js +74 -0
  98. package/dist/security/fixRecordStore.js.map +1 -0
  99. package/dist/security/render.d.ts +8 -0
  100. package/dist/security/render.js +20 -0
  101. package/dist/security/render.js.map +1 -0
  102. package/dist/security/suppressions.d.ts +12 -0
  103. package/dist/security/suppressions.js +60 -0
  104. package/dist/security/suppressions.js.map +1 -0
  105. package/dist/security/verifyRun.d.ts +21 -0
  106. package/dist/security/verifyRun.js +74 -0
  107. package/dist/security/verifyRun.js.map +1 -0
  108. package/dist/security/workflow.d.ts +98 -0
  109. package/dist/security/workflow.js +263 -0
  110. package/dist/security/workflow.js.map +1 -0
  111. package/dist/server/routes/remediation.d.ts +19 -0
  112. package/dist/server/routes/remediation.js +90 -18
  113. package/dist/server/routes/remediation.js.map +1 -1
  114. package/dist/tools/registry.d.ts +9 -0
  115. package/dist/tools/registry.js +11 -0
  116. package/dist/tools/registry.js.map +1 -1
  117. package/dist/tools/runCheck.d.ts +6 -0
  118. package/dist/tools/runCheck.js +1 -1
  119. package/dist/tools/runCheck.js.map +1 -1
  120. package/dist/tools/runSecuritySuite.d.ts +3 -0
  121. package/dist/tools/runSecuritySuite.js +18 -11
  122. package/dist/tools/runSecuritySuite.js.map +1 -1
  123. package/dist/tui/app.js +21 -2
  124. package/dist/tui/app.js.map +1 -1
  125. package/dist/tui/render.js +2 -0
  126. package/dist/tui/render.js.map +1 -1
  127. package/dist/version.d.ts +1 -1
  128. package/dist/version.js +1 -1
  129. package/package.json +17 -10
@@ -0,0 +1,107 @@
1
+ import { execFile } from 'node:child_process';
2
+ import { promisify } from 'node:util';
3
+ const execFileAsync = promisify(execFile);
4
+ /**
5
+ * Refs reach `git` as a single argv element, so there is no shell to inject
6
+ * into — but a leading dash would still be read as a flag, and git's own ref
7
+ * grammar is narrower than "any string".
8
+ */
9
+ const SAFE_REF = /^[A-Za-z0-9][A-Za-z0-9._/@{}~^:-]*$/;
10
+ /** `@@ -old,count +new,count @@` — the new-side pair is what a scan reports on. */
11
+ const HUNK_HEADER = /^@@ -\d+(?:,\d+)? \+(\d+)(?:,(\d+))? @@/;
12
+ export function assertSafeRef(ref) {
13
+ if (!SAFE_REF.test(ref)) {
14
+ throw new Error(`Refusing to use '${ref}' as a git revision: expected a ref name or range.`);
15
+ }
16
+ }
17
+ /**
18
+ * Resolve which files and lines changed, so a scan can report on new work
19
+ * without drowning it in a repository's pre-existing findings.
20
+ */
21
+ export async function resolveDiffScope(root, options = {}) {
22
+ const args = ['diff', '--unified=0', '--no-color', '--no-ext-diff', '--diff-filter=d'];
23
+ let ref;
24
+ if (options.staged) {
25
+ args.push('--cached');
26
+ ref = 'staged';
27
+ }
28
+ else if (options.ref) {
29
+ assertSafeRef(options.ref);
30
+ args.push(options.ref);
31
+ ref = options.ref;
32
+ }
33
+ else {
34
+ args.push('HEAD');
35
+ ref = 'HEAD';
36
+ }
37
+ const files = new Set();
38
+ const lines = new Map();
39
+ parseUnifiedDiff(await git(root, args), files, lines);
40
+ // An agent's new files are untracked, and `git diff` cannot see them. They
41
+ // are in scope whole — every line is new.
42
+ if (!options.staged && !options.ref) {
43
+ for (const file of await git(root, ['ls-files', '--others', '--exclude-standard']).then(splitLines)) {
44
+ files.add(file);
45
+ }
46
+ }
47
+ return { ref, files, lines };
48
+ }
49
+ /** Whether a finding at this path and line falls inside the scope. */
50
+ export function isWithinDiffScope(scope, filePath, startLine) {
51
+ if (!scope.files.has(filePath))
52
+ return false;
53
+ const changed = scope.lines.get(filePath);
54
+ // No line detail means the whole file is in scope.
55
+ if (changed === undefined)
56
+ return true;
57
+ // A finding without a line cannot be placed, so keep it rather than lose it.
58
+ return startLine === undefined || changed.has(startLine);
59
+ }
60
+ function parseUnifiedDiff(diff, files, lines) {
61
+ let current;
62
+ for (const line of diff.split('\n')) {
63
+ if (line.startsWith('+++ ')) {
64
+ const target = line.slice(4).trim();
65
+ current = target === '/dev/null' ? undefined : stripDiffPrefix(target);
66
+ if (current)
67
+ files.add(current);
68
+ continue;
69
+ }
70
+ if (!current)
71
+ continue;
72
+ const hunk = HUNK_HEADER.exec(line);
73
+ if (!hunk)
74
+ continue;
75
+ const start = Number(hunk[1]);
76
+ // An absent count means one line; an explicit zero means the hunk only
77
+ // removed lines, and there is nothing on the new side to scan.
78
+ const count = hunk[2] === undefined ? 1 : Number(hunk[2]);
79
+ if (count === 0)
80
+ continue;
81
+ let changed = lines.get(current);
82
+ if (!changed) {
83
+ changed = new Set();
84
+ lines.set(current, changed);
85
+ }
86
+ for (let offset = 0; offset < count; offset += 1)
87
+ changed.add(start + offset);
88
+ }
89
+ }
90
+ /** `+++ b/src/app.ts` → `src/app.ts`. Quoted paths keep git's own escaping. */
91
+ function stripDiffPrefix(target) {
92
+ return target.replace(/^[abciow]\//, '');
93
+ }
94
+ function splitLines(output) {
95
+ return output.split('\n').map(line => line.trim()).filter(Boolean);
96
+ }
97
+ async function git(root, args) {
98
+ try {
99
+ const { stdout } = await execFileAsync('git', args, { cwd: root, maxBuffer: 32 * 1024 * 1024 });
100
+ return stdout;
101
+ }
102
+ catch (error) {
103
+ const detail = error instanceof Error ? error.message : String(error);
104
+ throw new Error(`git ${args.join(' ')} failed: ${detail}`);
105
+ }
106
+ }
107
+ //# sourceMappingURL=diffScope.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"diffScope.js","sourceRoot":"","sources":["../../src/remediation/diffScope.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,60 @@
1
+ /**
2
+ * Who performs a remediation.
3
+ *
4
+ * An executor edits code. That is the whole job: Dvalin runs the project's
5
+ * checks itself and re-scans independently, so nothing here is trusted and
6
+ * there is no trust surface on this interface to get wrong. Choosing an
7
+ * executor is a question of cost and quality, not of what it may be believed
8
+ * about.
9
+ */
10
+ export type ExecutorId = 'dvalin' | 'codex';
11
+ export declare const EXECUTOR_IDS: ExecutorId[];
12
+ /** The subset of agent activity the remediation console renders. */
13
+ export type ExecutorEvent = {
14
+ type: 'tool_call';
15
+ name: string;
16
+ } | {
17
+ type: 'tool_error';
18
+ name: string;
19
+ error: string;
20
+ };
21
+ export type ExecutorRequest = {
22
+ prompt: string;
23
+ cwd: string;
24
+ /** Continue the conversation a previous turn started. */
25
+ resume?: string;
26
+ /** Override the model provider, where the executor has one to override. */
27
+ provider?: string;
28
+ };
29
+ export type ExecutorTurn = {
30
+ /** The executor's final message. Callers read it for a summary or a PR URL. */
31
+ output: string;
32
+ /** Handle for continuing this conversation in a later turn. */
33
+ session?: string;
34
+ };
35
+ export type RemediationExecutor = {
36
+ id: ExecutorId;
37
+ name: string;
38
+ /** `undefined` when usable; otherwise the reason it is not. */
39
+ unavailableReason(): Promise<string | undefined>;
40
+ run(request: ExecutorRequest, onEvent?: (event: ExecutorEvent) => void): Promise<ExecutorTurn>;
41
+ };
42
+ /** Dvalin's own agent: the existing behaviour, unchanged. */
43
+ export declare const dvalinAgentExecutor: RemediationExecutor;
44
+ /**
45
+ * OpenAI's Codex harness, through `codex exec`.
46
+ *
47
+ * `--json` is what makes this usable as a backend rather than a black box:
48
+ * `thread.started` carries the handle that `codex exec resume` needs, which is
49
+ * what keeps fix and publish in one conversation, and completed commands stream
50
+ * out as structured items so a long remediation is not silent.
51
+ */
52
+ export declare const codexExecExecutor: RemediationExecutor;
53
+ /**
54
+ * Read a `codex exec --json` JSONL stream.
55
+ *
56
+ * Exported for its own sake: the parsing is the part worth testing, and it can
57
+ * be exercised against recorded output without a model or a network.
58
+ */
59
+ export declare function parseCodexStream(stdout: string): ExecutorTurn;
60
+ export declare function resolveExecutor(id: ExecutorId): RemediationExecutor;
@@ -0,0 +1,144 @@
1
+ import { spawn } from 'node:child_process';
2
+ import { runAgentTurn } from '../agent/session.js';
3
+ export const EXECUTOR_IDS = ['dvalin', 'codex'];
4
+ /** Dvalin's own agent: the existing behaviour, unchanged. */
5
+ export const dvalinAgentExecutor = {
6
+ id: 'dvalin',
7
+ name: 'Dvalin agent',
8
+ async unavailableReason() {
9
+ return undefined;
10
+ },
11
+ async run(request, onEvent) {
12
+ const turn = await runAgentTurn({
13
+ content: request.prompt,
14
+ cwd: request.cwd,
15
+ sessionId: request.resume,
16
+ mode: 'dvalin',
17
+ codePermissionMode: 'bypass',
18
+ providerOverride: request.provider,
19
+ }, {
20
+ onEvent: event => {
21
+ if (event.type === 'tool_call')
22
+ onEvent?.({ type: 'tool_call', name: event.name });
23
+ if (event.type === 'tool_error')
24
+ onEvent?.({ type: 'tool_error', name: event.name, error: event.error });
25
+ },
26
+ });
27
+ return { output: turn.result.output, session: turn.sessionId };
28
+ },
29
+ };
30
+ /**
31
+ * OpenAI's Codex harness, through `codex exec`.
32
+ *
33
+ * `--json` is what makes this usable as a backend rather than a black box:
34
+ * `thread.started` carries the handle that `codex exec resume` needs, which is
35
+ * what keeps fix and publish in one conversation, and completed commands stream
36
+ * out as structured items so a long remediation is not silent.
37
+ */
38
+ export const codexExecExecutor = {
39
+ id: 'codex',
40
+ name: 'Codex (codex exec)',
41
+ async unavailableReason() {
42
+ const found = await new Promise(resolve => {
43
+ const probe = spawn('codex', ['--version'], { stdio: 'ignore' });
44
+ probe.on('error', () => resolve(false));
45
+ probe.on('close', code => resolve(code === 0));
46
+ });
47
+ if (!found)
48
+ return 'the `codex` CLI is not on PATH — install it with `npm i -g @openai/codex`';
49
+ if (!process.env.CODEX_API_KEY && !process.env.OPENAI_API_KEY) {
50
+ return 'neither CODEX_API_KEY nor OPENAI_API_KEY is set, and `codex exec` needs credentials in automation';
51
+ }
52
+ return undefined;
53
+ },
54
+ async run(request, onEvent) {
55
+ // `workspace-write` is the least permission that still lets a remediation
56
+ // edit code. The isolated worktree, not the sandbox, is what keeps the
57
+ // original workspace out of reach.
58
+ const args = request.resume
59
+ ? ['exec', 'resume', request.resume, '--json', '--sandbox', 'workspace-write', request.prompt]
60
+ : ['exec', '--json', '--sandbox', 'workspace-write', request.prompt];
61
+ const { stdout, stderr, code } = await runCodex(args, request.cwd, onEvent);
62
+ if (code !== 0) {
63
+ throw new Error(`codex exec exited ${code}: ${stderr.trim().slice(0, 500) || 'no stderr'}`);
64
+ }
65
+ return parseCodexStream(stdout);
66
+ },
67
+ };
68
+ /**
69
+ * Read a `codex exec --json` JSONL stream.
70
+ *
71
+ * Exported for its own sake: the parsing is the part worth testing, and it can
72
+ * be exercised against recorded output without a model or a network.
73
+ */
74
+ export function parseCodexStream(stdout) {
75
+ let output = '';
76
+ let session;
77
+ for (const line of stdout.split('\n')) {
78
+ const trimmed = line.trim();
79
+ if (!trimmed)
80
+ continue;
81
+ let event;
82
+ try {
83
+ event = JSON.parse(trimmed);
84
+ }
85
+ catch {
86
+ // Anything the harness prints that is not an event is not ours to read.
87
+ continue;
88
+ }
89
+ if (event.type === 'thread.started' && typeof event.thread_id === 'string') {
90
+ session = event.thread_id;
91
+ continue;
92
+ }
93
+ if (event.type !== 'item.completed')
94
+ continue;
95
+ const item = event.item;
96
+ if (!item)
97
+ continue;
98
+ // The last agent message is the turn's result; earlier ones are progress.
99
+ if (item.type === 'agent_message' && typeof item.text === 'string')
100
+ output = item.text;
101
+ }
102
+ return { output, session };
103
+ }
104
+ export function resolveExecutor(id) {
105
+ return id === 'codex' ? codexExecExecutor : dvalinAgentExecutor;
106
+ }
107
+ function runCodex(args, cwd, onEvent) {
108
+ return new Promise((resolve, reject) => {
109
+ const child = spawn('codex', args, { cwd, env: process.env, stdio: ['ignore', 'pipe', 'pipe'] });
110
+ let stdout = '';
111
+ let stderr = '';
112
+ let pending = '';
113
+ child.stdout.on('data', chunk => {
114
+ stdout += chunk;
115
+ // Report commands as they complete, so a long remediation is not silent.
116
+ pending += chunk;
117
+ const lines = pending.split('\n');
118
+ pending = lines.pop() ?? '';
119
+ for (const line of lines)
120
+ reportCodexLine(line, onEvent);
121
+ });
122
+ child.stderr.on('data', chunk => (stderr += chunk));
123
+ child.on('error', reject);
124
+ child.on('close', code => resolve({ stdout, stderr, code }));
125
+ });
126
+ }
127
+ function reportCodexLine(line, onEvent) {
128
+ if (!onEvent || !line.trim())
129
+ return;
130
+ try {
131
+ const event = JSON.parse(line);
132
+ const item = event.item;
133
+ if (event.type !== 'item.completed' || item?.type !== 'command_execution' || !item.command)
134
+ return;
135
+ if (item.status === 'failed')
136
+ onEvent({ type: 'tool_error', name: item.command, error: 'command failed' });
137
+ else
138
+ onEvent({ type: 'tool_call', name: item.command });
139
+ }
140
+ catch {
141
+ // Not an event line.
142
+ }
143
+ }
144
+ //# sourceMappingURL=executor.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"executor.js","sourceRoot":"","sources":["../../src/remediation/executor.ts"],"names":[],"mappings":"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"}
@@ -1,2 +1,3 @@
1
+ import { type DiffScope } from './diffScope.js';
1
2
  import { type SarifImportResult } from './sarif.js';
2
- export declare function runLocalSecurityScan(cwd: string): Promise<SarifImportResult>;
3
+ export declare function runLocalSecurityScan(cwd: string, scope?: DiffScope): Promise<SarifImportResult>;
@@ -3,6 +3,7 @@ import path from 'node:path';
3
3
  import fg from 'fast-glob';
4
4
  import { loadIgnorePatterns } from '../core/ignorefile.js';
5
5
  import { resolveRelativeInside, resolveWorkspaceRoot } from '../core/workspace.js';
6
+ import { isWithinDiffScope } from './diffScope.js';
6
7
  import { buildRemediationPrompt } from './sarif.js';
7
8
  const DEFAULT_IGNORES = [
8
9
  '**/.git/**',
@@ -23,11 +24,31 @@ const DEFAULT_IGNORES = [
23
24
  '**/eval/swebench/workspaces/**',
24
25
  '**/eval/swebench/cache/**',
25
26
  '**/*.min.js',
27
+ // Minifiers are not consistent about the separator, and `foo-min.js` is
28
+ // common enough that missing it means reporting on vendored bundles.
29
+ '**/*-min.js',
26
30
  '**/*-lock.json',
27
31
  '**/package-lock.json',
28
32
  '**/pnpm-lock.yaml',
29
33
  '**/yarn.lock',
34
+ // Vendored third-party code. Real findings here belong upstream, and the
35
+ // reader of this report cannot act on them.
36
+ '**/vendor/**',
37
+ '**/vendored/**',
38
+ '**/third_party/**',
39
+ '**/third-party/**',
30
40
  ];
41
+ /**
42
+ * Test code is not production attack surface: credentials in a test are
43
+ * fixtures, `innerHTML` in a harness is teardown, and reporting on either
44
+ * trains people to ignore the tool. Rules precise enough to mean a real leak
45
+ * opt back in with `reportInTests`.
46
+ */
47
+ const TEST_DIRECTORY = /(?:^|\/)(?:tests?|specs?|__tests__|__mocks__|testdata)\//i;
48
+ const TEST_FILENAME = /(?:^|\/)[^/]*\.(?:test|spec)\.[cm]?[jt]sx?$/i;
49
+ function isTestPath(file) {
50
+ return TEST_DIRECTORY.test(file) || TEST_FILENAME.test(file);
51
+ }
31
52
  const SCANNABLE_EXTENSIONS = new Set([
32
53
  '.cjs',
33
54
  '.cs',
@@ -51,6 +72,14 @@ const MAX_FILES = 3000;
51
72
  const MAX_FILE_BYTES = 512 * 1024;
52
73
  const MAX_FINDINGS = 100;
53
74
  const CONTEXT_RADIUS = 3;
75
+ /**
76
+ * A bare verb is not a statement: `'delete ' + name` is an HTTP message, not
77
+ * SQL. Requiring the companion keyword — FROM, INTO, SET — is what separates a
78
+ * query from an English sentence that happens to start with the same word.
79
+ */
80
+ const SQL_STATEMENT = String.raw `(?:SELECT\b[^'"\`]*\bFROM|DELETE\b[^'"\`]*\bFROM|INSERT\b[^'"\`]*\bINTO|UPDATE\b[^'"\`]*\bSET)`;
81
+ const SQL_CONCATENATION = new RegExp(String.raw `['"\`]\s*${SQL_STATEMENT}\b[^;\n]*['"\`]\s*\+`
82
+ + String.raw `|\+\s*['"\`]\s*${SQL_STATEMENT}\b`, 'i');
54
83
  const RULES = [
55
84
  {
56
85
  id: 'dvalin/hardcoded-secret',
@@ -71,6 +100,8 @@ const RULES = [
71
100
  helpUri: 'https://cwe.mitre.org/data/definitions/798.html',
72
101
  pattern: /\bAKIA[0-9A-Z]{16}\b/,
73
102
  message: () => 'Possible AWS access key literal. Revoke the key if real and replace it with secret-managed credentials.',
103
+ // A key in the shape of a real one is an incident wherever it is committed.
104
+ reportInTests: true,
74
105
  },
75
106
  {
76
107
  id: 'dvalin/sql-string-concatenation',
@@ -79,9 +110,21 @@ const RULES = [
79
110
  securitySeverity: '8.8',
80
111
  tags: ['security', 'sql-injection', 'cwe-089'],
81
112
  helpUri: 'https://cwe.mitre.org/data/definitions/89.html',
82
- pattern: /['"`]\s*(?:SELECT|INSERT|UPDATE|DELETE)\b[^;\n]*['"`]\s*\+|\+\s*['"`]\s*(?:SELECT|INSERT|UPDATE|DELETE)\b/i,
113
+ pattern: SQL_CONCATENATION,
83
114
  message: () => 'SQL appears to be built with string concatenation. Use parameterized queries or a safe query builder.',
84
115
  },
116
+ {
117
+ id: 'dvalin/nosql-injection',
118
+ name: 'NoSQL query built from untrusted input',
119
+ severity: 'error',
120
+ securitySeverity: '9.0',
121
+ tags: ['security', 'nosql-injection', 'cwe-943'],
122
+ helpUri: 'https://cwe.mitre.org/data/definitions/943.html',
123
+ // `$where` runs JavaScript on the database server, so an interpolated or
124
+ // concatenated value there is remote code execution, not just a bad query.
125
+ pattern: /\$where\s*:\s*(?:`[^`]*\$\{[^`]*`|['"][^'"]*['"]\s*\+)/,
126
+ message: () => '$where runs JavaScript on the database server and this query interpolates a value into it. Use a structured query, or validate and cast the value first.',
127
+ },
85
128
  {
86
129
  id: 'dvalin/dom-html-injection',
87
130
  name: 'Unsafe HTML injection sink',
@@ -132,6 +175,14 @@ function snippetFor(lines, lineNumber) {
132
175
  .map((line, index) => `${String(start + index).padStart(4, ' ')} | ${line}`)
133
176
  .join('\n');
134
177
  }
178
+ /**
179
+ * A line that only documents a risk — `// never eval() user input` — is not
180
+ * the risk. Only whole-line comments are skipped, so trailing notes on real
181
+ * code (`const x = eval(y); // FIXME`) still report.
182
+ */
183
+ function isCommentLine(trimmed) {
184
+ return /^(?:\/\/|#|\*|\/\*)/.test(trimmed);
185
+ }
135
186
  function isLikelyPlaceholder(line) {
136
187
  return /\b(example|sample|fixture|placeholder|dummy|changeme|fake|invalid|do[-_]?not[-_]?log|your[-_]?key|not[-_]?real|test[-_]?only)\b/i.test(line);
137
188
  }
@@ -151,7 +202,7 @@ async function readScannableFile(root, file) {
151
202
  return undefined;
152
203
  }
153
204
  }
154
- export async function runLocalSecurityScan(cwd) {
205
+ export async function runLocalSecurityScan(cwd, scope) {
155
206
  const root = await resolveWorkspaceRoot(cwd);
156
207
  const ignore = [...DEFAULT_IGNORES, ...(await loadIgnorePatterns(root))];
157
208
  const files = (await fg('**/*', {
@@ -162,6 +213,7 @@ export async function runLocalSecurityScan(cwd) {
162
213
  followSymbolicLinks: false,
163
214
  }))
164
215
  .filter(isScannableFile)
216
+ .filter(file => scope === undefined || scope.files.has(file))
165
217
  .sort();
166
218
  const findings = [];
167
219
  let totalResults = 0;
@@ -172,15 +224,33 @@ export async function runLocalSecurityScan(cwd) {
172
224
  skippedResults += 1;
173
225
  continue;
174
226
  }
227
+ const rules = isTestPath(file) ? RULES.filter(rule => rule.reportInTests) : RULES;
228
+ if (rules.length === 0)
229
+ continue;
175
230
  const lines = content.split(/\r?\n/);
231
+ let inBlockComment = false;
176
232
  for (const [lineIndex, line] of lines.entries()) {
233
+ const trimmed = line.trim();
234
+ const wasInBlockComment = inBlockComment;
235
+ if (inBlockComment) {
236
+ if (trimmed.includes('*/'))
237
+ inBlockComment = false;
238
+ }
239
+ else if (trimmed.startsWith('/*') && !trimmed.includes('*/')) {
240
+ inBlockComment = true;
241
+ }
242
+ if (wasInBlockComment || isCommentLine(trimmed))
243
+ continue;
244
+ // After the comment state is updated, so a scoped scan cannot desync it.
245
+ if (scope !== undefined && !isWithinDiffScope(scope, file, lineIndex + 1))
246
+ continue;
177
247
  if (findings.length >= MAX_FINDINGS) {
178
248
  skippedResults += 1;
179
249
  continue;
180
250
  }
181
251
  if (isLikelyPlaceholder(line))
182
252
  continue;
183
- for (const rule of RULES) {
253
+ for (const rule of rules) {
184
254
  const match = line.match(rule.pattern);
185
255
  if (!match)
186
256
  continue;
@@ -1 +1 @@
1
- {"version":3,"file":"localScan.js","sourceRoot":"","sources":["../../src/remediation/localScan.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"localScan.js","sourceRoot":"","sources":["../../src/remediation/localScan.ts"],"names":[],"mappings":"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"}
@@ -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 { resolveInsideWorkspace } from '../core/workspace.js';
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') || trimmed.startsWith('http:') || trimmed.startsWith('https:')) {
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
- decoded = decodeURIComponent(withoutFileScheme);
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 (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
+ 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 normalized.replace(/\\/g, '/');
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;