The agent harness performance optimization system. Skills, instincts, memory, security, and research-first development for Claude Code, Codex, Opencode, Cursor and beyond.
fix(hooks): add Windows .cmd support with shell injection guard
Jonghyeok Park0a3afbe38fd6
diff --git a/scripts/hooks/post-edit-format.js b/scripts/hooks/post-edit-format.jsindex 7e098132b..d6486866b 100644--- a/scripts/hooks/post-edit-format.js+++ b/scripts/hooks/post-edit-format.js@@ -17,9 +17,12 @@* Fails silently if no formatter is found or installed.*/-const { execFileSync } = require('child_process');+const { execFileSync, spawnSync } = require('child_process');const path = require('path');+// Shell metacharacters that cmd.exe interprets as command separators/operators+const UNSAFE_PATH_CHARS = /[&|<>^%!]/;+const { findProjectRoot, detectFormatter, resolveFormatterBin } = require('../lib/resolve-formatter');const MAX_STDIN = 1024 * 1024; // 1MB limit@@ -50,11 +53,29 @@ function run(rawInput) {// Prettier: `--write` = format onlyconst args = formatter === 'biome' ? [...resolved.prefix, 'check', '--write', resolvedFilePath] : [...resolved.prefix, '--write', resolvedFilePath];- execFileSync(resolved.bin, args, {- cwd: projectRoot,- stdio: ['pipe', 'pipe', 'pipe'],- timeout: 15000- });+ if (process.platform === 'win32' && resolved.bin.endsWith('.cmd')) {+ // Windows: .cmd files require shell to execute. Guard against+ // command injection by rejecting paths with shell metacharacters.+ if (UNSAFE_PATH_CHARS.test(resolvedFilePath)) {+ throw new Error('File path contains unsafe shell characters');+ }+ const result = spawnSync(resolved.bin, args, {+ cwd: projectRoot,+ shell: true,+ stdio: 'pipe',+ timeout: 15000+ });+ if (result.error) throw result.error;+ if (typeof result.status === 'number' && result.status !== 0) {+ throw new Error(result.stderr?.toString() || `Formatter exited with status ${result.status}`);+ }+ } else {+ execFileSync(resolved.bin, args, {+ cwd: projectRoot,+ stdio: ['pipe', 'pipe', 'pipe'],+ timeout: 15000+ });+ }} catch {// Formatter not installed, file missing, or failed — non-blocking}diff --git a/scripts/hooks/run-with-flags.js b/scripts/hooks/run-with-flags.jsindex d69e8131a..b665fe289 100755--- a/scripts/hooks/run-with-flags.js+++ b/scripts/hooks/run-with-flags.js@@ -90,7 +90,7 @@ async function main() {if (hookModule && typeof hookModule.run === 'function') {try {const output = hookModule.run(raw);- if (output != null) process.stdout.write(output);+ if (output !== null && output !== undefined) process.stdout.write(output);} catch (runErr) {process.stderr.write(`[Hook] run() error for ${hookId}: ${runErr.message}\n`);process.stdout.write(raw);diff --git a/scripts/lib/resolve-formatter.js b/scripts/lib/resolve-formatter.jsindex f940a1fa7..22d048199 100644--- a/scripts/lib/resolve-formatter.js+++ b/scripts/lib/resolve-formatter.js@@ -86,7 +86,7 @@ function detectFormatter(projectRoot) {const pkgPath = path.join(projectRoot, 'package.json');if (fs.existsSync(pkgPath)) {const pkg = JSON.parse(fs.readFileSync(pkgPath, 'utf8'));- if (pkg.prettier != null) {+ if ('prettier' in pkg) {formatterCache.set(projectRoot, 'prettier');return 'prettier';}diff --git a/tests/hooks/hooks.test.js b/tests/hooks/hooks.test.jsindex 81766ea2d..311ae21fd 100644--- a/tests/hooks/hooks.test.js+++ b/tests/hooks/hooks.test.js@@ -1966,8 +1966,10 @@ async function runTests() {const formatSource = fs.readFileSync(path.join(scriptsDir, 'post-edit-format.js'), 'utf8');// Strip comments to avoid matching "shell: true" in comment textconst codeOnly = formatSource.replace(/\/\/.*$/gm, '').replace(/\/\*[\s\S]*?\*\//g, '');- assert.ok(!codeOnly.includes('shell:'), 'post-edit-format.js should not pass shell option in code');- // npx.cmd handling moved to shared resolve-formatter.js — verify it uses the shared module+ assert.ok(!/execFileSync\([^)]*shell\s*:/.test(codeOnly), 'post-edit-format.js should not pass shell option to execFileSync');+ assert.ok(codeOnly.includes("process.platform === 'win32' && resolved.bin.endsWith('.cmd')"), 'Windows shell execution must stay gated to .cmd shims');+ assert.ok(codeOnly.includes('UNSAFE_PATH_CHARS'), 'Must guard against shell metacharacters before using shell: true');+ // npx.cmd handling in shared resolve-formatter.jsconst resolverSource = fs.readFileSync(path.join(scriptsDir, '..', 'lib', 'resolve-formatter.js'), 'utf8');assert.ok(resolverSource.includes('npx.cmd'), 'resolve-formatter.js should use npx.cmd for Windows cross-platform safety');assert.ok(formatSource.includes('resolveFormatterBin'), 'post-edit-format.js should use shared resolveFormatterBin');