MediaMetz/gemini-cli
1
0
Fork 0
mirror of https://github.com/google-gemini/gemini-cli.git synced 2026-04-18 09:11:55 -07:00
Code Issues Packages Projects Releases Wiki Activity

fix(core): secure argsPattern and revert WEB_FETCH_TOOL_NAME escalation (#22104)

Browse Source 
Co-authored-by: Taylor Mullen <ntaylormullen@google.com>
This commit is contained in:
Spencer
2026-03-11 22:26:21 -04:00
committed by GitHub
parent 35bf746e62
commit f090736ebc
8 changed files with 67 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/core/src/tools/ls.ts
View File

@@ -21,7 +21,7 @@ import type { Config } from '../config/config.js';
import { DEFAULT_FILE_FILTERING_OPTIONS } from '../config/constants.js';
import { ToolErrorType } from './tool-error.js';
import { LS_TOOL_NAME } from './tool-names.js';
import { buildFilePathArgsPattern } from '../policy/utils.js';
import { buildDirPathArgsPattern } from '../policy/utils.js';
import { debugLogger } from '../utils/debugLogger.js';
import { LS_DEFINITION } from './definitions/coreTools.js';
import { resolveToolDeclaration } from './definitions/resolver.js';
@@ -130,7 +130,7 @@ class LSToolInvocation extends BaseToolInvocation<LSToolParams, ToolResult> {
_outcome: ToolConfirmationOutcome,
): PolicyUpdateOptions | undefined {
return {
argsPattern: buildFilePathArgsPattern(this.params.dir_path),
argsPattern: buildDirPathArgsPattern(this.params.dir_path),
};
}

6
packages/core/src/tools/read-many-files.ts
View File

@@ -18,7 +18,7 @@ import { getErrorMessage } from '../utils/errors.js';
import * as fsPromises from 'node:fs/promises';
import * as path from 'node:path';
import { glob, escape } from 'glob';
import { buildPatternArgsPattern } from '../policy/utils.js';
import { buildParamArgsPattern } from '../policy/utils.js';
import {
detectFileType,
processSingleFileContent,
@@ -161,10 +161,8 @@ ${finalExclusionPatternsForDescription
override getPolicyUpdateOptions(
_outcome: ToolConfirmationOutcome,
): PolicyUpdateOptions | undefined {
// We join the include patterns to match the JSON stringified arguments.
// buildPatternArgsPattern handles JSON stringification.
return {
argsPattern: buildPatternArgsPattern(JSON.stringify(this.params.include)),
argsPattern: buildParamArgsPattern('include', this.params.include),
};
}

9
packages/core/src/tools/web-fetch.ts
View File

@@ -14,7 +14,7 @@ import {
type ToolConfirmationOutcome,
type PolicyUpdateOptions,
} from './tools.js';
import { buildPatternArgsPattern } from '../policy/utils.js';
import { buildParamArgsPattern } from '../policy/utils.js';
import type { MessageBus } from '../confirmation-bus/message-bus.js';
import { ToolErrorType } from './tool-error.js';
import { getErrorMessage } from '../utils/errors.js';
@@ -328,12 +328,11 @@ ${textContent}
): PolicyUpdateOptions | undefined {
if (this.params.url) {
return {
argsPattern: buildPatternArgsPattern(this.params.url),
argsPattern: buildParamArgsPattern('url', this.params.url),
};
}
if (this.params.prompt) {
} else if (this.params.prompt) {
return {
argsPattern: buildPatternArgsPattern(this.params.prompt),
argsPattern: buildParamArgsPattern('prompt', this.params.prompt),
};
}
return undefined;