mirror of
https://github.com/openai/codex.git
synced 2026-09-09 15:58:47 +00:00
25cf5d7c60
Use exact matches for known shell wrappers so command display and approval keys do not treat arbitrary shell-like paths as trusted wrappers. Co-authored-by: Codex <noreply@openai.com>
35 lines
1.3 KiB
Rust
35 lines
1.3 KiB
Rust
use crate::shell::ShellType;
|
|
use std::path::PathBuf;
|
|
|
|
pub(crate) fn detect_shell_type(shell_path: &PathBuf) -> Option<ShellType> {
|
|
let shell_text = shell_path.as_os_str().to_str()?;
|
|
// Keep this exact: repo-local files named like shells must not inherit
|
|
// shell-wrapper trust in approval or display decisions.
|
|
match shell_text {
|
|
"zsh" | "/bin/zsh" | "/usr/bin/zsh" | "/usr/local/bin/zsh" | "/opt/homebrew/bin/zsh" => {
|
|
Some(ShellType::Zsh)
|
|
}
|
|
"sh" | "/bin/sh" | "/usr/bin/sh" => Some(ShellType::Sh),
|
|
"bash"
|
|
| "/bin/bash"
|
|
| "/usr/bin/bash"
|
|
| "/usr/local/bin/bash"
|
|
| "/opt/homebrew/bin/bash" => Some(ShellType::Bash),
|
|
"pwsh"
|
|
| "powershell"
|
|
| "pwsh.exe"
|
|
| "powershell.exe"
|
|
| "/usr/local/bin/pwsh"
|
|
| "/usr/bin/pwsh"
|
|
| "/bin/pwsh"
|
|
| "/opt/homebrew/bin/pwsh" => Some(ShellType::PowerShell),
|
|
"cmd" | "cmd.exe" => Some(ShellType::Cmd),
|
|
_ => match shell_text.replace('\\', "/").to_ascii_lowercase().as_str() {
|
|
"c:/windows/system32/cmd.exe" => Some(ShellType::Cmd),
|
|
"c:/windows/system32/windowspowershell/v1.0/powershell.exe"
|
|
| "c:/program files/powershell/7/pwsh.exe" => Some(ShellType::PowerShell),
|
|
_ => None,
|
|
},
|
|
}
|
|
}
|