dvalincode 0.14.0 → 0.15.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 +159 -60
- package/README.zh-CN.md +169 -72
- package/THIRD_PARTY_NOTICES.md +295 -147
- package/dist/agent/loop.d.ts +8 -0
- package/dist/agent/loop.js +8 -1
- package/dist/agent/loop.js.map +1 -1
- package/dist/agent/runner.d.ts +1 -0
- package/dist/agent/runner.js +10 -1
- package/dist/agent/runner.js.map +1 -1
- package/dist/agent/session.d.ts +23 -1
- package/dist/agent/session.js +63 -11
- package/dist/agent/session.js.map +1 -1
- package/dist/agent/types.d.ts +2 -0
- package/dist/audit/log.d.ts +3 -0
- package/dist/audit/log.js.map +1 -1
- package/dist/audit/report.js +2 -0
- package/dist/audit/report.js.map +1 -1
- package/dist/cli.js +24 -2
- package/dist/cli.js.map +1 -1
- package/dist/commands/dvalin.js +12 -0
- package/dist/commands/dvalin.js.map +1 -1
- package/dist/commands/mcpServe.d.ts +2 -0
- package/dist/commands/mcpServe.js +36 -0
- package/dist/commands/mcpServe.js.map +1 -0
- package/dist/commands/policy.js +12 -0
- package/dist/commands/policy.js.map +1 -1
- package/dist/commands/run.d.ts +30 -0
- package/dist/commands/run.js +229 -0
- package/dist/commands/run.js.map +1 -0
- package/dist/core/policy.d.ts +21 -0
- package/dist/core/policy.js +32 -0
- package/dist/core/policy.js.map +1 -1
- package/dist/core/subprocessSandbox.d.ts +49 -6
- package/dist/core/subprocessSandbox.js +175 -64
- package/dist/core/subprocessSandbox.js.map +1 -1
- package/dist/core/trust.js +12 -0
- package/dist/core/trust.js.map +1 -1
- package/dist/harness/run.d.ts +70 -0
- package/dist/harness/run.js +185 -0
- package/dist/harness/run.js.map +1 -0
- package/dist/mcp/client.d.ts +12 -0
- package/dist/mcp/client.js +2 -2
- package/dist/mcp/client.js.map +1 -1
- package/dist/mcp/config.d.ts +33 -3
- package/dist/mcp/config.js +32 -3
- package/dist/mcp/config.js.map +1 -1
- package/dist/mcp/register.d.ts +23 -6
- package/dist/mcp/register.js +42 -8
- package/dist/mcp/register.js.map +1 -1
- package/dist/mcp/server.d.ts +35 -0
- package/dist/mcp/server.js +230 -0
- package/dist/mcp/server.js.map +1 -0
- package/dist/mcp/stdio.d.ts +34 -0
- package/dist/mcp/stdio.js +183 -0
- package/dist/mcp/stdio.js.map +1 -0
- package/dist/remediation/sarifExport.d.ts +7 -0
- package/dist/remediation/sarifExport.js +102 -0
- package/dist/remediation/sarifExport.js.map +1 -0
- package/dist/remediation/scannerSuite.js +11 -1
- package/dist/remediation/scannerSuite.js.map +1 -1
- package/dist/server/configStore.d.ts +2 -8
- package/dist/server/configStore.js +12 -7
- package/dist/server/configStore.js.map +1 -1
- package/dist/server/wsHandler.js +8 -0
- package/dist/server/wsHandler.js.map +1 -1
- package/dist/tools/shell.js +1 -1
- package/dist/tools/shell.js.map +1 -1
- package/dist/tui/app.js +4 -1
- package/dist/tui/app.js.map +1 -1
- package/dist/tui/render.d.ts +1 -0
- package/dist/tui/render.js +11 -0
- package/dist/tui/render.js.map +1 -1
- package/dist/version.d.ts +1 -1
- package/dist/version.js +1 -1
- package/package.json +4 -3
|
@@ -0,0 +1,230 @@
|
|
|
1
|
+
import { realpath } from 'node:fs/promises';
|
|
2
|
+
import path from 'node:path';
|
|
3
|
+
import { createInterface } from 'node:readline';
|
|
4
|
+
import { latestRun } from '../audit/log.js';
|
|
5
|
+
import { renderReport } from '../audit/report.js';
|
|
6
|
+
import { executeHarnessRun, } from '../harness/run.js';
|
|
7
|
+
import { readJournal } from '../sessions/journal.js';
|
|
8
|
+
import { loadSession } from '../sessions/store.js';
|
|
9
|
+
import { VERSION } from '../version.js';
|
|
10
|
+
const MCP_TOOLS = [
|
|
11
|
+
{
|
|
12
|
+
name: 'dvalin_run_task',
|
|
13
|
+
description: 'Run a complete governed coding task inside DvalinCode. Long calls are expected; callers should use a generous timeout.',
|
|
14
|
+
inputSchema: {
|
|
15
|
+
type: 'object',
|
|
16
|
+
properties: {
|
|
17
|
+
prompt: { type: 'string' },
|
|
18
|
+
cwd: { type: 'string' },
|
|
19
|
+
permission_mode: { type: 'string', enum: ['plan', 'auto', 'bypass'] },
|
|
20
|
+
session_id: { type: 'string' },
|
|
21
|
+
max_iterations: { type: 'integer', minimum: 1 },
|
|
22
|
+
timeout_minutes: { type: 'number', exclusiveMinimum: 0 },
|
|
23
|
+
},
|
|
24
|
+
required: ['prompt'],
|
|
25
|
+
additionalProperties: false,
|
|
26
|
+
},
|
|
27
|
+
annotations: { readOnlyHint: false },
|
|
28
|
+
},
|
|
29
|
+
{
|
|
30
|
+
name: 'dvalin_get_session',
|
|
31
|
+
description: 'Get a durable DvalinCode session summary and its latest audit anchor.',
|
|
32
|
+
inputSchema: {
|
|
33
|
+
type: 'object',
|
|
34
|
+
properties: { session_id: { type: 'string' } },
|
|
35
|
+
required: ['session_id'],
|
|
36
|
+
additionalProperties: false,
|
|
37
|
+
},
|
|
38
|
+
annotations: { readOnlyHint: true },
|
|
39
|
+
},
|
|
40
|
+
{
|
|
41
|
+
name: 'dvalin_get_evidence',
|
|
42
|
+
description: 'Render the Markdown audit evidence for a DvalinCode run (defaults to the latest run).',
|
|
43
|
+
inputSchema: {
|
|
44
|
+
type: 'object',
|
|
45
|
+
properties: { run_id: { type: 'string' } },
|
|
46
|
+
additionalProperties: false,
|
|
47
|
+
},
|
|
48
|
+
annotations: { readOnlyHint: true },
|
|
49
|
+
},
|
|
50
|
+
];
|
|
51
|
+
export async function createMcpServer(options, overrides = {}) {
|
|
52
|
+
const deps = {
|
|
53
|
+
executeRun: executeHarnessRun,
|
|
54
|
+
loadSession,
|
|
55
|
+
renderReport: runId => renderReport(runId),
|
|
56
|
+
latestRun: () => latestRun(),
|
|
57
|
+
...overrides,
|
|
58
|
+
};
|
|
59
|
+
const serverCwd = await realpath(path.resolve(options.cwd));
|
|
60
|
+
const allowedWorkspaces = await Promise.all(options.workspaces.map(workspace => realpath(path.resolve(workspace))));
|
|
61
|
+
const handleLine = async (line) => {
|
|
62
|
+
let request;
|
|
63
|
+
try {
|
|
64
|
+
request = JSON.parse(line);
|
|
65
|
+
}
|
|
66
|
+
catch {
|
|
67
|
+
return rpcError(null, -32700, 'Parse error');
|
|
68
|
+
}
|
|
69
|
+
if (!isRequest(request))
|
|
70
|
+
return rpcError(requestId(request), -32600, 'Invalid Request');
|
|
71
|
+
if (request.id === undefined)
|
|
72
|
+
return null;
|
|
73
|
+
if (request.method === 'initialize') {
|
|
74
|
+
const requestedVersion = asRecord(request.params)?.protocolVersion;
|
|
75
|
+
return rpcResult(request.id, {
|
|
76
|
+
protocolVersion: typeof requestedVersion === 'string' ? requestedVersion : '2024-11-05',
|
|
77
|
+
capabilities: { tools: {} },
|
|
78
|
+
serverInfo: { name: 'dvalincode', version: VERSION },
|
|
79
|
+
});
|
|
80
|
+
}
|
|
81
|
+
if (request.method === 'tools/list') {
|
|
82
|
+
return rpcResult(request.id, { tools: MCP_TOOLS });
|
|
83
|
+
}
|
|
84
|
+
if (request.method === 'tools/call') {
|
|
85
|
+
const params = asRecord(request.params);
|
|
86
|
+
if (!params || typeof params.name !== 'string')
|
|
87
|
+
return rpcError(request.id, -32602, 'Invalid params');
|
|
88
|
+
const args = asRecord(params.arguments) ?? {};
|
|
89
|
+
try {
|
|
90
|
+
const result = await callTool(params.name, args, {
|
|
91
|
+
deps,
|
|
92
|
+
serverCwd,
|
|
93
|
+
allowedWorkspaces,
|
|
94
|
+
maxPermissionMode: options.maxPermissionMode,
|
|
95
|
+
});
|
|
96
|
+
return rpcResult(request.id, result);
|
|
97
|
+
}
|
|
98
|
+
catch (err) {
|
|
99
|
+
return rpcResult(request.id, toolResult(err instanceof Error ? err.message : String(err), true));
|
|
100
|
+
}
|
|
101
|
+
}
|
|
102
|
+
return rpcError(request.id, -32601, 'Method not found');
|
|
103
|
+
};
|
|
104
|
+
return { handleLine };
|
|
105
|
+
}
|
|
106
|
+
export async function runMcpStdio(options, io = { input: process.stdin, output: process.stdout }) {
|
|
107
|
+
const server = await createMcpServer(options);
|
|
108
|
+
const lines = createInterface({ input: io.input, crlfDelay: Infinity });
|
|
109
|
+
for await (const line of lines) {
|
|
110
|
+
if (!line.trim())
|
|
111
|
+
continue;
|
|
112
|
+
const response = await server.handleLine(line);
|
|
113
|
+
if (response)
|
|
114
|
+
io.output.write(JSON.stringify(response) + '\n');
|
|
115
|
+
}
|
|
116
|
+
}
|
|
117
|
+
async function callTool(name, args, context) {
|
|
118
|
+
if (name === 'dvalin_run_task') {
|
|
119
|
+
const prompt = requireString(args.prompt, 'prompt');
|
|
120
|
+
if (!prompt.trim())
|
|
121
|
+
throw new Error('prompt must not be empty');
|
|
122
|
+
const cwd = args.cwd === undefined ? context.serverCwd : requireString(args.cwd, 'cwd');
|
|
123
|
+
const resolvedCwd = await resolveAllowedWorkspace(cwd, context.allowedWorkspaces);
|
|
124
|
+
const permissionMode = optionalPermissionMode(args.permission_mode);
|
|
125
|
+
const sessionId = optionalString(args.session_id, 'session_id');
|
|
126
|
+
const maxIterations = optionalPositiveNumber(args.max_iterations, 'max_iterations', true);
|
|
127
|
+
const timeoutMinutes = optionalPositiveNumber(args.timeout_minutes, 'timeout_minutes', false);
|
|
128
|
+
const execution = await context.deps.executeRun({
|
|
129
|
+
content: prompt,
|
|
130
|
+
cwd: resolvedCwd,
|
|
131
|
+
sessionId,
|
|
132
|
+
mode: 'code',
|
|
133
|
+
permissionMode: permissionMode,
|
|
134
|
+
maxIterations,
|
|
135
|
+
timeoutMinutes,
|
|
136
|
+
maxPermissionMode: context.maxPermissionMode,
|
|
137
|
+
unattended: true,
|
|
138
|
+
origin: 'mcp-serve',
|
|
139
|
+
});
|
|
140
|
+
return toolResult(JSON.stringify(execution.result), execution.exitCode !== 0);
|
|
141
|
+
}
|
|
142
|
+
if (name === 'dvalin_get_session') {
|
|
143
|
+
const sessionId = requireString(args.session_id, 'session_id');
|
|
144
|
+
const session = await context.deps.loadSession(sessionId);
|
|
145
|
+
if (!session)
|
|
146
|
+
throw new Error(`Session not found: ${sessionId}`);
|
|
147
|
+
await resolveAllowedWorkspace(session.cwd, context.allowedWorkspaces);
|
|
148
|
+
const latest = [...readJournal(session.id)].reverse().find((entry) => entry.type === 'turn_end' && !!(entry.runId || entry.auditHead));
|
|
149
|
+
return toolResult(JSON.stringify({
|
|
150
|
+
sessionId: session.id,
|
|
151
|
+
cwd: session.cwd,
|
|
152
|
+
summary: session.summary ?? '',
|
|
153
|
+
messageCount: session.messages.length,
|
|
154
|
+
runId: latest?.runId,
|
|
155
|
+
auditHead: latest?.auditHead,
|
|
156
|
+
}));
|
|
157
|
+
}
|
|
158
|
+
if (name === 'dvalin_get_evidence') {
|
|
159
|
+
const requestedRunId = optionalString(args.run_id, 'run_id');
|
|
160
|
+
const runId = requestedRunId ?? context.deps.latestRun();
|
|
161
|
+
if (!runId)
|
|
162
|
+
throw new Error('No audit runs found.');
|
|
163
|
+
return toolResult(context.deps.renderReport(runId));
|
|
164
|
+
}
|
|
165
|
+
throw new Error(`Unknown tool: ${name}`);
|
|
166
|
+
}
|
|
167
|
+
async function resolveAllowedWorkspace(candidate, allowed) {
|
|
168
|
+
let resolved;
|
|
169
|
+
try {
|
|
170
|
+
resolved = await realpath(path.resolve(candidate));
|
|
171
|
+
}
|
|
172
|
+
catch {
|
|
173
|
+
throw new Error(`Workspace does not exist: ${path.resolve(candidate)}`);
|
|
174
|
+
}
|
|
175
|
+
const permitted = allowed.some(root => {
|
|
176
|
+
const relative = path.relative(root, resolved);
|
|
177
|
+
return relative === '' || (!relative.startsWith('..' + path.sep) && relative !== '..' && !path.isAbsolute(relative));
|
|
178
|
+
});
|
|
179
|
+
if (!permitted)
|
|
180
|
+
throw new Error(`cwd is outside the mcp-serve workspace allowlist: ${resolved}`);
|
|
181
|
+
return resolved;
|
|
182
|
+
}
|
|
183
|
+
function isRequest(value) {
|
|
184
|
+
if (!value || typeof value !== 'object')
|
|
185
|
+
return false;
|
|
186
|
+
const record = value;
|
|
187
|
+
return record.jsonrpc === '2.0' && typeof record.method === 'string';
|
|
188
|
+
}
|
|
189
|
+
function requestId(value) {
|
|
190
|
+
const id = asRecord(value)?.id;
|
|
191
|
+
return typeof id === 'string' || typeof id === 'number' || id === null ? id : null;
|
|
192
|
+
}
|
|
193
|
+
function rpcResult(id, result) {
|
|
194
|
+
return { jsonrpc: '2.0', id, result };
|
|
195
|
+
}
|
|
196
|
+
function rpcError(id, code, message) {
|
|
197
|
+
return { jsonrpc: '2.0', id, error: { code, message } };
|
|
198
|
+
}
|
|
199
|
+
function toolResult(text, isError = false) {
|
|
200
|
+
return { content: [{ type: 'text', text }], ...(isError ? { isError: true } : {}) };
|
|
201
|
+
}
|
|
202
|
+
function asRecord(value) {
|
|
203
|
+
return value && typeof value === 'object' && !Array.isArray(value) ? value : null;
|
|
204
|
+
}
|
|
205
|
+
function requireString(value, field) {
|
|
206
|
+
if (typeof value !== 'string')
|
|
207
|
+
throw new Error(`${field} must be a string`);
|
|
208
|
+
return value;
|
|
209
|
+
}
|
|
210
|
+
function optionalString(value, field) {
|
|
211
|
+
if (value === undefined)
|
|
212
|
+
return undefined;
|
|
213
|
+
return requireString(value, field);
|
|
214
|
+
}
|
|
215
|
+
function optionalPermissionMode(value) {
|
|
216
|
+
if (value === undefined)
|
|
217
|
+
return undefined;
|
|
218
|
+
if (value === 'plan' || value === 'auto' || value === 'bypass')
|
|
219
|
+
return value;
|
|
220
|
+
throw new Error('permission_mode must be plan, auto, or bypass');
|
|
221
|
+
}
|
|
222
|
+
function optionalPositiveNumber(value, field, integer) {
|
|
223
|
+
if (value === undefined)
|
|
224
|
+
return undefined;
|
|
225
|
+
if (typeof value !== 'number' || !Number.isFinite(value) || value <= 0 || (integer && !Number.isInteger(value))) {
|
|
226
|
+
throw new Error(`${field} must be a positive ${integer ? 'integer' : 'number'}`);
|
|
227
|
+
}
|
|
228
|
+
return value;
|
|
229
|
+
}
|
|
230
|
+
//# sourceMappingURL=server.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../src/mcp/server.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,34 @@
|
|
|
1
|
+
import { type McpCallResult, type McpToolDef } from './client.js';
|
|
2
|
+
import type { McpEgressContext } from './governedFetch.js';
|
|
3
|
+
export type LocalMcpServerRef = {
|
|
4
|
+
id: string;
|
|
5
|
+
command: string;
|
|
6
|
+
args: string[];
|
|
7
|
+
};
|
|
8
|
+
export declare class McpStdioClient {
|
|
9
|
+
private readonly server;
|
|
10
|
+
private readonly cwd;
|
|
11
|
+
private readonly timeoutMs;
|
|
12
|
+
private session;
|
|
13
|
+
private nextId;
|
|
14
|
+
private buffer;
|
|
15
|
+
private exitReason;
|
|
16
|
+
private readonly pending;
|
|
17
|
+
constructor(server: LocalMcpServerRef, cwd: string, timeoutMs?: number);
|
|
18
|
+
/** Executable name only — arguments never reach the audit trail. */
|
|
19
|
+
private get host();
|
|
20
|
+
initialize(ctx: McpEgressContext): Promise<void>;
|
|
21
|
+
listTools(ctx: McpEgressContext): Promise<McpToolDef[]>;
|
|
22
|
+
callTool(name: string, args: unknown, ctx: McpEgressContext): Promise<McpCallResult>;
|
|
23
|
+
/** Stop the server. Safe to call when it was never started. */
|
|
24
|
+
close(): void;
|
|
25
|
+
private start;
|
|
26
|
+
/** Split the stdout stream on newlines; each complete line is one JSON-RPC message. */
|
|
27
|
+
private consume;
|
|
28
|
+
private dispatch;
|
|
29
|
+
private failPending;
|
|
30
|
+
private request;
|
|
31
|
+
private send;
|
|
32
|
+
/** Fire-and-forget notification: no id, no response expected. */
|
|
33
|
+
private notify;
|
|
34
|
+
}
|
|
@@ -0,0 +1,183 @@
|
|
|
1
|
+
import path from 'node:path';
|
|
2
|
+
import { checkCommand, PolicyViolationError } from '../core/policy.js';
|
|
3
|
+
import { spawnGovernedSession } from '../core/subprocessSandbox.js';
|
|
4
|
+
import { CLIENT_INFO, PROTOCOL_VERSION } from './client.js';
|
|
5
|
+
/**
|
|
6
|
+
* The stdio MCP transport: the server runs as a local child process and JSON-RPC
|
|
7
|
+
* messages are exchanged as newline-delimited JSON over its stdin/stdout. No
|
|
8
|
+
* network is involved, which is the point — a local server stays reachable under
|
|
9
|
+
* `network: off`, where a remote gateway is correctly blocked.
|
|
10
|
+
*
|
|
11
|
+
* Two governance surfaces exist here that the remote transport does not have:
|
|
12
|
+
*
|
|
13
|
+
* 1. **Command admission.** Launching a server is command execution, and it
|
|
14
|
+
* happens at registration time rather than inside `registry.run`. The
|
|
15
|
+
* registry's `checkCommand` chokepoint therefore does not cover it, so this
|
|
16
|
+
* module applies `checkCommand` itself. Without it, `mcp.servers` would be a
|
|
17
|
+
* side door around the shell-command denylist.
|
|
18
|
+
* 2. **Process isolation.** The child is launched through
|
|
19
|
+
* `spawnGovernedSession`, so a policy that forbids egress puts the server
|
|
20
|
+
* behind the same Seatbelt/Bubblewrap isolation as any shell command, and
|
|
21
|
+
* fails closed where that isolation is unavailable.
|
|
22
|
+
*/
|
|
23
|
+
const DEFAULT_TIMEOUT_MS = 30_000;
|
|
24
|
+
export class McpStdioClient {
|
|
25
|
+
server;
|
|
26
|
+
cwd;
|
|
27
|
+
timeoutMs;
|
|
28
|
+
session;
|
|
29
|
+
nextId = 1;
|
|
30
|
+
buffer = '';
|
|
31
|
+
exitReason;
|
|
32
|
+
pending = new Map();
|
|
33
|
+
constructor(server, cwd, timeoutMs = DEFAULT_TIMEOUT_MS) {
|
|
34
|
+
this.server = server;
|
|
35
|
+
this.cwd = cwd;
|
|
36
|
+
this.timeoutMs = timeoutMs;
|
|
37
|
+
}
|
|
38
|
+
/** Executable name only — arguments never reach the audit trail. */
|
|
39
|
+
get host() {
|
|
40
|
+
return `stdio:${path.basename(this.server.command)}`;
|
|
41
|
+
}
|
|
42
|
+
async initialize(ctx) {
|
|
43
|
+
this.start(ctx);
|
|
44
|
+
await this.request('initialize', { protocolVersion: PROTOCOL_VERSION, capabilities: {}, clientInfo: CLIENT_INFO }, 'initialize', ctx);
|
|
45
|
+
this.notify('notifications/initialized');
|
|
46
|
+
}
|
|
47
|
+
async listTools(ctx) {
|
|
48
|
+
const msg = await this.request('tools/list', {}, 'tools/list', ctx);
|
|
49
|
+
return msg.result?.tools ?? [];
|
|
50
|
+
}
|
|
51
|
+
async callTool(name, args, ctx) {
|
|
52
|
+
const msg = await this.request('tools/call', { name, arguments: args ?? {} }, name, ctx);
|
|
53
|
+
return msg.result ?? {};
|
|
54
|
+
}
|
|
55
|
+
/** Stop the server. Safe to call when it was never started. */
|
|
56
|
+
close() {
|
|
57
|
+
this.session?.kill();
|
|
58
|
+
this.failPending(new Error('MCP server session closed'));
|
|
59
|
+
}
|
|
60
|
+
// ── transport ────────────────────────────────────────────────────────────
|
|
61
|
+
start(ctx) {
|
|
62
|
+
if (this.session)
|
|
63
|
+
return;
|
|
64
|
+
// The one check the tool-layer chokepoint cannot make for us: this launch
|
|
65
|
+
// happens before any tool call exists to gate.
|
|
66
|
+
const commandLine = [this.server.command, ...this.server.args].join(' ');
|
|
67
|
+
const decision = checkCommand(ctx.policy, commandLine);
|
|
68
|
+
if (!decision.allowed) {
|
|
69
|
+
ctx.audit?.append({ type: 'mcp_request', server: this.server.id, tool: 'initialize', host: this.host, outcome: 'blocked', durationMs: 0 });
|
|
70
|
+
ctx.audit?.append({ type: 'policy_violation', rule: decision.rule, tool: `mcp:${this.server.id}`, target: this.host });
|
|
71
|
+
throw new PolicyViolationError(`mcp:${this.server.id}`, decision.rule, this.host);
|
|
72
|
+
}
|
|
73
|
+
this.session = spawnGovernedSession({
|
|
74
|
+
command: this.server.command,
|
|
75
|
+
args: this.server.args,
|
|
76
|
+
cwd: this.cwd,
|
|
77
|
+
policy: ctx.policy,
|
|
78
|
+
audit: ctx.audit,
|
|
79
|
+
toolName: `mcp:${this.server.id}`,
|
|
80
|
+
// Follow the policy rather than always isolating: a permissive policy lets
|
|
81
|
+
// a server reach the network like any other governed command, while
|
|
82
|
+
// network: off keeps it sealed.
|
|
83
|
+
skipNetworkSandboxWhenPolicyAllows: true,
|
|
84
|
+
});
|
|
85
|
+
this.session.child.stdout?.on('data', (chunk) => this.consume(chunk.toString('utf8')));
|
|
86
|
+
this.session.child.on('error', err => {
|
|
87
|
+
this.exitReason = err.message;
|
|
88
|
+
this.failPending(new Error(`MCP server "${this.server.id}" failed to start: ${err.message}`));
|
|
89
|
+
});
|
|
90
|
+
this.session.child.on('close', code => {
|
|
91
|
+
this.exitReason ??= `exited with code ${code}`;
|
|
92
|
+
this.failPending(new Error(`MCP server "${this.server.id}" ${this.exitReason}`));
|
|
93
|
+
});
|
|
94
|
+
}
|
|
95
|
+
/** Split the stdout stream on newlines; each complete line is one JSON-RPC message. */
|
|
96
|
+
consume(text) {
|
|
97
|
+
this.buffer += text;
|
|
98
|
+
let newline = this.buffer.indexOf('\n');
|
|
99
|
+
while (newline >= 0) {
|
|
100
|
+
const line = this.buffer.slice(0, newline).trim();
|
|
101
|
+
this.buffer = this.buffer.slice(newline + 1);
|
|
102
|
+
if (line)
|
|
103
|
+
this.dispatch(line);
|
|
104
|
+
newline = this.buffer.indexOf('\n');
|
|
105
|
+
}
|
|
106
|
+
}
|
|
107
|
+
dispatch(line) {
|
|
108
|
+
let msg;
|
|
109
|
+
try {
|
|
110
|
+
msg = JSON.parse(line);
|
|
111
|
+
}
|
|
112
|
+
catch {
|
|
113
|
+
return; // Not a JSON-RPC frame (servers sometimes print banners); ignore.
|
|
114
|
+
}
|
|
115
|
+
if (typeof msg.id !== 'number')
|
|
116
|
+
return; // Notification or unmatched response.
|
|
117
|
+
const waiter = this.pending.get(msg.id);
|
|
118
|
+
if (!waiter)
|
|
119
|
+
return;
|
|
120
|
+
this.pending.delete(msg.id);
|
|
121
|
+
waiter.resolve(msg);
|
|
122
|
+
}
|
|
123
|
+
failPending(err) {
|
|
124
|
+
for (const waiter of this.pending.values())
|
|
125
|
+
waiter.reject(err);
|
|
126
|
+
this.pending.clear();
|
|
127
|
+
}
|
|
128
|
+
async request(method, params, auditTool, ctx) {
|
|
129
|
+
const started = Date.now();
|
|
130
|
+
try {
|
|
131
|
+
const msg = await this.send(method, params);
|
|
132
|
+
if (msg.error)
|
|
133
|
+
throw new Error(`MCP ${method} error: ${msg.error.message ?? `code ${msg.error.code}`}`);
|
|
134
|
+
ctx.audit?.append({ type: 'mcp_request', server: this.server.id, tool: auditTool, host: this.host, outcome: 'ok', durationMs: Date.now() - started });
|
|
135
|
+
return msg;
|
|
136
|
+
}
|
|
137
|
+
catch (err) {
|
|
138
|
+
ctx.audit?.append({ type: 'mcp_request', server: this.server.id, tool: auditTool, host: this.host, outcome: 'error', durationMs: Date.now() - started });
|
|
139
|
+
throw err;
|
|
140
|
+
}
|
|
141
|
+
}
|
|
142
|
+
send(method, params) {
|
|
143
|
+
const stdin = this.session?.child.stdin;
|
|
144
|
+
if (!stdin)
|
|
145
|
+
return Promise.reject(new Error(`MCP server "${this.server.id}" has no stdin`));
|
|
146
|
+
const id = this.nextId++;
|
|
147
|
+
return new Promise((resolve, reject) => {
|
|
148
|
+
const timer = setTimeout(() => {
|
|
149
|
+
this.pending.delete(id);
|
|
150
|
+
reject(new Error(`MCP ${method} timed out after ${this.timeoutMs}ms`));
|
|
151
|
+
}, this.timeoutMs);
|
|
152
|
+
timer.unref?.();
|
|
153
|
+
this.pending.set(id, {
|
|
154
|
+
resolve: msg => {
|
|
155
|
+
clearTimeout(timer);
|
|
156
|
+
resolve(msg);
|
|
157
|
+
},
|
|
158
|
+
reject: err => {
|
|
159
|
+
clearTimeout(timer);
|
|
160
|
+
reject(err);
|
|
161
|
+
},
|
|
162
|
+
});
|
|
163
|
+
// A JSON-RPC frame must occupy exactly one line.
|
|
164
|
+
stdin.write(`${JSON.stringify({ jsonrpc: '2.0', id, method, params })}\n`, err => {
|
|
165
|
+
if (!err)
|
|
166
|
+
return;
|
|
167
|
+
this.pending.delete(id);
|
|
168
|
+
clearTimeout(timer);
|
|
169
|
+
reject(err);
|
|
170
|
+
});
|
|
171
|
+
});
|
|
172
|
+
}
|
|
173
|
+
/** Fire-and-forget notification: no id, no response expected. */
|
|
174
|
+
notify(method) {
|
|
175
|
+
try {
|
|
176
|
+
this.session?.child.stdin?.write(`${JSON.stringify({ jsonrpc: '2.0', method })}\n`);
|
|
177
|
+
}
|
|
178
|
+
catch {
|
|
179
|
+
// Best-effort; a failure here must not abort discovery.
|
|
180
|
+
}
|
|
181
|
+
}
|
|
182
|
+
}
|
|
183
|
+
//# sourceMappingURL=stdio.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"stdio.js","sourceRoot":"","sources":["../../src/mcp/stdio.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,102 @@
|
|
|
1
|
+
import path from 'node:path';
|
|
2
|
+
/**
|
|
3
|
+
* Emit a scan suite result as SARIF 2.1.0.
|
|
4
|
+
*
|
|
5
|
+
* The target consumer is GitHub code scanning (`upload-sarif`), which renders
|
|
6
|
+
* findings inline on the pull request diff and in the Security tab. That
|
|
7
|
+
* imposes a few constraints beyond the base schema: locations must be
|
|
8
|
+
* repository-relative with forward slashes, `security-severity` must live on
|
|
9
|
+
* the rule as a numeric string, and every result needs a stable fingerprint so
|
|
10
|
+
* the same finding is not re-alerted on each run.
|
|
11
|
+
*/
|
|
12
|
+
const SARIF_SCHEMA = 'https://json.schemastore.org/sarif-2.1.0.json';
|
|
13
|
+
const SARIF_VERSION = '2.1.0';
|
|
14
|
+
/** SARIF regions are 1-based; findings without a line anchor to the file head. */
|
|
15
|
+
function startLine(finding) {
|
|
16
|
+
const line = finding.startLine ?? 1;
|
|
17
|
+
return line > 0 ? line : 1;
|
|
18
|
+
}
|
|
19
|
+
function endLine(finding) {
|
|
20
|
+
const start = startLine(finding);
|
|
21
|
+
const end = finding.endLine ?? start;
|
|
22
|
+
return end >= start ? end : start;
|
|
23
|
+
}
|
|
24
|
+
/** GitHub rejects absolute paths and Windows separators in artifact locations. */
|
|
25
|
+
function artifactUri(filePath, root) {
|
|
26
|
+
const relative = path.isAbsolute(filePath) ? path.relative(root, filePath) : filePath;
|
|
27
|
+
return relative.split(path.sep).join('/');
|
|
28
|
+
}
|
|
29
|
+
function toLevel(severity) {
|
|
30
|
+
return severity;
|
|
31
|
+
}
|
|
32
|
+
export function buildDvalinSarif(result, root) {
|
|
33
|
+
// One rule per ruleId. Findings that share a ruleId are the same rule, even
|
|
34
|
+
// when different scanners reported them.
|
|
35
|
+
const ruleIndex = new Map();
|
|
36
|
+
const rules = [];
|
|
37
|
+
const results = result.findings.map(finding => {
|
|
38
|
+
let index = ruleIndex.get(finding.ruleId);
|
|
39
|
+
if (index === undefined) {
|
|
40
|
+
index = rules.length;
|
|
41
|
+
ruleIndex.set(finding.ruleId, index);
|
|
42
|
+
rules.push({
|
|
43
|
+
id: finding.ruleId,
|
|
44
|
+
name: finding.ruleName ?? finding.ruleId,
|
|
45
|
+
shortDescription: { text: finding.ruleName ?? finding.ruleId },
|
|
46
|
+
fullDescription: { text: finding.message },
|
|
47
|
+
...(finding.helpUri ? { helpUri: finding.helpUri } : {}),
|
|
48
|
+
properties: {
|
|
49
|
+
tags: finding.tags,
|
|
50
|
+
// GitHub maps this number onto its own critical/high/medium/low bands.
|
|
51
|
+
...(finding.securitySeverity ? { 'security-severity': finding.securitySeverity } : {}),
|
|
52
|
+
},
|
|
53
|
+
});
|
|
54
|
+
}
|
|
55
|
+
return {
|
|
56
|
+
ruleId: finding.ruleId,
|
|
57
|
+
ruleIndex: index,
|
|
58
|
+
level: toLevel(finding.severity),
|
|
59
|
+
message: { text: finding.message },
|
|
60
|
+
locations: [
|
|
61
|
+
{
|
|
62
|
+
physicalLocation: {
|
|
63
|
+
artifactLocation: { uri: artifactUri(finding.path, root) },
|
|
64
|
+
region: { startLine: startLine(finding), endLine: endLine(finding) },
|
|
65
|
+
},
|
|
66
|
+
},
|
|
67
|
+
],
|
|
68
|
+
// Keeps an unchanged finding from re-alerting on every scan.
|
|
69
|
+
partialFingerprints: { dvalinFindingId: finding.id },
|
|
70
|
+
properties: { scanner: finding.source },
|
|
71
|
+
};
|
|
72
|
+
});
|
|
73
|
+
return {
|
|
74
|
+
$schema: SARIF_SCHEMA,
|
|
75
|
+
version: SARIF_VERSION,
|
|
76
|
+
runs: [
|
|
77
|
+
{
|
|
78
|
+
tool: {
|
|
79
|
+
driver: {
|
|
80
|
+
name: 'Dvalin',
|
|
81
|
+
informationUri: 'https://github.com/arthurpanhku/dvalincode',
|
|
82
|
+
rules,
|
|
83
|
+
},
|
|
84
|
+
},
|
|
85
|
+
results,
|
|
86
|
+
invocations: [
|
|
87
|
+
{
|
|
88
|
+
executionSuccessful: true,
|
|
89
|
+
startTimeUtc: result.startedAt,
|
|
90
|
+
endTimeUtc: result.completedAt,
|
|
91
|
+
},
|
|
92
|
+
],
|
|
93
|
+
properties: {
|
|
94
|
+
score: result.score,
|
|
95
|
+
grade: result.grade,
|
|
96
|
+
scanners: result.scanners.map(scanner => ({ id: scanner.id, status: scanner.status })),
|
|
97
|
+
},
|
|
98
|
+
},
|
|
99
|
+
],
|
|
100
|
+
};
|
|
101
|
+
}
|
|
102
|
+
//# sourceMappingURL=sarifExport.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sarifExport.js","sourceRoot":"","sources":["../../src/remediation/sarifExport.ts"],"names":[],"mappings":"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"}
|
|
@@ -19,7 +19,7 @@ const EXTERNAL_SCANNERS = [
|
|
|
19
19
|
},
|
|
20
20
|
command: 'semgrep',
|
|
21
21
|
args: (root, output) => [
|
|
22
|
-
'scan', '--config', '
|
|
22
|
+
'scan', '--config', 'p/default', '--sarif', '--output', output, '--metrics', 'off',
|
|
23
23
|
'--exclude', '.dvalin-scan-*', root,
|
|
24
24
|
],
|
|
25
25
|
acceptedExitCodes: [0],
|
|
@@ -55,6 +55,7 @@ const EXTERNAL_SCANNERS = [
|
|
|
55
55
|
'scan', 'source', '--recursive', '--format', 'sarif', '--output-file', output, root,
|
|
56
56
|
],
|
|
57
57
|
acceptedExitCodes: [0, 1, 128],
|
|
58
|
+
allowMissingOutput: true,
|
|
58
59
|
},
|
|
59
60
|
];
|
|
60
61
|
const BUILTIN = {
|
|
@@ -135,6 +136,15 @@ export async function runDvalinScanSuite(cwd, options = {}) {
|
|
|
135
136
|
if (!scanner.acceptedExitCodes.includes(processResult.exitCode ?? -1)) {
|
|
136
137
|
throw new Error(processResult.output.trim() || `${scanner.descriptor.name} exited ${processResult.exitCode}`);
|
|
137
138
|
}
|
|
139
|
+
if (scanner.allowMissingOutput) {
|
|
140
|
+
try {
|
|
141
|
+
await access(output, constants.R_OK);
|
|
142
|
+
}
|
|
143
|
+
catch {
|
|
144
|
+
runs.push({ ...descriptor, status: 'completed', findings: 0, durationMs: Date.now() - t0 });
|
|
145
|
+
continue;
|
|
146
|
+
}
|
|
147
|
+
}
|
|
138
148
|
const report = JSON.parse(await readFile(output, 'utf8'));
|
|
139
149
|
const result = await parseSarifForRemediation(report, { cwd: root });
|
|
140
150
|
findings.push(...result.findings);
|