refactor: type escaped OS strings and fix the final audit findings
Escaped config strings (ghostty_os::osbytes) kept reaching OS boundaries undecoded, and decoding was occasionally applied to plain text. The root cause was that both were plain `String`s. Now: - `EncodedOs` is a newtype (no Display/AsRef<Path>) that decodes only via to_os/to_path/to_bytes/to_wide; plain text enters via from_plain_text. OS helpers (env, home, xdg, passwd, resources dir, path expansion), config::Path, WorkingDirectory, theme/file_load/edit paths, terminal pwd, OpenUrl/Pwd actions and termio cwd use it, so the compiler forces decoding at every boundary. os::open takes &OsStr. Config output is unchanged. Fixes all rows of docs/rewrite/notes/review-rv5-codex.md (final-Z7.md): screen-file copy; regex/OSC 8 URLs no longer decoded (regression); lossless Windows WTF-8/WTF-16 for args, env and CreateProcessW; Windows resources dir/TERMINFO; color OSC request lists and X11 color lookup no longer allocate globally (C zero-allocation test extended); macOS Mach handler resumes all threads before KERN_FAILURE (hang regression) and SIGABRT minidumps go through the exception thread; plus open-config, background images, crash dir, ssh cache, exe dir/PATH, fontconfig filenames, file links, kitty TMPDIR, .hushlogin and benchmark paths. The typing also surfaced and fixed gtk-custom-css, bell audio, bash HISTFILE, OSC 52 writes and the C config getters. Test Plan: - cargo test --workspace (3376 passed) - just check-macos (both), just check-windows, just check-wasm - diff <(ghostty-rs +show-config --default --docs) \ <(ghostty +show-config --default --docs)
This commit is contained in:
1 parent
7a3f0b0f2c
commit
f7fec6f44d
92 files changed
+2967
-992
No files matched your search
@@ -177,7 +177,7 @@ pub struct Command {
|
||||
/// Working directory to change to in the child process. If not set, the
|
||||
/// working directory of the calling process is preserved. Failure to
|
||||
/// change directory is ignored (as in Ghostty).
|
||||
pub cwd: Option<String>,
|
||||
pub cwd: Option<ghostty_os::osbytes::EncodedOs>,
|
||||
|
||||
/// The file handle to set for stdin/out/err. If this isn't set, we do
|
||||
/// nothing explicitly so it is up to the behavior of the operating system.
|
||||
@@ -317,8 +317,8 @@ impl Command {
|
||||
let prep = self.prepare()?;
|
||||
let cwd = self
|
||||
.cwd
|
||||
.as_deref()
|
||||
.and_then(|c| CString::new(config_str_to_bytes(c)).ok());
|
||||
.as_ref()
|
||||
.and_then(|c| CString::new(c.to_bytes()).ok());
|
||||
|
||||
let mut argv_ptrs: Vec<*const c_char> = prep.argv.iter().map(|c| c.as_ptr()).collect();
|
||||
argv_ptrs.push(std::ptr::null());
|
||||
@@ -872,7 +872,7 @@ mod tests {
|
||||
|
||||
let mut cmd = sh("pwd");
|
||||
cmd.stdout = Some(stdout.try_clone().unwrap().into());
|
||||
cmd.cwd = Some("/tmp".to_owned());
|
||||
cmd.cwd = Some(ghostty_os::osbytes::EncodedOs::from_encoded("/tmp"));
|
||||
cmd.start().unwrap();
|
||||
assert_eq!(cmd.wait(true).unwrap(), Exit::Exited(0));
|
||||
|
||||
@@ -894,7 +894,7 @@ mod tests {
|
||||
let mut cmd = Command::new("/bin/sh", &["/bin/sh", "-c", "pwd -P; printf %s \"$0\""]);
|
||||
cmd.args.push(bytes_to_config_string(b"a\xffb"));
|
||||
cmd.stdout = Some(stdout.try_clone().unwrap().into());
|
||||
cmd.cwd = Some(bytes_to_config_string(&raw));
|
||||
cmd.cwd = Some(ghostty_os::osbytes::EncodedOs::from_bytes(&raw));
|
||||
cmd.start().unwrap();
|
||||
assert_eq!(cmd.wait(true).unwrap(), Exit::Exited(0));
|
||||
|
||||
@@ -915,7 +915,9 @@ mod tests {
|
||||
|
||||
let mut cmd = sh("echo ok");
|
||||
cmd.stdout = Some(stdout.try_clone().unwrap().into());
|
||||
cmd.cwd = Some("/definitely/not/a/dir".to_owned());
|
||||
cmd.cwd = Some(ghostty_os::osbytes::EncodedOs::from_encoded(
|
||||
"/definitely/not/a/dir",
|
||||
));
|
||||
cmd.start().unwrap();
|
||||
assert_eq!(cmd.wait(true).unwrap(), Exit::Exited(0));
|
||||
assert_eq!("ok\n", read_all(stdout));
|
||||
@@ -933,7 +935,7 @@ mod tests {
|
||||
let mut cmd = Command::new("/not/a/binary", &["/not/a/binary", ""]);
|
||||
cmd.stdout = Some(stdout.try_clone().unwrap().into());
|
||||
cmd.stderr = Some(stderr.try_clone().unwrap().into());
|
||||
cmd.cwd = Some("/bin".to_owned());
|
||||
cmd.cwd = Some(ghostty_os::osbytes::EncodedOs::from_encoded("/bin"));
|
||||
cmd.start().unwrap();
|
||||
assert!(cmd.pid.is_some());
|
||||
assert_eq!(cmd.wait(true).unwrap(), Exit::Exited(1));
|
||||
|
||||
Reference in new issue
Block a user