tiennm99/ccs
1
0 Fork 0
mirror of https://github.com/tiennm99/ccs.git synced 2026-10-15 12:13:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(windows): pin cmd shell for wrapper launches (#1229)

Browse Source
This commit is contained in:
Kai (Tam Nhu) Tran authored and GitHub committed 2026-05-12 18:13:13 -04:00
1 parent 2e5439290e
commit 9c5d4976c5
8 files changed
+215 -46
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

tests/unit/utils/claudecode-env-stripping.test.ts
+4 -4
View File
@@ -405,7 +405,7 @@ describe('CLAUDECODE environment stripping', () => {
expect(spawnCalls.length).toBeGreaterThan(0);
const env = spawnCalls[0].options?.env as NodeJS.ProcessEnv;
expect(Object.keys(env).map((k) => k.toUpperCase())).not.toContain('CLAUDECODE');
expect(spawnCalls[0].options?.shell).toBe('cmd.exe');
expect(spawnCalls[0].options?.shell).toBe('C:\\Windows\\System32\\cmd.exe');
});
it('execClaude sets DISABLE_AUTOUPDATER=1 when preferences.auto_update is false', () => {
@@ -827,9 +827,9 @@ describe('CLAUDECODE environment stripping', () => {
expect(persistedLaunchSettings.env?.ANTHROPIC_AUTH_TOKEN).toBeUndefined();
expect(persistedLaunchSettings.env?.ANTHROPIC_API_KEY).toBeUndefined();
expect(persistedLaunchSettings.env?.ANTHROPIC_MODEL).toBe('gpt-5.4');
expect(
persistedLaunchSettings.hooks?.PreToolUse?.[0]?.hooks?.[0]?.command
).toBe('echo headless-bridge-hook');
expect(persistedLaunchSettings.hooks?.PreToolUse?.[0]?.hooks?.[0]?.command).toBe(
'echo headless-bridge-hook'
);
expect(fs.existsSync(launchSettingsPath)).toBe(false);
});
tests/unit/utils/shell-executor.test.ts
+73 -11
View File
@@ -82,41 +82,103 @@ describe('escapeShellArg', () => {
expect(escapeShellArg('hello!')).toBe('"hello^^!"');
});
it('prefers ComSpec when resolving the escaped command shell', async () => {
it('accepts ComSpec only when it resolves to the trusted system cmd.exe', async () => {
const originalComSpec = process.env.ComSpec;
const originalCOMSPEC = process.env.COMSPEC;
const originalSystemRoot = process.env.SystemRoot;
try {
process.env.SystemRoot = 'C:\\Windows';
process.env.ComSpec = 'C:\\Windows\\System32\\cmd.exe';
delete process.env.COMSPEC;
const { getWindowsEscapedCommandShell } = await import(
'../../../src/utils/shell-executor'
);
const { getWindowsEscapedCommandShell } = await import('../../../src/utils/shell-executor');
expect(getWindowsEscapedCommandShell()).toBe('C:\\Windows\\System32\\cmd.exe');
} finally {
if (originalComSpec === undefined) delete process.env.ComSpec;
else process.env.ComSpec = originalComSpec;
if (originalCOMSPEC === undefined) delete process.env.COMSPEC;
else process.env.COMSPEC = originalCOMSPEC;
if (originalSystemRoot === undefined) delete process.env.SystemRoot;
else process.env.SystemRoot = originalSystemRoot;
}
});
it('falls back to cmd.exe when ComSpec is unavailable', async () => {
it('rejects relative or non-system ComSpec values', async () => {
const originalComSpec = process.env.ComSpec;
const originalCOMSPEC = process.env.COMSPEC;
const originalSystemRoot = process.env.SystemRoot;
try {
delete process.env.ComSpec;
delete process.env.COMSPEC;
const { getWindowsEscapedCommandShell } = await import(
'../../../src/utils/shell-executor'
);
expect(getWindowsEscapedCommandShell()).toBe('cmd.exe');
process.env.SystemRoot = 'C:\\Windows';
process.env.ComSpec = 'cmd.exe';
process.env.COMSPEC = 'C:\\Temp\\cmd.exe';
const { getWindowsEscapedCommandShell } = await import('../../../src/utils/shell-executor');
expect(getWindowsEscapedCommandShell()).toBe('C:\\Windows\\System32\\cmd.exe');
} finally {
if (originalComSpec === undefined) delete process.env.ComSpec;
else process.env.ComSpec = originalComSpec;
if (originalCOMSPEC === undefined) delete process.env.COMSPEC;
else process.env.COMSPEC = originalCOMSPEC;
if (originalSystemRoot === undefined) delete process.env.SystemRoot;
else process.env.SystemRoot = originalSystemRoot;
}
});
it('rejects relative Windows root environment values', async () => {
const originalComSpec = process.env.ComSpec;
const originalCOMSPEC = process.env.COMSPEC;
const originalSystemRoot = process.env.SystemRoot;
const originalSYSTEMROOT = process.env.SYSTEMROOT;
const originalWindir = process.env.windir;
try {
process.env.SystemRoot = 'Windows';
delete process.env.SYSTEMROOT;
delete process.env.windir;
process.env.ComSpec = 'Windows\\System32\\cmd.exe';
process.env.COMSPEC = 'C:\\Temp\\cmd.exe';
const { getWindowsEscapedCommandShell } = await import('../../../src/utils/shell-executor');
expect(getWindowsEscapedCommandShell()).toBe('C:\\Windows\\System32\\cmd.exe');
} finally {
if (originalComSpec === undefined) delete process.env.ComSpec;
else process.env.ComSpec = originalComSpec;
if (originalCOMSPEC === undefined) delete process.env.COMSPEC;
else process.env.COMSPEC = originalCOMSPEC;
if (originalSystemRoot === undefined) delete process.env.SystemRoot;
else process.env.SystemRoot = originalSystemRoot;
if (originalSYSTEMROOT === undefined) delete process.env.SYSTEMROOT;
else process.env.SYSTEMROOT = originalSYSTEMROOT;
if (originalWindir === undefined) delete process.env.windir;
else process.env.windir = originalWindir;
}
});
it('falls back to the absolute default system cmd.exe when Windows root env is unavailable', async () => {
const originalComSpec = process.env.ComSpec;
const originalCOMSPEC = process.env.COMSPEC;
const originalSystemRoot = process.env.SystemRoot;
const originalSYSTEMROOT = process.env.SYSTEMROOT;
const originalWindir = process.env.windir;
try {
delete process.env.ComSpec;
delete process.env.COMSPEC;
delete process.env.SystemRoot;
delete process.env.SYSTEMROOT;
delete process.env.windir;
const { getWindowsEscapedCommandShell } = await import('../../../src/utils/shell-executor');
expect(getWindowsEscapedCommandShell()).toBe('C:\\Windows\\System32\\cmd.exe');
} finally {
if (originalComSpec === undefined) delete process.env.ComSpec;
else process.env.ComSpec = originalComSpec;
if (originalCOMSPEC === undefined) delete process.env.COMSPEC;
else process.env.COMSPEC = originalCOMSPEC;
if (originalSystemRoot === undefined) delete process.env.SystemRoot;
else process.env.SystemRoot = originalSystemRoot;
if (originalSYSTEMROOT === undefined) delete process.env.SYSTEMROOT;
else process.env.SYSTEMROOT = originalSYSTEMROOT;
if (originalWindir === undefined) delete process.env.windir;
else process.env.windir = originalWindir;
}
});
});