MediaMetz/gemini-cli
1
0
Fork 0
mirror of https://github.com/google-gemini/gemini-cli.git synced 2026-03-16 00:51:25 -07:00
Code Issues Packages Projects Releases Wiki Activity

fix(core): remove private IP rescue to address SSRF vulnerability and fix formatting

Browse Source
This commit is contained in:
Aishanee Shah
2026-03-05 20:55:40 +00:00
parent 3bfd87530c
commit 5e6b26429c
2 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -463,7 +463,7 @@ describe('WebFetchTool', () => {
expect(result.llmContent).toContain('rescued content');
});
it('should rescue private URLs via fallback and merge with public results', async () => {
it('should NOT rescue private URLs via fallback but still fetch public ones', async () => {
vi.mocked(fetchUtils.isPrivateIp).mockImplementation(
(url) => url === 'https://private.com/',
);
@@ -485,11 +485,6 @@ describe('WebFetchTool', () => {
],
});
// Mock fallback fetch for the private URL
mockFetch('https://private.com/', {
text: () => Promise.resolve('private rescued content'),
});
const tool = new WebFetchTool(mockConfig, bus);
const params = {
prompt: 'fetch https://public.com and https://private.com',
@@ -498,16 +493,16 @@ describe('WebFetchTool', () => {
const result = await invocation.execute(new AbortController().signal);
expect(result.llmContent).toContain('public content');
expect(result.llmContent).toContain('--- Rescued Content ---');
expect(result.llmContent).toContain('URL: https://private.com/');
expect(result.llmContent).toContain('private rescued content');
expect(result.llmContent).not.toContain('--- Rescued Content ---');
expect(result.llmContent).not.toContain('URL: https://private.com/');
});
it('should return WEB_FETCH_FALLBACK_FAILED on fallback fetch failure', async () => {
vi.spyOn(fetchUtils, 'isPrivateIp').mockReturnValue(true);
mockFetch('https://private.ip/', new Error('fetch failed'));
vi.spyOn(fetchUtils, 'isPrivateIp').mockReturnValue(false);
mockGenerateContent.mockRejectedValue(new Error('primary fail'));
mockFetch('https://public.ip/', new Error('fallback fetch failed'));
const tool = new WebFetchTool(mockConfig, bus);
const params = { prompt: 'fetch https://private.ip' };
const params = { prompt: 'fetch https://public.ip' };
const invocation = tool.build(params);
const result = await invocation.execute(new AbortController().signal);
expect(result.error?.type).toBe(ToolErrorType.WEB_FETCH_FALLBACK_FAILED);

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

@@ -606,7 +606,7 @@ Response: ${truncateString(rawResponseText, 10000, '\n\n... [Error response trun
let llmContent = '';
let returnDisplay = '';
const needsRescue: string[] = [...privateUrls];
const needsRescue: string[] = [];
if (publicUrls.length > 0) {
const geminiClient = this.config.getGeminiClient();
@@ -619,7 +619,6 @@ Response: ${truncateString(rawResponseText, 10000, '\n\n... [Error response trun
);
let responseText = getResponseText(response) || '';
const urlContextMeta = response.candidates?.[0]?.urlContextMetadata as
| UrlContextMetadata
| undefined;