diff --git a/crates/osoosi-sandbox/src/tiered_executor.rs b/crates/osoosi-sandbox/src/tiered_executor.rs index 9fb26dca..2171df0b 100644 --- a/crates/osoosi-sandbox/src/tiered_executor.rs +++ b/crates/osoosi-sandbox/src/tiered_executor.rs @@ -1208,7 +1208,16 @@ pub fn spawn_tier2_appcontainer_command( use std::os::unix::process::CommandExt; let _ = (agent_id, scratchpad_root, job); let mut cmd = std::process::Command::new(&verified_exe.metadata.canonical_path); - cmd.args(args); + if verified_exe.metadata.normalized_stem == "cmd" + && args + .first() + .map(|s| s.eq_ignore_ascii_case("/c")) + .unwrap_or(false) + { + cmd.arg("-c").arg(args[1..].join(" ")); + } else { + cmd.args(args); + } // Pre-exec isolation: PR_SET_NO_NEW_PRIVS and optional cgroup.procs binding unsafe { diff --git a/crates/osoosi-sandbox/src/windows.rs b/crates/osoosi-sandbox/src/windows.rs index a8433737..ccf8e1a5 100644 --- a/crates/osoosi-sandbox/src/windows.rs +++ b/crates/osoosi-sandbox/src/windows.rs @@ -900,10 +900,28 @@ pub fn execute_confined_windows_process( policy: &WindowsConfinementPolicy, ) -> Result { verify_windows_confinement_invariants(policy)?; - let output = std::process::Command::new(program) - .args(args) - .output() - .map_err(|e| e.to_string())?; + let output = if program.eq_ignore_ascii_case("cmd.exe") || program.eq_ignore_ascii_case("cmd") { + let remaining_args: Vec<&str> = if let Some(first) = args.first() { + if first.eq_ignore_ascii_case("/c") { + args[1..].to_vec() + } else { + args.to_vec() + } + } else { + Vec::new() + }; + let joined = remaining_args.join(" "); + std::process::Command::new("/bin/sh") + .arg("-c") + .arg(joined) + .output() + .map_err(|e| e.to_string())? + } else { + std::process::Command::new(program) + .args(args) + .output() + .map_err(|e| e.to_string())? + }; Ok(ConfinementTransitionOutcome { resume_thread_allowed: true,