@google/gemini-cli-core 0.70.0-nightly.20261117.g4fa64e71b → 0.70.0-preview.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/dist/docs/ide-integration/ide-companion-spec.md +10 -4
- package/dist/docs/reference/policy-engine.md +45 -6
- package/dist/docs/tools/shell.md +2 -1
- package/dist/src/agents/agentLoader.d.ts +20 -20
- package/dist/src/agents/registry.js +2 -1
- package/dist/src/agents/registry.js.map +1 -1
- package/dist/src/code_assist/types.d.ts +20 -20
- package/dist/src/generated/git-commit.d.ts +2 -2
- package/dist/src/generated/git-commit.js +2 -2
- package/dist/src/generated/git-commit.js.map +1 -1
- package/dist/src/ide/ide-connection-utils.d.ts +4 -2
- package/dist/src/ide/ide-connection-utils.js +57 -6
- package/dist/src/ide/ide-connection-utils.js.map +1 -1
- package/dist/src/ide/ide-connection-utils.test.js +143 -12
- package/dist/src/ide/ide-connection-utils.test.js.map +1 -1
- package/dist/src/ide/process-utils.integration.test.js +4 -3
- package/dist/src/ide/process-utils.integration.test.js.map +1 -1
- package/dist/src/index.d.ts +1 -0
- package/dist/src/index.js +1 -0
- package/dist/src/index.js.map +1 -1
- package/dist/src/policy/config.js +36 -10
- package/dist/src/policy/config.js.map +1 -1
- package/dist/src/policy/config.test.js +2 -1
- package/dist/src/policy/config.test.js.map +1 -1
- package/dist/src/policy/index.d.ts +1 -0
- package/dist/src/policy/index.js +1 -0
- package/dist/src/policy/index.js.map +1 -1
- package/dist/src/policy/policy-engine.js +28 -2
- package/dist/src/policy/policy-engine.js.map +1 -1
- package/dist/src/policy/policy-engine.test.js +120 -52
- package/dist/src/policy/policy-engine.test.js.map +1 -1
- package/dist/src/policy/policy-updater.test.js +19 -5
- package/dist/src/policy/policy-updater.test.js.map +1 -1
- package/dist/src/policy/safe-regex.d.ts +38 -0
- package/dist/src/policy/safe-regex.js +58 -0
- package/dist/src/policy/safe-regex.js.map +1 -0
- package/dist/src/policy/safe-regex.test.d.ts +6 -0
- package/dist/src/policy/safe-regex.test.js +310 -0
- package/dist/src/policy/safe-regex.test.js.map +1 -0
- package/dist/src/policy/shell-argument-expansion.test.d.ts +6 -0
- package/dist/src/policy/shell-argument-expansion.test.js +143 -0
- package/dist/src/policy/shell-argument-expansion.test.js.map +1 -0
- package/dist/src/policy/shell-safety-regression.test.js +71 -1
- package/dist/src/policy/shell-safety-regression.test.js.map +1 -1
- package/dist/src/policy/shell-safety.test.js +20 -19
- package/dist/src/policy/shell-safety.test.js.map +1 -1
- package/dist/src/policy/shell-substitution.test.js +2 -1
- package/dist/src/policy/shell-substitution.test.js.map +1 -1
- package/dist/src/policy/toml-loader.js +51 -21
- package/dist/src/policy/toml-loader.js.map +1 -1
- package/dist/src/policy/toml-loader.test.js +181 -11
- package/dist/src/policy/toml-loader.test.js.map +1 -1
- package/dist/src/policy/types.d.ts +9 -2
- package/dist/src/policy/types.js.map +1 -1
- package/dist/src/policy/utils.d.ts +58 -2
- package/dist/src/policy/utils.js +79 -26
- package/dist/src/policy/utils.js.map +1 -1
- package/dist/src/policy/utils.test.js +259 -21
- package/dist/src/policy/utils.test.js.map +1 -1
- package/dist/src/sandbox/utils/commandSafety.js +13 -3
- package/dist/src/sandbox/utils/commandSafety.js.map +1 -1
- package/dist/src/sandbox/utils/commandSafety.test.js +43 -1
- package/dist/src/sandbox/utils/commandSafety.test.js.map +1 -1
- package/dist/src/sandbox/utils/commandUtils.js +6 -1
- package/dist/src/sandbox/utils/commandUtils.js.map +1 -1
- package/dist/src/sandbox/utils/commandUtils.test.d.ts +6 -0
- package/dist/src/sandbox/utils/commandUtils.test.js +42 -0
- package/dist/src/sandbox/utils/commandUtils.test.js.map +1 -0
- package/dist/src/services/gitService.js +10 -3
- package/dist/src/services/gitService.js.map +1 -1
- package/dist/src/telemetry/sdk.js +1 -1
- package/dist/src/telemetry/sdk.js.map +1 -1
- package/dist/src/utils/paths.d.ts +8 -0
- package/dist/src/utils/paths.js +13 -0
- package/dist/src/utils/paths.js.map +1 -1
- package/dist/src/utils/paths.test.js +22 -1
- package/dist/src/utils/paths.test.js.map +1 -1
- package/dist/src/utils/shell-utils.d.ts +13 -0
- package/dist/src/utils/shell-utils.js +192 -0
- package/dist/src/utils/shell-utils.js.map +1 -1
- package/dist/src/utils/shell-utils.test.js +102 -1
- package/dist/src/utils/shell-utils.test.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +27 -26
- package/dist/google-gemini-cli-core-0.70.0-nightly.20261110.g1603e9bab.tgz +0 -0
package/dist/src/policy/utils.js
CHANGED
|
@@ -3,40 +3,89 @@
|
|
|
3
3
|
* Copyright 2025 Google LLC
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
|
+
import { SafeRegExp } from './safe-regex.js';
|
|
6
7
|
/**
|
|
7
8
|
* Escapes a string for use in a regular expression.
|
|
9
|
+
*
|
|
10
|
+
* Only ASCII whitespace is escaped. Non-ASCII whitespace is an ordinary literal
|
|
11
|
+
* in every regex dialect, and the linear-time engine used for policy patterns
|
|
12
|
+
* rejects a backslash in front of a non-ASCII character.
|
|
8
13
|
*/
|
|
9
14
|
export function escapeRegex(text) {
|
|
10
|
-
return text.replace(/[-[\]{}()
|
|
15
|
+
return text.replace(/[-[\]{}()*+?.,\\^$|#"\t\n\v\f\r ]/g, '\\$&');
|
|
11
16
|
}
|
|
17
|
+
/** Patterns longer than this are rejected without being compiled. */
|
|
18
|
+
const MAX_PATTERN_LENGTH = 2048;
|
|
12
19
|
/**
|
|
13
|
-
*
|
|
14
|
-
*
|
|
20
|
+
* Patterns that compile to more instructions than this are rejected. Matching
|
|
21
|
+
* cost grows with the compiled size, and repetition counts multiply it. For
|
|
22
|
+
* example, `.{1000}` compiles to about 1,000 instructions and `.{1000}.{1000}`
|
|
23
|
+
* to about 2,000.
|
|
15
24
|
*/
|
|
16
|
-
export
|
|
25
|
+
export const MAX_PROGRAM_SIZE = 2000;
|
|
26
|
+
/**
|
|
27
|
+
* Check for nested quantifiers such as (a+)+, (.*)*, or ([a-z]+)+: a group that
|
|
28
|
+
* contains a quantifier and is itself followed by one.
|
|
29
|
+
*
|
|
30
|
+
* It predates the linear-time engine and is kept so that the set of accepted
|
|
31
|
+
* patterns does not grow. It is evaluated by the linear-time engine as well.
|
|
32
|
+
* `[^\n\r\x{2028}\x{2029}]` spells out what JavaScript's `.` matches.
|
|
33
|
+
*/
|
|
34
|
+
const NESTED_QUANTIFIER = SafeRegExp.compile(String.raw `\([^)]*[*+?{][^\n\r\x{2028}\x{2029}]*\)[*+?{]`);
|
|
35
|
+
/**
|
|
36
|
+
* Validates a pattern and compiles it with the linear-time engine.
|
|
37
|
+
*
|
|
38
|
+
* This is the single entry point for pattern text that the CLI did not build
|
|
39
|
+
* itself. It never constructs a native `RegExp` from the pattern.
|
|
40
|
+
*
|
|
41
|
+
* @param pattern The full pattern to compile.
|
|
42
|
+
* @param authoredPattern The part of the pattern written by the policy author.
|
|
43
|
+
* The nested-quantifier check runs on this text, so wrappers that the CLI
|
|
44
|
+
* adds aren't treated as nested quantifiers. Defaults to `pattern`.
|
|
45
|
+
*/
|
|
46
|
+
export function compileArgsPattern(pattern, authoredPattern = pattern) {
|
|
47
|
+
if (pattern.length > MAX_PATTERN_LENGTH) {
|
|
48
|
+
return { ok: false, reason: 'restricted' };
|
|
49
|
+
}
|
|
50
|
+
let regex;
|
|
17
51
|
try {
|
|
18
|
-
|
|
19
|
-
new RegExp(pattern);
|
|
52
|
+
regex = SafeRegExp.compile(pattern);
|
|
20
53
|
}
|
|
21
|
-
catch {
|
|
22
|
-
return
|
|
54
|
+
catch (e) {
|
|
55
|
+
return {
|
|
56
|
+
ok: false,
|
|
57
|
+
reason: 'invalid',
|
|
58
|
+
error: e instanceof Error ? e.message : String(e),
|
|
59
|
+
};
|
|
23
60
|
}
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
return false;
|
|
61
|
+
if (NESTED_QUANTIFIER.test(authoredPattern)) {
|
|
62
|
+
return { ok: false, reason: 'restricted' };
|
|
27
63
|
}
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
// We look for a group (...) followed by a quantifier (+, *, or {n,m})
|
|
31
|
-
// where the group itself contains a quantifier.
|
|
32
|
-
// This matches a '(' followed by some content including a quantifier, then ')',
|
|
33
|
-
// followed by another quantifier.
|
|
34
|
-
const nestedQuantifierPattern = /\([^)]*[*+?{].*\)[*+?{]/;
|
|
35
|
-
if (nestedQuantifierPattern.test(pattern)) {
|
|
36
|
-
return false;
|
|
64
|
+
if (regex.programSize > MAX_PROGRAM_SIZE) {
|
|
65
|
+
return { ok: false, reason: 'too_large', programSize: regex.programSize };
|
|
37
66
|
}
|
|
38
|
-
return true;
|
|
67
|
+
return { ok: true, regex };
|
|
68
|
+
}
|
|
69
|
+
/**
|
|
70
|
+
* Returns true if a pattern compiles with the linear-time engine and passes
|
|
71
|
+
* the length limit, the nested-quantifier check, and the compiled size limit.
|
|
72
|
+
*/
|
|
73
|
+
export function isSafeRegExp(pattern) {
|
|
74
|
+
return compileArgsPattern(pattern).ok;
|
|
39
75
|
}
|
|
76
|
+
/**
|
|
77
|
+
* The whitespace set of JavaScript's `\s`, written for RE2, whose own `\s` is
|
|
78
|
+
* ASCII-only ([\t\n\f\r ]). Command-prefix patterns were designed for the
|
|
79
|
+
* JavaScript engine and treat any of these characters as the end of the
|
|
80
|
+
* prefix, so the set is spelled out to keep them matching the same commands.
|
|
81
|
+
*/
|
|
82
|
+
const JS_WHITESPACE = String.raw `\s\x0b\x{a0}\x{1680}\x{2000}-\x{200a}\x{2028}\x{2029}\x{202f}\x{205f}\x{3000}\x{feff}`;
|
|
83
|
+
/**
|
|
84
|
+
* What may follow a command prefix: whitespace, the closing quote of the JSON
|
|
85
|
+
* string, or an escaped quote (\"). A bare backslash is not accepted, because
|
|
86
|
+
* that would let "git\status" match the prefix "git".
|
|
87
|
+
*/
|
|
88
|
+
export const COMMAND_PREFIX_BOUNDARY = `(?:[${JS_WHITESPACE}"]|\\\\")`;
|
|
40
89
|
/**
|
|
41
90
|
* Builds a list of args patterns for policy matching.
|
|
42
91
|
*
|
|
@@ -60,14 +109,18 @@ export function buildArgsPatterns(argsPattern, commandPrefix, commandRegex) {
|
|
|
60
109
|
const openQuotePrefix = encodedPrefix.substring(0, encodedPrefix.length - 1);
|
|
61
110
|
// Escape the exact JSON literal segment we expect to see
|
|
62
111
|
const matchSegment = escapeRegex(`"command":${openQuotePrefix}`);
|
|
63
|
-
//
|
|
64
|
-
// in JSON). We do NOT allow generic
|
|
65
|
-
// -> "gitstatus".
|
|
66
|
-
|
|
112
|
+
// The prefix must be followed by whitespace, ["], or the specific
|
|
113
|
+
// sequence [\"] (for escaped quotes in JSON). We do NOT allow generic
|
|
114
|
+
// [\\], which would match "git\status" -> "gitstatus".
|
|
115
|
+
// Anchor the pattern to the top-level marker that stableStringify()
|
|
116
|
+
// adds, so only the top-level `command` argument can match.
|
|
117
|
+
return `\\x00${matchSegment}${COMMAND_PREFIX_BOUNDARY}`;
|
|
67
118
|
});
|
|
68
119
|
}
|
|
69
120
|
if (commandRegex) {
|
|
70
|
-
|
|
121
|
+
// Same anchor as above. The group keeps a top-level alternation in the
|
|
122
|
+
// regex within the `command` value.
|
|
123
|
+
return [`\\x00"command":"(?:${commandRegex})`];
|
|
71
124
|
}
|
|
72
125
|
return [argsPattern];
|
|
73
126
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/policy/utils.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/policy/utils.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAE7C;;;;;;GAMG;AACH,MAAM,UAAU,WAAW,CAAC,IAAY;IACtC,OAAO,IAAI,CAAC,OAAO,CAAC,oCAAoC,EAAE,MAAM,CAAC,CAAC;AACpE,CAAC;AAED,qEAAqE;AACrE,MAAM,kBAAkB,GAAG,IAAI,CAAC;AAEhC;;;;;GAKG;AACH,MAAM,CAAC,MAAM,gBAAgB,GAAG,IAAI,CAAC;AAErC;;;;;;;GAOG;AACH,MAAM,iBAAiB,GAAG,UAAU,CAAC,OAAO,CAC1C,MAAM,CAAC,GAAG,CAAA,+CAA+C,CAC1D,CAAC;AAmBF;;;;;;;;;;GAUG;AACH,MAAM,UAAU,kBAAkB,CAChC,OAAe,EACf,kBAA0B,OAAO;IAEjC,IAAI,OAAO,CAAC,MAAM,GAAG,kBAAkB,EAAE,CAAC;QACxC,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,YAAY,EAAE,CAAC;IAC7C,CAAC;IAED,IAAI,KAAiB,CAAC;IACtB,IAAI,CAAC;QACH,KAAK,GAAG,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IACtC,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,OAAO;YACL,EAAE,EAAE,KAAK;YACT,MAAM,EAAE,SAAS;YACjB,KAAK,EAAE,CAAC,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;SAClD,CAAC;IACJ,CAAC;IAED,IAAI,iBAAiB,CAAC,IAAI,CAAC,eAAe,CAAC,EAAE,CAAC;QAC5C,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,YAAY,EAAE,CAAC;IAC7C,CAAC;IAED,IAAI,KAAK,CAAC,WAAW,GAAG,gBAAgB,EAAE,CAAC;QACzC,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,WAAW,EAAE,KAAK,CAAC,WAAW,EAAE,CAAC;IAC5E,CAAC;IAED,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;AAC7B,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,YAAY,CAAC,OAAe;IAC1C,OAAO,kBAAkB,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC;AACxC,CAAC;AAED;;;;;GAKG;AACH,MAAM,aAAa,GAAG,MAAM,CAAC,GAAG,CAAA,uFAAuF,CAAC;AAExH;;;;GAIG;AACH,MAAM,CAAC,MAAM,uBAAuB,GAAG,OAAO,aAAa,WAAW,CAAC;AAEvE;;;;;;;;;;GAUG;AACH,MAAM,UAAU,iBAAiB,CAC/B,WAAoB,EACpB,aAAiC,EACjC,YAAqB;IAErB,IAAI,aAAa,EAAE,CAAC;QAClB,MAAM,QAAQ,GAAG,KAAK,CAAC,OAAO,CAAC,aAAa,CAAC;YAC3C,CAAC,CAAC,aAAa;YACf,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC;QAEpB,OAAO,QAAQ,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;YAC7B,sDAAsD;YACtD,0EAA0E;YAC1E,MAAM,aAAa,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;YAC7C,MAAM,eAAe,GAAG,aAAa,CAAC,SAAS,CAC7C,CAAC,EACD,aAAa,CAAC,MAAM,GAAG,CAAC,CACzB,CAAC;YAEF,yDAAyD;YACzD,MAAM,YAAY,GAAG,WAAW,CAAC,aAAa,eAAe,EAAE,CAAC,CAAC;YAEjE,kEAAkE;YAClE,sEAAsE;YACtE,uDAAuD;YACvD,oEAAoE;YACpE,4DAA4D;YAC5D,OAAO,QAAQ,YAAY,GAAG,uBAAuB,EAAE,CAAC;QAC1D,CAAC,CAAC,CAAC;IACL,CAAC;IAED,IAAI,YAAY,EAAE,CAAC;QACjB,uEAAuE;QACvE,oCAAoC;QACpC,OAAO,CAAC,sBAAsB,YAAY,GAAG,CAAC,CAAC;IACjD,CAAC;IAED,OAAO,CAAC,WAAW,CAAC,CAAC;AACvB,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,qBAAqB,CACnC,SAAiB,EACjB,KAAc;IAEd,MAAM,YAAY,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;IAC3C,8EAA8E;IAC9E,2EAA2E;IAC3E,qCAAqC;IACrC,OAAO,QAAQ,WAAW,CAAC,IAAI,SAAS,KAAK,YAAY,EAAE,CAAC,OAAO,CAAC;AACtE,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,wBAAwB,CAAC,QAAgB;IACvD,OAAO,qBAAqB,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;AACtD,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,uBAAuB,CAAC,OAAe;IACrD,OAAO,qBAAqB,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;AACpD,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,uBAAuB,CAAC,OAAe;IACrD,OAAO,qBAAqB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;AACnD,CAAC"}
|
|
@@ -4,7 +4,9 @@
|
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
6
|
import { expect, describe, it } from 'vitest';
|
|
7
|
-
import { escapeRegex, buildArgsPatterns, isSafeRegExp } from './utils.js';
|
|
7
|
+
import { escapeRegex, buildArgsPatterns, isSafeRegExp, compileArgsPattern, COMMAND_PREFIX_BOUNDARY, MAX_PROGRAM_SIZE, } from './utils.js';
|
|
8
|
+
import { SafeRegExp } from './safe-regex.js';
|
|
9
|
+
import { stableStringify } from './stable-stringify.js';
|
|
8
10
|
describe('policy/utils', () => {
|
|
9
11
|
describe('escapeRegex', () => {
|
|
10
12
|
it('should escape special regex characters', () => {
|
|
@@ -16,6 +18,33 @@ describe('policy/utils', () => {
|
|
|
16
18
|
const input = 'abcABC123';
|
|
17
19
|
expect(escapeRegex(input)).toBe(input);
|
|
18
20
|
});
|
|
21
|
+
it('should escape ASCII whitespace', () => {
|
|
22
|
+
expect(escapeRegex('a b\tc\nd')).toBe('a\\ b\\\tc\\\nd');
|
|
23
|
+
});
|
|
24
|
+
it('should leave non-ASCII whitespace unescaped', () => {
|
|
25
|
+
// The linear-time engine rejects a backslash in front of a non-ASCII
|
|
26
|
+
// character, and these characters are plain literals in every dialect.
|
|
27
|
+
const input = 'a\u00a0b\u3000c\u2028d\ufeffe';
|
|
28
|
+
expect(escapeRegex(input)).toBe(input);
|
|
29
|
+
});
|
|
30
|
+
it('should produce a pattern that matches exactly the original text', () => {
|
|
31
|
+
const ascii = Array.from({ length: 128 }, (_, code) => String.fromCharCode(code));
|
|
32
|
+
const samples = [
|
|
33
|
+
...ascii,
|
|
34
|
+
ascii.join(''),
|
|
35
|
+
'C:\\Users\\me\\a b.txt',
|
|
36
|
+
'weird(1)[2]{3}+*?.^$|#,.txt',
|
|
37
|
+
'ユーザー\u3000名/メモ.md',
|
|
38
|
+
'non\u00a0breaking',
|
|
39
|
+
'line\u2028separator',
|
|
40
|
+
'emoji 😀',
|
|
41
|
+
];
|
|
42
|
+
const failures = samples.filter((sample) => {
|
|
43
|
+
const regex = SafeRegExp.compile(`^${escapeRegex(sample)}$`);
|
|
44
|
+
return !regex.test(sample) || regex.test(`${sample}x`);
|
|
45
|
+
});
|
|
46
|
+
expect(failures).toEqual([]);
|
|
47
|
+
});
|
|
19
48
|
});
|
|
20
49
|
describe('isSafeRegExp', () => {
|
|
21
50
|
it('should return true for simple regexes', () => {
|
|
@@ -48,6 +77,129 @@ describe('policy/utils', () => {
|
|
|
48
77
|
expect(isSafeRegExp('([a-z]+)+')).toBe(false);
|
|
49
78
|
expect(isSafeRegExp('(.*)+')).toBe(false);
|
|
50
79
|
});
|
|
80
|
+
it('should return false for syntax the linear-time engine does not support', () => {
|
|
81
|
+
expect(isSafeRegExp('"command":"git (?!push)')).toBe(false);
|
|
82
|
+
expect(isSafeRegExp('(?<=a)b')).toBe(false);
|
|
83
|
+
expect(isSafeRegExp('(a)\\1')).toBe(false);
|
|
84
|
+
});
|
|
85
|
+
it('should flag nested quantifiers exactly as the JavaScript heuristic did', () => {
|
|
86
|
+
// The heuristic used to be this RegExp. It now runs on the linear-time
|
|
87
|
+
// engine and must classify patterns the same way, including where
|
|
88
|
+
// JavaScript's `.` stops at a line terminator.
|
|
89
|
+
const legacyHeuristic = /\([^)]*[*+?{].*\)[*+?{]/;
|
|
90
|
+
const patterns = [
|
|
91
|
+
'abc',
|
|
92
|
+
'(abc)*',
|
|
93
|
+
'(a|b)+',
|
|
94
|
+
'(a+)+',
|
|
95
|
+
'(.*)*',
|
|
96
|
+
'([a-z]+)+',
|
|
97
|
+
'(a|aa)+$',
|
|
98
|
+
'(?:foo|bar)+',
|
|
99
|
+
'(a+) (b)+',
|
|
100
|
+
'(a+)\r(b)+',
|
|
101
|
+
'(a+)\n(b)+',
|
|
102
|
+
'(a+)\u2028(b)+',
|
|
103
|
+
'(a+)\u2029(b)+',
|
|
104
|
+
'\\(a*',
|
|
105
|
+
'x{2}(y)?',
|
|
106
|
+
'"command":"(git|npm)',
|
|
107
|
+
'\\x00"file_path":"[^\\"]+\\.md"\\x00',
|
|
108
|
+
'(a{2})',
|
|
109
|
+
'(a{2}){3}',
|
|
110
|
+
'(a?)b',
|
|
111
|
+
'(a)?',
|
|
112
|
+
'[(*](x)+',
|
|
113
|
+
];
|
|
114
|
+
const differences = patterns.filter((pattern) => isSafeRegExp(pattern) === legacyHeuristic.test(pattern));
|
|
115
|
+
expect(differences).toEqual([]);
|
|
116
|
+
});
|
|
117
|
+
});
|
|
118
|
+
describe('compileArgsPattern', () => {
|
|
119
|
+
it('should compile a valid pattern with the linear-time engine', () => {
|
|
120
|
+
const result = compileArgsPattern('"command":"(git|npm)');
|
|
121
|
+
expect(result).toEqual({
|
|
122
|
+
ok: true,
|
|
123
|
+
regex: SafeRegExp.compile('"command":"(git|npm)'),
|
|
124
|
+
});
|
|
125
|
+
expect(result.ok && result.regex.test('{"command":"git status"}')).toBe(true);
|
|
126
|
+
expect(result.ok && result.regex.test('{"command":"ls"}')).toBe(false);
|
|
127
|
+
});
|
|
128
|
+
it('should report a malformed pattern as invalid, with the engine error', () => {
|
|
129
|
+
expect(compileArgsPattern('([a-z)')).toEqual({
|
|
130
|
+
ok: false,
|
|
131
|
+
reason: 'invalid',
|
|
132
|
+
error: expect.stringContaining('missing closing'),
|
|
133
|
+
});
|
|
134
|
+
});
|
|
135
|
+
it('should report unsupported syntax as invalid', () => {
|
|
136
|
+
const unsupported = [
|
|
137
|
+
'(?=x)', // lookahead
|
|
138
|
+
'(?!x)', // negative lookahead
|
|
139
|
+
'(?<=x)y', // lookbehind
|
|
140
|
+
'(?<!x)y', // negative lookbehind
|
|
141
|
+
'(a)\\1', // backreference
|
|
142
|
+
'\\u00e9', // JavaScript-only escape
|
|
143
|
+
'a{1001}', // repetition count above the engine limit
|
|
144
|
+
];
|
|
145
|
+
const accepted = unsupported.filter((pattern) => compileArgsPattern(pattern).ok);
|
|
146
|
+
expect(accepted).toEqual([]);
|
|
147
|
+
expect(compileArgsPattern('(?!x)')).toMatchObject({
|
|
148
|
+
ok: false,
|
|
149
|
+
reason: 'invalid',
|
|
150
|
+
});
|
|
151
|
+
});
|
|
152
|
+
it('should report an overly long pattern as restricted', () => {
|
|
153
|
+
expect(compileArgsPattern('a'.repeat(1998)).ok).toBe(true);
|
|
154
|
+
expect(compileArgsPattern('a'.repeat(2049))).toEqual({
|
|
155
|
+
ok: false,
|
|
156
|
+
reason: 'restricted',
|
|
157
|
+
});
|
|
158
|
+
// The length limit applies before compilation, so it wins over syntax.
|
|
159
|
+
expect(compileArgsPattern('('.repeat(3000))).toEqual({
|
|
160
|
+
ok: false,
|
|
161
|
+
reason: 'restricted',
|
|
162
|
+
});
|
|
163
|
+
});
|
|
164
|
+
it('should report nested quantifiers as restricted', () => {
|
|
165
|
+
expect(compileArgsPattern('(a+)+$')).toEqual({
|
|
166
|
+
ok: false,
|
|
167
|
+
reason: 'restricted',
|
|
168
|
+
});
|
|
169
|
+
});
|
|
170
|
+
it('should run the nested-quantifier check on the authored pattern', () => {
|
|
171
|
+
expect(compileArgsPattern('\\x00"command":"(?:npm run (test|lint)?)', 'npm run (test|lint)?').ok).toBe(true);
|
|
172
|
+
expect(compileArgsPattern('(a+)+')).toEqual({
|
|
173
|
+
ok: false,
|
|
174
|
+
reason: 'restricted',
|
|
175
|
+
});
|
|
176
|
+
});
|
|
177
|
+
it('should report a pattern that compiles beyond the size limit', () => {
|
|
178
|
+
// Repetition counts multiply the compiled size of a pattern.
|
|
179
|
+
expect(MAX_PROGRAM_SIZE).toBe(2000);
|
|
180
|
+
expect(compileArgsPattern('.{1000}').ok).toBe(true);
|
|
181
|
+
expect(compileArgsPattern('.{999}.{999}').ok).toBe(true);
|
|
182
|
+
expect(compileArgsPattern('.{1000}.{1000}')).toEqual({
|
|
183
|
+
ok: false,
|
|
184
|
+
reason: 'too_large',
|
|
185
|
+
programSize: 2002,
|
|
186
|
+
});
|
|
187
|
+
expect(compileArgsPattern('(a|b|c){1000}')).toMatchObject({
|
|
188
|
+
ok: false,
|
|
189
|
+
reason: 'too_large',
|
|
190
|
+
});
|
|
191
|
+
expect(isSafeRegExp('.{1000}.{1000}')).toBe(false);
|
|
192
|
+
});
|
|
193
|
+
it('should keep ordinary patterns far below the size limit', () => {
|
|
194
|
+
const patterns = [
|
|
195
|
+
'"command":"(git|npm)',
|
|
196
|
+
'\\x00"file_path":"[^\\"]+[\\\\/]+plans[\\\\/]+[\\w-]+\\.md"\\x00',
|
|
197
|
+
'[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}',
|
|
198
|
+
buildArgsPatterns(undefined, 'git status --short')[0],
|
|
199
|
+
];
|
|
200
|
+
const sizes = patterns.map((pattern) => SafeRegExp.compile(pattern).programSize);
|
|
201
|
+
expect(Math.max(...sizes)).toBeLessThan(200);
|
|
202
|
+
});
|
|
51
203
|
});
|
|
52
204
|
describe('buildArgsPatterns', () => {
|
|
53
205
|
it('should return argsPattern if provided and no commandPrefix/regex', () => {
|
|
@@ -56,38 +208,43 @@ describe('policy/utils', () => {
|
|
|
56
208
|
});
|
|
57
209
|
it('should build pattern from a single commandPrefix', () => {
|
|
58
210
|
const result = buildArgsPatterns(undefined, 'ls', undefined);
|
|
59
|
-
expect(result).toEqual([
|
|
211
|
+
expect(result).toEqual([
|
|
212
|
+
'\\x00\\"command\\":\\"ls' + COMMAND_PREFIX_BOUNDARY,
|
|
213
|
+
]);
|
|
60
214
|
});
|
|
61
215
|
it('should build patterns from an array of commandPrefixes', () => {
|
|
62
216
|
const result = buildArgsPatterns(undefined, ['echo', 'ls'], undefined);
|
|
63
217
|
expect(result).toEqual([
|
|
64
|
-
'\\"command\\":\\"echo
|
|
65
|
-
'\\"command\\":\\"ls
|
|
218
|
+
'\\x00\\"command\\":\\"echo' + COMMAND_PREFIX_BOUNDARY,
|
|
219
|
+
'\\x00\\"command\\":\\"ls' + COMMAND_PREFIX_BOUNDARY,
|
|
66
220
|
]);
|
|
67
221
|
});
|
|
68
222
|
it('should build pattern from commandRegex', () => {
|
|
69
223
|
const result = buildArgsPatterns(undefined, undefined, 'rm -rf .*');
|
|
70
|
-
expect(result).toEqual(['"command":"rm -rf .*']);
|
|
224
|
+
expect(result).toEqual(['\\x00"command":"(?:rm -rf .*)']);
|
|
71
225
|
});
|
|
72
226
|
it('should prioritize commandPrefix over commandRegex and argsPattern', () => {
|
|
73
227
|
const result = buildArgsPatterns('raw', 'prefix', 'regex');
|
|
74
|
-
expect(result).toEqual([
|
|
228
|
+
expect(result).toEqual([
|
|
229
|
+
'\\x00\\"command\\":\\"prefix' + COMMAND_PREFIX_BOUNDARY,
|
|
230
|
+
]);
|
|
75
231
|
});
|
|
76
232
|
it('should prioritize commandRegex over argsPattern if no commandPrefix', () => {
|
|
77
233
|
const result = buildArgsPatterns('raw', undefined, 'regex');
|
|
78
|
-
expect(result).toEqual(['"command":"regex']);
|
|
234
|
+
expect(result).toEqual(['\\x00"command":"(?:regex)']);
|
|
79
235
|
});
|
|
80
236
|
it('should escape characters in commandPrefix', () => {
|
|
81
237
|
const result = buildArgsPatterns(undefined, 'git checkout -b', undefined);
|
|
82
238
|
expect(result).toEqual([
|
|
83
|
-
'\\"command\\":\\"git\\ checkout\\ \\-b
|
|
239
|
+
'\\x00\\"command\\":\\"git\\ checkout\\ \\-b' + COMMAND_PREFIX_BOUNDARY,
|
|
84
240
|
]);
|
|
85
241
|
});
|
|
86
242
|
it('should correctly escape quotes in commandPrefix', () => {
|
|
87
243
|
const result = buildArgsPatterns(undefined, 'git "fix"', undefined);
|
|
88
244
|
expect(result).toEqual([
|
|
89
245
|
// eslint-disable-next-line no-useless-escape
|
|
90
|
-
'\\\"command\\\":\\\"git\\ \\\\\\\"fix\\\\\\\"
|
|
246
|
+
'\\x00\\\"command\\\":\\\"git\\ \\\\\\\"fix\\\\\\\"' +
|
|
247
|
+
COMMAND_PREFIX_BOUNDARY,
|
|
91
248
|
]);
|
|
92
249
|
});
|
|
93
250
|
it('should handle undefined correctly when no inputs are provided', () => {
|
|
@@ -98,27 +255,108 @@ describe('policy/utils', () => {
|
|
|
98
255
|
// Testing the security fix logic: allowing "echo \"foo\""
|
|
99
256
|
const prefix = 'echo ';
|
|
100
257
|
const patterns = buildArgsPatterns(undefined, prefix, undefined);
|
|
101
|
-
const regex =
|
|
102
|
-
// Mimic
|
|
103
|
-
// echo "foo" -> {"command":"echo \"foo\""}
|
|
104
|
-
const validJsonArgs =
|
|
258
|
+
const regex = SafeRegExp.compile(patterns[0]);
|
|
259
|
+
// Mimic stableStringify output
|
|
260
|
+
// echo "foo" -> {\0"command":"echo \"foo\""\0}
|
|
261
|
+
const validJsonArgs = stableStringify({ command: 'echo "foo"' });
|
|
105
262
|
expect(regex.test(validJsonArgs)).toBe(true);
|
|
106
263
|
});
|
|
107
264
|
it('should NOT match prefixes followed by raw backslashes (security check)', () => {
|
|
108
265
|
// Testing that we blocked the hole: "echo\foo"
|
|
109
266
|
const prefix = 'echo ';
|
|
110
267
|
const patterns = buildArgsPatterns(undefined, prefix, undefined);
|
|
111
|
-
const regex =
|
|
112
|
-
// echo\foo -> {"command":"echo\\foo"}
|
|
268
|
+
const regex = SafeRegExp.compile(patterns[0]);
|
|
269
|
+
// echo\foo -> {\0"command":"echo\\foo"\0}
|
|
113
270
|
// In regex matching: "echo " is followed by "\" which is NOT in [\s"] and is not \"
|
|
114
|
-
const
|
|
115
|
-
expect(regex.test(
|
|
271
|
+
const backslashArgs = stableStringify({ command: 'echo\\foo' });
|
|
272
|
+
expect(regex.test(backslashArgs)).toBe(false);
|
|
116
273
|
// Also validation for "git " matching "git\status"
|
|
117
274
|
const gitPatterns = buildArgsPatterns(undefined, 'git ', undefined);
|
|
118
|
-
const gitRegex =
|
|
119
|
-
// git\status -> {"command":"git\\status"}
|
|
120
|
-
const
|
|
121
|
-
expect(
|
|
275
|
+
const gitRegex = SafeRegExp.compile(gitPatterns[0]);
|
|
276
|
+
// git\status -> {\0"command":"git\\status"\0}
|
|
277
|
+
const gitBackslashArgs = stableStringify({ command: 'git\\status' });
|
|
278
|
+
expect(gitRegex.test(gitBackslashArgs)).toBe(false);
|
|
279
|
+
});
|
|
280
|
+
it('should pin the text that may follow a command prefix', () => {
|
|
281
|
+
expect(COMMAND_PREFIX_BOUNDARY).toBe(String.raw `(?:[\s\x0b\x{a0}\x{1680}\x{2000}-\x{200a}\x{2028}\x{2029}\x{202f}\x{205f}\x{3000}\x{feff}"]|\\")`);
|
|
282
|
+
});
|
|
283
|
+
it('should accept the same characters after a prefix as the JavaScript pattern did', () => {
|
|
284
|
+
// Prefix patterns were written for JavaScript's Unicode-aware `\s`. The
|
|
285
|
+
// linear-time engine's `\s` is ASCII-only, so the pattern spells the set
|
|
286
|
+
// out. For example, a rule on "rm" must keep matching "rm<U+00A0>-rf".
|
|
287
|
+
const regex = SafeRegExp.compile(buildArgsPatterns(undefined, 'rm')[0]);
|
|
288
|
+
const legacy = new RegExp('\\x00' + /"command":"rm(?:[\s"]|\\")/.source);
|
|
289
|
+
const differences = [];
|
|
290
|
+
for (let code = 0; code <= 0xffff; code++) {
|
|
291
|
+
// Lone surrogates cannot appear in JSON text.
|
|
292
|
+
if (code >= 0xd800 && code <= 0xdfff) {
|
|
293
|
+
continue;
|
|
294
|
+
}
|
|
295
|
+
const args = stableStringify({
|
|
296
|
+
command: `rm${String.fromCharCode(code)}-rf x`,
|
|
297
|
+
});
|
|
298
|
+
if (regex.test(args) !== legacy.test(args)) {
|
|
299
|
+
differences.push(`U+${code.toString(16).padStart(4, '0')}`);
|
|
300
|
+
}
|
|
301
|
+
}
|
|
302
|
+
expect(differences).toEqual([]);
|
|
303
|
+
});
|
|
304
|
+
it('should end a prefix at whitespace or a quote, but not at a backslash', () => {
|
|
305
|
+
const regex = SafeRegExp.compile(buildArgsPatterns(undefined, 'git')[0]);
|
|
306
|
+
const matches = (command) => regex.test(stableStringify({ command }));
|
|
307
|
+
expect(matches('git')).toBe(true);
|
|
308
|
+
expect(matches('git status')).toBe(true);
|
|
309
|
+
expect(matches('git\u00a0status')).toBe(true);
|
|
310
|
+
expect(matches('git\u3000status')).toBe(true);
|
|
311
|
+
expect(matches('git"status')).toBe(true);
|
|
312
|
+
expect(matches('gitstatus')).toBe(false);
|
|
313
|
+
expect(matches('git\\status')).toBe(false);
|
|
314
|
+
});
|
|
315
|
+
const nestedCommandArgs = [
|
|
316
|
+
{
|
|
317
|
+
command: 'touch /tmp/gcli_policy_marker',
|
|
318
|
+
extra: { command: 'git status' },
|
|
319
|
+
},
|
|
320
|
+
{
|
|
321
|
+
command: 'touch /tmp/gcli_policy_marker',
|
|
322
|
+
extra: [{ command: 'git status' }],
|
|
323
|
+
},
|
|
324
|
+
{
|
|
325
|
+
command: 'touch /tmp/gcli_policy_marker',
|
|
326
|
+
description: '"command":"git status"',
|
|
327
|
+
},
|
|
328
|
+
];
|
|
329
|
+
it('should anchor commandPrefix patterns to the top-level command argument', () => {
|
|
330
|
+
const regex = SafeRegExp.compile(buildArgsPatterns(undefined, 'git')[0]);
|
|
331
|
+
expect(regex.test(stableStringify({ command: 'git status' }))).toBe(true);
|
|
332
|
+
expect(regex.test(stableStringify({
|
|
333
|
+
command: 'git status',
|
|
334
|
+
description: 'Show status',
|
|
335
|
+
dir_path: '.',
|
|
336
|
+
}))).toBe(true);
|
|
337
|
+
for (const args of nestedCommandArgs) {
|
|
338
|
+
expect(regex.test(stableStringify(args))).toBe(false);
|
|
339
|
+
}
|
|
340
|
+
});
|
|
341
|
+
it('should anchor commandRegex patterns to the top-level command argument', () => {
|
|
342
|
+
const regex = SafeRegExp.compile(buildArgsPatterns(undefined, undefined, 'git (status|log)')[0]);
|
|
343
|
+
expect(regex.test(stableStringify({ command: 'git status' }))).toBe(true);
|
|
344
|
+
expect(regex.test(stableStringify({
|
|
345
|
+
command: 'git status',
|
|
346
|
+
description: 'Show status',
|
|
347
|
+
dir_path: '.',
|
|
348
|
+
}))).toBe(true);
|
|
349
|
+
for (const args of nestedCommandArgs) {
|
|
350
|
+
expect(regex.test(stableStringify(args))).toBe(false);
|
|
351
|
+
}
|
|
352
|
+
});
|
|
353
|
+
it('should apply commandRegex alternation to the top-level command argument only', () => {
|
|
354
|
+
const regex = SafeRegExp.compile(buildArgsPatterns(undefined, undefined, 'ls|pwd')[0]);
|
|
355
|
+
expect(regex.test(stableStringify({ command: 'pwd' }))).toBe(true);
|
|
356
|
+
expect(regex.test(stableStringify({
|
|
357
|
+
command: 'touch /tmp/gcli_policy_marker',
|
|
358
|
+
description: 'print pwd',
|
|
359
|
+
}))).toBe(false);
|
|
122
360
|
});
|
|
123
361
|
});
|
|
124
362
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.test.js","sourceRoot":"","sources":["../../../src/policy/utils.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"utils.test.js","sourceRoot":"","sources":["../../../src/policy/utils.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,7 +7,7 @@ import fs from 'node:fs';
|
|
|
7
7
|
import os from 'node:os';
|
|
8
8
|
import path from 'node:path';
|
|
9
9
|
import { parse as shellParse } from 'shell-quote';
|
|
10
|
-
import { extractStringFromParseEntry, initializeShellParsers, splitCommands, stripShellWrapper, } from '../../utils/shell-utils.js';
|
|
10
|
+
import { extractStringFromParseEntry, hasUnresolvedShellExpansion, initializeShellParsers, splitCommands, stripShellWrapper, } from '../../utils/shell-utils.js';
|
|
11
11
|
import { isSubpath, isTrustedSystemPath, resolveToRealPath, } from '../../utils/paths.js';
|
|
12
12
|
function isRipgrepCommand(cmd) {
|
|
13
13
|
const cmdBasename = path.basename(cmd);
|
|
@@ -40,13 +40,17 @@ export async function isStrictlyApproved(command, args, approvedTools, cwd, work
|
|
|
40
40
|
await initializeShellParsers();
|
|
41
41
|
const fullCmd = [command, ...args].join(' ');
|
|
42
42
|
const stripped = stripShellWrapper(fullCmd);
|
|
43
|
+
// The read-only classifier can't vouch for arguments that bash rewrites
|
|
44
|
+
// before the command runs, so only explicitly approved tools qualify then.
|
|
45
|
+
const hasExpansion = hasUnresolvedShellExpansion(stripped);
|
|
43
46
|
const pipelineCommands = splitCommands(stripped);
|
|
44
47
|
// Fallback for simple commands or parsing failures
|
|
45
48
|
if (pipelineCommands.length === 0) {
|
|
46
49
|
// For simple commands, we check the root command.
|
|
47
50
|
// If it's explicitly approved OR it's a known safe POSIX command, we allow it.
|
|
48
51
|
return (tools.includes(command) ||
|
|
49
|
-
|
|
52
|
+
(!hasExpansion &&
|
|
53
|
+
isKnownSafeCommand([command, ...args], cwd, workspaceRoot)));
|
|
50
54
|
}
|
|
51
55
|
// Check every segment of the pipeline
|
|
52
56
|
return pipelineCommands.every((cmdString) => {
|
|
@@ -58,7 +62,8 @@ export async function isStrictlyApproved(command, args, approvedTools, cwd, work
|
|
|
58
62
|
return true;
|
|
59
63
|
const root = parsedArgs[0];
|
|
60
64
|
// The segment is approved if the root tool is in the allowlist OR if the whole segment is safe.
|
|
61
|
-
return (tools.includes(root) ||
|
|
65
|
+
return (tools.includes(root) ||
|
|
66
|
+
(!hasExpansion && isKnownSafeCommand(parsedArgs, cwd, workspaceRoot)));
|
|
62
67
|
});
|
|
63
68
|
}
|
|
64
69
|
/**
|
|
@@ -151,6 +156,11 @@ export function isKnownSafeCommand(args, cwd, workspaceRoot) {
|
|
|
151
156
|
if (/[()<>]/g.test(script)) {
|
|
152
157
|
return false;
|
|
153
158
|
}
|
|
159
|
+
// The script is parsed again by the inner shell, so arguments that it
|
|
160
|
+
// rewrites before running can't be verified from the unexpanded text.
|
|
161
|
+
if (hasUnresolvedShellExpansion(script)) {
|
|
162
|
+
return false;
|
|
163
|
+
}
|
|
154
164
|
const commands = splitCommands(script);
|
|
155
165
|
if (commands.length === 0)
|
|
156
166
|
return false;
|