valknar/llmx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

For npm upgrade on Windows, go through cmd.exe to get path traversal working (#6387)

Browse Source 
On Windows, `npm` by itself does not resolve under std::process::Command
which does not consider PATHEXT to resolve it to `npm.cmd` in the PATH.
By running the npm upgrade command via cmd.exe we get proper path
semantics so it actually works.
This commit is contained in:
iceweasel-oai
2025-11-09 21:07:44 -08:00
committed by GitHub
parent 5f1fab0e7c
commit 625f2208c4
1 changed files with 24 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
codex-rs/cli/src/main.rs
View File

@@ -26,10 +26,11 @@ use std::path::PathBuf;
use supports_color::Stream; use supports_color::Stream;
mod mcp_cmd; mod mcp_cmd;
#[cfg(not(windows))]
mod wsl_paths; mod wsl_paths;
use crate::mcp_cmd::McpCli; use crate::mcp_cmd::McpCli;
use crate::wsl_paths::normalize_for_wsl;
use codex_core::config::Config; use codex_core::config::Config;
use codex_core::config::ConfigOverrides; use codex_core::config::ConfigOverrides;
use codex_core::features::is_known_feature_key; use codex_core::features::is_known_feature_key;
@@ -269,14 +270,30 @@ fn handle_app_exit(exit_info: AppExitInfo) -> anyhow::Result<()> {
/// Run the update action and print the result. /// Run the update action and print the result.
fn run_update_action(action: UpdateAction) -> anyhow::Result<()> { fn run_update_action(action: UpdateAction) -> anyhow::Result<()> {
println!(); println!();
let (cmd, args) = action.command_args();
let cmd_str = action.command_str(); let cmd_str = action.command_str();
println!("Updating Codex via `{cmd_str}`..."); println!("Updating Codex via `{cmd_str}`...");
let command_path = normalize_for_wsl(cmd);
let normalized_args: Vec<String> = args.iter().map(normalize_for_wsl).collect(); let status = {
let status = std::process::Command::new(&command_path) #[cfg(windows)]
.args(&normalized_args) {
.status()?; // On Windows, run via cmd.exe so .CMD/.BAT are correctly resolved (PATHEXT semantics).
std::process::Command::new("cmd")
.args(["/C", &cmd_str])
.status()?
}
#[cfg(not(windows))]
{
let (cmd, args) = action.command_args();
let command_path = crate::wsl_paths::normalize_for_wsl(cmd);
let normalized_args: Vec<String> = args
.iter()
.map(crate::wsl_paths::normalize_for_wsl)
.collect();
std::process::Command::new(&command_path)
.args(&normalized_args)
.status()?
}
};
if !status.success() { if !status.success() {
anyhow::bail!("`{cmd_str}` failed with status {status}"); anyhow::bail!("`{cmd_str}` failed with status {status}");
} }