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
0f898d3e41
commit
8f3e206d9f
92 files changed
+2967
-992
No files matched your search
@@ -6,8 +6,12 @@
|
||||
|
||||
use std::io;
|
||||
|
||||
use crate::osbytes::EncodedOs;
|
||||
|
||||
/// `homedir.zig` is unavailable: nothing can be expanded.
|
||||
pub mod homedir {
|
||||
use crate::osbytes::EncodedOs;
|
||||
|
||||
#[derive(Debug, thiserror::Error, PartialEq, Eq)]
|
||||
pub enum ExpandError {
|
||||
#[error("home detection failed")]
|
||||
@@ -17,11 +21,11 @@ pub mod homedir {
|
||||
}
|
||||
|
||||
/// Paths without a leading `~/` pass through; others fail.
|
||||
pub fn expand_home(path: &str) -> Result<String, ExpandError> {
|
||||
if path.starts_with("~/") {
|
||||
pub fn expand_home(path: &EncodedOs) -> Result<EncodedOs, ExpandError> {
|
||||
if path.starts_with_plain("~/") {
|
||||
Err(ExpandError::HomeDetectionFailed)
|
||||
} else {
|
||||
Ok(path.to_owned())
|
||||
Ok(path.clone())
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -29,9 +33,9 @@ pub mod homedir {
|
||||
pub mod passwd {
|
||||
#[derive(Debug, Clone, Default, PartialEq, Eq)]
|
||||
pub struct Entry {
|
||||
pub shell: Option<String>,
|
||||
pub home: Option<String>,
|
||||
pub name: Option<String>,
|
||||
pub shell: Option<crate::osbytes::EncodedOs>,
|
||||
pub home: Option<crate::osbytes::EncodedOs>,
|
||||
pub name: Option<crate::osbytes::EncodedOs>,
|
||||
}
|
||||
|
||||
/// Zig: `@compileError("passwd is not available for wasm")`.
|
||||
@@ -49,7 +53,7 @@ pub mod xdg {
|
||||
#[derive(Debug, Clone, Copy, Default)]
|
||||
pub struct Options<'a> {
|
||||
pub subdir: Option<&'a str>,
|
||||
pub home: Option<&'a str>,
|
||||
pub home: Option<&'a crate::osbytes::EncodedOs>,
|
||||
}
|
||||
|
||||
#[derive(Debug, thiserror::Error, PartialEq, Eq)]
|
||||
@@ -58,15 +62,15 @@ pub mod xdg {
|
||||
Unavailable,
|
||||
}
|
||||
|
||||
pub fn config(_: &Options<'_>) -> Result<String, Error> {
|
||||
pub fn config(_: &Options<'_>) -> Result<crate::osbytes::EncodedOs, Error> {
|
||||
Err(Error::Unavailable)
|
||||
}
|
||||
|
||||
pub fn cache(_: &Options<'_>) -> Result<String, Error> {
|
||||
pub fn cache(_: &Options<'_>) -> Result<crate::osbytes::EncodedOs, Error> {
|
||||
Err(Error::Unavailable)
|
||||
}
|
||||
|
||||
pub fn state(_: &Options<'_>) -> Result<String, Error> {
|
||||
pub fn state(_: &Options<'_>) -> Result<crate::osbytes::EncodedOs, Error> {
|
||||
Err(Error::Unavailable)
|
||||
}
|
||||
|
||||
@@ -78,17 +82,17 @@ pub mod xdg {
|
||||
|
||||
#[derive(Debug, Clone, Default, PartialEq, Eq)]
|
||||
pub struct ResourcesDir {
|
||||
pub app_path: Option<String>,
|
||||
pub host_path: Option<String>,
|
||||
pub app_path: Option<EncodedOs>,
|
||||
pub host_path: Option<EncodedOs>,
|
||||
}
|
||||
|
||||
impl ResourcesDir {
|
||||
pub fn app(&self) -> Option<&str> {
|
||||
self.app_path.as_deref()
|
||||
pub fn app(&self) -> Option<&EncodedOs> {
|
||||
self.app_path.as_ref()
|
||||
}
|
||||
|
||||
pub fn host(&self) -> Option<&str> {
|
||||
self.host_path.as_deref()
|
||||
pub fn host(&self) -> Option<&EncodedOs> {
|
||||
self.host_path.as_ref()
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user