mirror of
https://github.com/google-gemini/gemini-cli.git
synced 2026-06-13 04:48:09 -07:00
fix(core): handle multi-line escaped quotes in stripShellWrapper (#27467)
Co-authored-by: luisfelipe-alt <luisfelipe@google.com>
This commit is contained in:
committed by
GitHub
parent
ba12896a37
commit
9e5599c323
@@ -55,9 +55,13 @@ vi.mock('node:child_process', () => ({
|
||||
}));
|
||||
|
||||
const mockQuote = vi.hoisted(() => vi.fn());
|
||||
vi.mock('shell-quote', () => ({
|
||||
quote: mockQuote,
|
||||
}));
|
||||
vi.mock('shell-quote', async (importOriginal) => {
|
||||
const actual = await importOriginal<typeof import('shell-quote')>();
|
||||
return {
|
||||
...actual,
|
||||
quote: mockQuote,
|
||||
};
|
||||
});
|
||||
|
||||
const mockDebugLogger = vi.hoisted(() => ({
|
||||
error: vi.fn(),
|
||||
@@ -388,6 +392,12 @@ describe('stripShellWrapper', () => {
|
||||
it('should not strip anything if no wrapper is present', () => {
|
||||
expect(stripShellWrapper('ls -l')).toEqual('ls -l');
|
||||
});
|
||||
|
||||
it('should handle multi-line escaped double quotes correctly', () => {
|
||||
const multiLine = 'bash -c "hg commit -m \\"title\n\nbody\\""';
|
||||
const expected = 'hg commit -m "title\n\nbody"';
|
||||
expect(stripShellWrapper(multiLine)).toEqual(expected);
|
||||
});
|
||||
});
|
||||
|
||||
describe('escapeShellArg', () => {
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
import os from 'node:os';
|
||||
import fs from 'node:fs';
|
||||
import path from 'node:path';
|
||||
import { quote, type ParseEntry } from 'shell-quote';
|
||||
import { quote, parse, type ParseEntry } from 'shell-quote';
|
||||
import {
|
||||
spawn,
|
||||
spawnSync,
|
||||
@@ -846,10 +846,26 @@ export function stripShellWrapper(command: string): string {
|
||||
if (match) {
|
||||
let newCommand = command.substring(match[0].length).trim();
|
||||
if (
|
||||
(newCommand.startsWith('"') && newCommand.endsWith('"')) ||
|
||||
(newCommand.startsWith("'") && newCommand.endsWith("'"))
|
||||
newCommand.length >= 2 &&
|
||||
((newCommand.startsWith('"') && newCommand.endsWith('"')) ||
|
||||
(newCommand.startsWith("'") && newCommand.endsWith("'")))
|
||||
) {
|
||||
newCommand = newCommand.substring(1, newCommand.length - 1);
|
||||
const isPosixShell = match[0].trim().endsWith('-c');
|
||||
if (isPosixShell && newCommand.startsWith('"')) {
|
||||
try {
|
||||
const parsed = parse(newCommand, (key) => '$' + key);
|
||||
const firstEntry = parsed[0];
|
||||
if (parsed.length === 1 && typeof firstEntry === 'string') {
|
||||
newCommand = firstEntry;
|
||||
} else {
|
||||
newCommand = newCommand.substring(1, newCommand.length - 1);
|
||||
}
|
||||
} catch {
|
||||
newCommand = newCommand.substring(1, newCommand.length - 1);
|
||||
}
|
||||
} else {
|
||||
newCommand = newCommand.substring(1, newCommand.length - 1);
|
||||
}
|
||||
}
|
||||
return newCommand;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user