@backendkit-labs/agent-coding 0.28.0 → 0.28.2
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/dist/tools/__tests__/command-parser.test.d.ts +2 -0
- package/dist/tools/__tests__/command-parser.test.d.ts.map +1 -0
- package/dist/tools/__tests__/command-parser.test.js +81 -0
- package/dist/tools/__tests__/command-parser.test.js.map +1 -0
- package/dist/tools/command-parser.d.ts +13 -0
- package/dist/tools/command-parser.d.ts.map +1 -0
- package/dist/tools/command-parser.js +214 -0
- package/dist/tools/command-parser.js.map +1 -0
- package/dist/tools/run-command.d.ts.map +1 -1
- package/dist/tools/run-command.js +3 -24
- package/dist/tools/run-command.js.map +1 -1
- package/package.json +2 -2
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"command-parser.test.d.ts","sourceRoot":"","sources":["../../../src/tools/__tests__/command-parser.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,81 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const command_parser_1 = require("../command-parser");
|
|
4
|
+
const run_command_1 = require("../run-command");
|
|
5
|
+
const ctx = {
|
|
6
|
+
agentId: 'coder', sessionId: 'test', workingDir: process.cwd(),
|
|
7
|
+
memory: { get: () => undefined, set: () => undefined, getAll: () => ({}) },
|
|
8
|
+
askAgent: async () => '',
|
|
9
|
+
};
|
|
10
|
+
describe('extractAllBins — wrappers expose the wrapped binary', () => {
|
|
11
|
+
it.each([
|
|
12
|
+
['env sh -c "id"', ['env', 'sh']],
|
|
13
|
+
['env -i FOO=1 sh -c id', ['env', 'sh']],
|
|
14
|
+
['env -u HOME bash', ['env', 'bash']],
|
|
15
|
+
['env env sh', ['env', 'env', 'sh']],
|
|
16
|
+
['FOO=1 env sh', ['env', 'sh']],
|
|
17
|
+
["env 'sh' -c id", ['env', 'sh']],
|
|
18
|
+
['echo x | xargs sh -c "id"', ['echo', 'xargs', 'sh']],
|
|
19
|
+
['xargs -I{} sh -c "{}"', ['xargs', 'sh']],
|
|
20
|
+
['xargs -n 1 -P 4 sh -c id', ['xargs', 'sh']],
|
|
21
|
+
['timeout 5 sh -c id', ['timeout', 'sh']],
|
|
22
|
+
['timeout -s KILL 5 sh', ['timeout', 'sh']],
|
|
23
|
+
['find . -name x -exec sh -c id \;', ['find', 'sh']],
|
|
24
|
+
['find . -execdir bash {} +', ['find', 'bash']],
|
|
25
|
+
['find . -delete', ['find', 'rm']],
|
|
26
|
+
['env find . -exec env sh {} \;', ['env', 'find', 'env', 'sh']],
|
|
27
|
+
['/usr/bin/env sh', ['env', 'sh']],
|
|
28
|
+
])('%s', (command, expected) => {
|
|
29
|
+
expect((0, command_parser_1.extractAllBins)(command)).toEqual(expected);
|
|
30
|
+
});
|
|
31
|
+
it('does not invent wrapped bins for plain wrappers', () => {
|
|
32
|
+
expect((0, command_parser_1.extractAllBins)('env')).toEqual(['env']);
|
|
33
|
+
expect((0, command_parser_1.extractAllBins)('xargs')).toEqual(['xargs']);
|
|
34
|
+
expect((0, command_parser_1.extractAllBins)('env git log -S foo')).toEqual(['env', 'git']);
|
|
35
|
+
expect((0, command_parser_1.extractAllBins)('find . -name "*.ts"')).toEqual(['find']);
|
|
36
|
+
});
|
|
37
|
+
it('flags env -S (string splitting hides the command)', () => {
|
|
38
|
+
expect((0, command_parser_1.extractAllBins)('env -S "sh -c id"')).toContain('env -S');
|
|
39
|
+
});
|
|
40
|
+
it('flags command substitution inside double quotes, allows it inside single quotes', () => {
|
|
41
|
+
expect((0, command_parser_1.extractAllBins)('echo "$(id)"')).toContain('"$(…)"');
|
|
42
|
+
expect((0, command_parser_1.extractAllBins)('echo "`id`"')).toContain('"$(…)"');
|
|
43
|
+
expect((0, command_parser_1.extractAllBins)("echo '$(id)'")).toEqual(['echo']);
|
|
44
|
+
});
|
|
45
|
+
it('still validates unquoted substitution, chains and subshells', () => {
|
|
46
|
+
expect((0, command_parser_1.extractAllBins)('echo $(sh -c id)')).toEqual(['echo', 'sh']);
|
|
47
|
+
expect((0, command_parser_1.extractAllBins)('(sh -c id)')).toEqual(['sh']);
|
|
48
|
+
expect((0, command_parser_1.extractAllBins)('git status && sh')).toEqual(['git', 'sh']);
|
|
49
|
+
expect((0, command_parser_1.extractAllBins)('git status\nsh')).toEqual(['git', 'sh']);
|
|
50
|
+
});
|
|
51
|
+
it('does not treat redirect targets or quoted operators as commands', () => {
|
|
52
|
+
expect((0, command_parser_1.extractAllBins)('npm test 2>&1 | tail -5')).toEqual(['npm', 'tail']);
|
|
53
|
+
expect((0, command_parser_1.extractAllBins)('echo hi > out.txt')).toEqual(['echo']);
|
|
54
|
+
expect((0, command_parser_1.extractAllBins)('echo hi >> "my file.txt"')).toEqual(['echo']);
|
|
55
|
+
expect((0, command_parser_1.extractAllBins)('git commit -m "a; b && c"')).toEqual(['git']);
|
|
56
|
+
expect((0, command_parser_1.extractAllBins)('grep -r "a|b" src')).toEqual(['grep']);
|
|
57
|
+
});
|
|
58
|
+
});
|
|
59
|
+
describe('run_command — wrapper bypasses are rejected', () => {
|
|
60
|
+
it.each([
|
|
61
|
+
'env sh -c "echo pwned"',
|
|
62
|
+
'echo x | xargs sh -c "echo pwned"',
|
|
63
|
+
'timeout 5 sh -c "echo pwned"',
|
|
64
|
+
'find . -maxdepth 1 -exec sh -c "echo pwned" \;',
|
|
65
|
+
])('%s', async (command) => {
|
|
66
|
+
expect(await run_command_1.runCommandTool.execute({ command }, ctx)).toMatch(/"sh" is not in the allowed list/);
|
|
67
|
+
});
|
|
68
|
+
it('blocks quoted command substitution', async () => {
|
|
69
|
+
expect(await run_command_1.runCommandTool.execute({ command: 'echo "$(sh -c id)"' }, ctx)).toMatch(/not in the allowed list/);
|
|
70
|
+
});
|
|
71
|
+
it('applies the per-agent blocklist to wrapped binaries', async () => {
|
|
72
|
+
const blocked = { ...ctx, blockedCommands: ['rm'] };
|
|
73
|
+
expect(await run_command_1.runCommandTool.execute({ command: 'env rm -rf x' }, blocked)).toMatch(/"rm" is not available/);
|
|
74
|
+
expect(await run_command_1.runCommandTool.execute({ command: 'find . -delete' }, blocked)).toMatch(/"rm" is not available/);
|
|
75
|
+
});
|
|
76
|
+
it('still runs a legitimate wrapped command', async () => {
|
|
77
|
+
const out = await run_command_1.runCommandTool.execute({ command: 'env FOO=bar node -p "process.env.FOO"' }, ctx);
|
|
78
|
+
expect(out).toBe('bar');
|
|
79
|
+
});
|
|
80
|
+
});
|
|
81
|
+
//# sourceMappingURL=command-parser.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"command-parser.test.js","sourceRoot":"","sources":["../../../src/tools/__tests__/command-parser.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Shell command analysis for the run_command allowlist.
|
|
3
|
+
*
|
|
4
|
+
* The allowlist is a guard rail, not a security boundary: allowed interpreters (node, python, npm, git
|
|
5
|
+
* aliases...) can run arbitrary code, so real confinement is the sandbox. What this module guarantees is that
|
|
6
|
+
* the allowlist and the per-agent blocklist see every binary the shell would start by *wrapping*, not only
|
|
7
|
+
* the first word of each segment: `env sh -c ...`, `xargs sh -c ...`, `timeout 5 sh`, `find -exec sh ...`.
|
|
8
|
+
*/
|
|
9
|
+
/** Binaries the shell would start for `command`, including those behind env/xargs/timeout/find -exec. */
|
|
10
|
+
export declare function extractAllBins(command: string): string[];
|
|
11
|
+
/** Base binary of the leading word of a single command (env assignments skipped); for the Windows remap. */
|
|
12
|
+
export declare function extractBin(command: string): string;
|
|
13
|
+
//# sourceMappingURL=command-parser.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"command-parser.d.ts","sourceRoot":"","sources":["../../src/tools/command-parser.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AA+IH,yGAAyG;AACzG,wBAAgB,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,EAAE,CAGxD;AAED,4GAA4G;AAC5G,wBAAgB,UAAU,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAIlD"}
|
|
@@ -0,0 +1,214 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
/**
|
|
3
|
+
* Shell command analysis for the run_command allowlist.
|
|
4
|
+
*
|
|
5
|
+
* The allowlist is a guard rail, not a security boundary: allowed interpreters (node, python, npm, git
|
|
6
|
+
* aliases...) can run arbitrary code, so real confinement is the sandbox. What this module guarantees is that
|
|
7
|
+
* the allowlist and the per-agent blocklist see every binary the shell would start by *wrapping*, not only
|
|
8
|
+
* the first word of each segment: `env sh -c ...`, `xargs sh -c ...`, `timeout 5 sh`, `find -exec sh ...`.
|
|
9
|
+
*/
|
|
10
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
11
|
+
exports.extractAllBins = extractAllBins;
|
|
12
|
+
exports.extractBin = extractBin;
|
|
13
|
+
/** Marker bins: never on any allowlist, so they make the command fail with a readable name. */
|
|
14
|
+
const QUOTED_SUBSTITUTION = '"$(…)"';
|
|
15
|
+
const ENV_SPLIT_STRING = 'env -S';
|
|
16
|
+
/** Split `command` into segments of unquoted/unescaped words; redirect targets are dropped. */
|
|
17
|
+
function tokenize(command) {
|
|
18
|
+
const segments = [];
|
|
19
|
+
const markers = [];
|
|
20
|
+
let tokens = [];
|
|
21
|
+
let word = '';
|
|
22
|
+
let inWord = false;
|
|
23
|
+
let i = 0;
|
|
24
|
+
const endWord = () => { if (inWord) {
|
|
25
|
+
tokens.push(word);
|
|
26
|
+
word = '';
|
|
27
|
+
inWord = false;
|
|
28
|
+
} };
|
|
29
|
+
const endSegment = () => { endWord(); if (tokens.length)
|
|
30
|
+
segments.push({ tokens }); tokens = []; };
|
|
31
|
+
/** Consume one word (the target of a redirect) without emitting it. */
|
|
32
|
+
const skipWord = () => {
|
|
33
|
+
while (i < command.length && /\s/.test(command[i]))
|
|
34
|
+
i++;
|
|
35
|
+
if (command[i] === '(')
|
|
36
|
+
return; // process substitution `>(cmd)`: the `(` splits the segment
|
|
37
|
+
while (i < command.length) {
|
|
38
|
+
const c = command[i];
|
|
39
|
+
if (c === '"' || c === "'") {
|
|
40
|
+
const close = command.indexOf(c, i + 1);
|
|
41
|
+
i = close === -1 ? command.length : close + 1;
|
|
42
|
+
}
|
|
43
|
+
else if (/[\s|;&<>()`]/.test(c))
|
|
44
|
+
break;
|
|
45
|
+
else
|
|
46
|
+
i += c === '\\' ? 2 : 1;
|
|
47
|
+
}
|
|
48
|
+
};
|
|
49
|
+
while (i < command.length) {
|
|
50
|
+
const c = command[i];
|
|
51
|
+
if (c === '\\') {
|
|
52
|
+
if (command[i + 1] === '\n') {
|
|
53
|
+
i += 2;
|
|
54
|
+
continue;
|
|
55
|
+
}
|
|
56
|
+
if (command[i + 1] === '\r' && command[i + 2] === '\n') {
|
|
57
|
+
i += 3;
|
|
58
|
+
continue;
|
|
59
|
+
}
|
|
60
|
+
word += command[i + 1] ?? '';
|
|
61
|
+
inWord = true;
|
|
62
|
+
i += 2;
|
|
63
|
+
continue;
|
|
64
|
+
}
|
|
65
|
+
if (c === "'") {
|
|
66
|
+
const close = command.indexOf("'", i + 1);
|
|
67
|
+
word += command.slice(i + 1, close === -1 ? command.length : close);
|
|
68
|
+
inWord = true;
|
|
69
|
+
i = close === -1 ? command.length : close + 1;
|
|
70
|
+
continue;
|
|
71
|
+
}
|
|
72
|
+
if (c === '"') {
|
|
73
|
+
inWord = true;
|
|
74
|
+
i++;
|
|
75
|
+
while (i < command.length && command[i] !== '"') {
|
|
76
|
+
if (command[i] === '\\') {
|
|
77
|
+
word += command[i + 1] ?? '';
|
|
78
|
+
i += 2;
|
|
79
|
+
continue;
|
|
80
|
+
}
|
|
81
|
+
if (command[i] === '`' || (command[i] === '$' && command[i + 1] === '(')) {
|
|
82
|
+
if (!markers.includes(QUOTED_SUBSTITUTION))
|
|
83
|
+
markers.push(QUOTED_SUBSTITUTION);
|
|
84
|
+
}
|
|
85
|
+
word += command[i];
|
|
86
|
+
i++;
|
|
87
|
+
}
|
|
88
|
+
i++;
|
|
89
|
+
continue;
|
|
90
|
+
}
|
|
91
|
+
if (/\s/.test(c)) {
|
|
92
|
+
if (c === '\n' || c === '\r')
|
|
93
|
+
endSegment();
|
|
94
|
+
else
|
|
95
|
+
endWord();
|
|
96
|
+
i++;
|
|
97
|
+
continue;
|
|
98
|
+
}
|
|
99
|
+
if (c === '>' || c === '<') {
|
|
100
|
+
if (inWord && /^[0-9]+$/.test(word)) {
|
|
101
|
+
word = '';
|
|
102
|
+
inWord = false;
|
|
103
|
+
} // `2>file`: fd, not an argument
|
|
104
|
+
else
|
|
105
|
+
endWord();
|
|
106
|
+
i++;
|
|
107
|
+
if (command[i] === c)
|
|
108
|
+
i++; // >> and <<
|
|
109
|
+
if (command[i] === '&')
|
|
110
|
+
i++; // >&2
|
|
111
|
+
skipWord();
|
|
112
|
+
continue;
|
|
113
|
+
}
|
|
114
|
+
if (c === '&' || c === '|' || c === ';' || c === '`' || c === '(' || c === ')') {
|
|
115
|
+
endSegment();
|
|
116
|
+
i++;
|
|
117
|
+
if ((c === '&' || c === '|') && command[i] === c)
|
|
118
|
+
i++;
|
|
119
|
+
continue;
|
|
120
|
+
}
|
|
121
|
+
if (c === '$' && command[i + 1] === '(') {
|
|
122
|
+
endSegment();
|
|
123
|
+
i += 2;
|
|
124
|
+
continue;
|
|
125
|
+
}
|
|
126
|
+
word += c;
|
|
127
|
+
inWord = true;
|
|
128
|
+
i++;
|
|
129
|
+
}
|
|
130
|
+
endSegment();
|
|
131
|
+
return { segments, markers };
|
|
132
|
+
}
|
|
133
|
+
const baseName = (token) => token.split('/').pop()?.split('\\').pop() ?? '';
|
|
134
|
+
const isAssignment = (t) => /^[A-Za-z_][A-Za-z0-9_]*=/.test(t);
|
|
135
|
+
// Options that consume the next token as their value, per wrapper.
|
|
136
|
+
const ENV_VALUE_OPTS = new Set(['-u', '--unset', '-C', '--chdir']);
|
|
137
|
+
const XARGS_VALUE_OPTS = new Set(['-I', '-L', '-n', '-P', '-s', '-d', '-E', '-a', '--arg-file', '--max-args', '--max-procs', '--max-lines', '--max-chars', '--delimiter', '--eof']);
|
|
138
|
+
const TIMEOUT_VALUE_OPTS = new Set(['-s', '--signal', '-k', '--kill-after']);
|
|
139
|
+
const FIND_EXEC = new Set(['-exec', '-execdir', '-ok', '-okdir']);
|
|
140
|
+
/** Drop leading options (and the values of those that take one); stop at the first non-option. */
|
|
141
|
+
function skipOptions(tokens, valueOpts) {
|
|
142
|
+
let i = 0;
|
|
143
|
+
while (i < tokens.length) {
|
|
144
|
+
const t = tokens[i];
|
|
145
|
+
if (t === '--') {
|
|
146
|
+
i++;
|
|
147
|
+
break;
|
|
148
|
+
}
|
|
149
|
+
if (!t.startsWith('-') || t === '-')
|
|
150
|
+
break;
|
|
151
|
+
i += valueOpts.has(t) ? 2 : 1;
|
|
152
|
+
}
|
|
153
|
+
return tokens.slice(i);
|
|
154
|
+
}
|
|
155
|
+
/** Every binary a segment starts: its own plus those it wraps (recursively). */
|
|
156
|
+
function binsOfTokens(tokens) {
|
|
157
|
+
let rest = tokens;
|
|
158
|
+
while (rest.length && isAssignment(rest[0]))
|
|
159
|
+
rest = rest.slice(1);
|
|
160
|
+
if (!rest.length)
|
|
161
|
+
return [];
|
|
162
|
+
const bin = baseName(rest[0]);
|
|
163
|
+
const args = rest.slice(1);
|
|
164
|
+
const out = [bin];
|
|
165
|
+
switch (bin) {
|
|
166
|
+
case 'env': {
|
|
167
|
+
let wrapped = skipOptions(args, ENV_VALUE_OPTS);
|
|
168
|
+
const leading = args.slice(0, args.length - wrapped.length);
|
|
169
|
+
if (leading.some(a => a === '-S' || a.startsWith('--split-string') || /^-[A-Za-z]*S/.test(a))) {
|
|
170
|
+
out.push(ENV_SPLIT_STRING);
|
|
171
|
+
break;
|
|
172
|
+
}
|
|
173
|
+
while (wrapped.length && isAssignment(wrapped[0]))
|
|
174
|
+
wrapped = wrapped.slice(1);
|
|
175
|
+
out.push(...binsOfTokens(wrapped));
|
|
176
|
+
break;
|
|
177
|
+
}
|
|
178
|
+
case 'xargs':
|
|
179
|
+
out.push(...binsOfTokens(skipOptions(args, XARGS_VALUE_OPTS)));
|
|
180
|
+
break;
|
|
181
|
+
case 'timeout': {
|
|
182
|
+
const afterOpts = skipOptions(args, TIMEOUT_VALUE_OPTS);
|
|
183
|
+
out.push(...binsOfTokens(afterOpts.slice(1))); // first is the duration
|
|
184
|
+
break;
|
|
185
|
+
}
|
|
186
|
+
case 'find': {
|
|
187
|
+
for (let i = 0; i < args.length; i++) {
|
|
188
|
+
if (args[i] === '-delete')
|
|
189
|
+
out.push('rm');
|
|
190
|
+
if (!FIND_EXEC.has(args[i]))
|
|
191
|
+
continue;
|
|
192
|
+
let end = i + 1;
|
|
193
|
+
while (end < args.length && args[end] !== ';' && args[end] !== '+')
|
|
194
|
+
end++;
|
|
195
|
+
out.push(...binsOfTokens(args.slice(i + 1, end)));
|
|
196
|
+
i = end;
|
|
197
|
+
}
|
|
198
|
+
break;
|
|
199
|
+
}
|
|
200
|
+
}
|
|
201
|
+
return out;
|
|
202
|
+
}
|
|
203
|
+
/** Binaries the shell would start for `command`, including those behind env/xargs/timeout/find -exec. */
|
|
204
|
+
function extractAllBins(command) {
|
|
205
|
+
const { segments, markers } = tokenize(command);
|
|
206
|
+
return [...segments.flatMap(s => binsOfTokens(s.tokens)).filter(Boolean), ...markers];
|
|
207
|
+
}
|
|
208
|
+
/** Base binary of the leading word of a single command (env assignments skipped); for the Windows remap. */
|
|
209
|
+
function extractBin(command) {
|
|
210
|
+
const stripped = command.trim().replace(/^(?:[A-Za-z_][A-Za-z0-9_]*=\S*\s+)+/, '');
|
|
211
|
+
const first = stripped.split(/[\s|;&<>]/)[0] ?? '';
|
|
212
|
+
return baseName(first);
|
|
213
|
+
}
|
|
214
|
+
//# sourceMappingURL=command-parser.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"command-parser.js","sourceRoot":"","sources":["../../src/tools/command-parser.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-command.d.ts","sourceRoot":"","sources":["../../src/tools/run-command.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"run-command.d.ts","sourceRoot":"","sources":["../../src/tools/run-command.ts"],"names":[],"mappings":"AAiEA,eAAO,MAAM,cAAc,sDAsHzB,CAAC"}
|
|
@@ -4,6 +4,7 @@ exports.runCommandTool = void 0;
|
|
|
4
4
|
const agent_core_1 = require("@backendkit-labs/agent-core");
|
|
5
5
|
const path_sandbox_1 = require("./path-sandbox");
|
|
6
6
|
const legacy_sandbox_1 = require("./legacy-sandbox");
|
|
7
|
+
const command_parser_1 = require("./command-parser");
|
|
7
8
|
const MAX_OUTPUT = 20_000;
|
|
8
9
|
/**
|
|
9
10
|
* Allowed base binaries. ALL binaries in a chained command (pipes, &&, ;)
|
|
@@ -40,28 +41,6 @@ const COMMAND_ALLOWLIST = new Set([
|
|
|
40
41
|
// Build
|
|
41
42
|
'make', 'act',
|
|
42
43
|
]);
|
|
43
|
-
/** Extract the base binary name from a single command segment. */
|
|
44
|
-
function extractBin(command) {
|
|
45
|
-
// Strip leading env var assignments like KEY=val CMD ...
|
|
46
|
-
const stripped = command.trim().replace(/^(?:[A-Za-z_][A-Za-z0-9_]*=\S*\s+)+/, '');
|
|
47
|
-
const first = stripped.split(/[\s|;&<>]/)[0] ?? '';
|
|
48
|
-
// Strip any path prefix (e.g. ./node_modules/.bin/jest → jest)
|
|
49
|
-
return first.split('/').pop()?.split('\\').pop() ?? '';
|
|
50
|
-
}
|
|
51
|
-
/**
|
|
52
|
-
* C1: Split a shell command at operator boundaries and return the binary of
|
|
53
|
-
* each segment. Quoted strings are neutralized first so operators inside
|
|
54
|
-
* quotes are not treated as delimiters.
|
|
55
|
-
*/
|
|
56
|
-
function extractAllBins(command) {
|
|
57
|
-
const noQuotes = command.replace(/"(?:[^"\\]|\\.)*"|'(?:[^'\\]|\\.)*'/g, '""');
|
|
58
|
-
// Strip I/O redirects (e.g. 2>&1, >/dev/null, 2>file, >> file) before
|
|
59
|
-
// splitting so that the target filename is never treated as a command binary.
|
|
60
|
-
// \s* after >>? consumes optional whitespace before the filename/target.
|
|
61
|
-
const noRedirects = noQuotes.replace(/[0-9]*>>?\s*(?:&[0-9]*|\S*)/g, '');
|
|
62
|
-
const segments = noRedirects.split(/&&|\|\||[|;`\r\n]|\$\(|(?<!>)&(?!&)/).map(s => s.trim()).filter(Boolean);
|
|
63
|
-
return segments.map(extractBin).filter(Boolean);
|
|
64
|
-
}
|
|
65
44
|
/**
|
|
66
45
|
* Parse `cd <dir> && <rest>` pattern and return the target cwd + real command.
|
|
67
46
|
* Handles both Unix (`cd dir && cmd`) and Windows (`cd /D dir && cmd`) forms.
|
|
@@ -115,7 +94,7 @@ exports.runCommandTool = (0, agent_core_1.defineTool)({
|
|
|
115
94
|
}
|
|
116
95
|
// A1: Windows binary normalization — only the leading binary, not args
|
|
117
96
|
let effectiveCommand = realCommand;
|
|
118
|
-
const bin = extractBin(effectiveCommand);
|
|
97
|
+
const bin = (0, command_parser_1.extractBin)(effectiveCommand);
|
|
119
98
|
if (process.platform === 'win32') {
|
|
120
99
|
const envVarMatch = effectiveCommand.match(/^((?:[A-Za-z_][A-Za-z0-9_]*=\S*\s+)*)/);
|
|
121
100
|
const envVarPrefix = envVarMatch?.[0] ?? '';
|
|
@@ -129,7 +108,7 @@ exports.runCommandTool = (0, agent_core_1.defineTool)({
|
|
|
129
108
|
}
|
|
130
109
|
}
|
|
131
110
|
// C1: validate ALL binaries in the chain, not just the first
|
|
132
|
-
const allBins = extractAllBins(effectiveCommand);
|
|
111
|
+
const allBins = (0, command_parser_1.extractAllBins)(effectiveCommand);
|
|
133
112
|
const blockedBin = allBins.find(b => !COMMAND_ALLOWLIST.has(b));
|
|
134
113
|
if (blockedBin) {
|
|
135
114
|
return `Error: Command "${blockedBin}" is not in the allowed list. ` +
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-command.js","sourceRoot":"","sources":["../../src/tools/run-command.ts"],"names":[],"mappings":";;;AACA,4DAA4D;AAC5D,iDAAiD;AACjD,qDAAiD;
|
|
1
|
+
{"version":3,"file":"run-command.js","sourceRoot":"","sources":["../../src/tools/run-command.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@backendkit-labs/agent-coding",
|
|
3
|
-
"version": "0.28.
|
|
3
|
+
"version": "0.28.2",
|
|
4
4
|
"description": "Coding agent profiles and tools for @backendkit-labs/agent-core",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -27,7 +27,7 @@
|
|
|
27
27
|
"prepublishOnly": "npm run build"
|
|
28
28
|
},
|
|
29
29
|
"dependencies": {
|
|
30
|
-
"@backendkit-labs/agent-core": "^0.
|
|
30
|
+
"@backendkit-labs/agent-core": "^0.36.0",
|
|
31
31
|
"@backendkit-labs/agent-providers": "^0.3.0",
|
|
32
32
|
"@backendkit-labs/agent-sandbox": "^0.1.0",
|
|
33
33
|
"marked": "^15.0.12",
|