Zig parses config values (cli/args.zig, Config.zig field parsers, config/string.zig) from raw byte slices, and each field type decides whether it requires UTF-8 (InvalidValue otherwise) or stores bytes. The port escape-encoded raw bytes into Strings at the line reader and let fields parse the escaped text, so fields could observe encoding artifacts; successive audits kept finding such leaks (RV5-RV8). Field parsers now receive the original bytes: text fields validate UTF-8 where Zig does, byte/path fields store bytes (EncodedOs/OsString). This resolves all 9 RV8 findings (docs/rewrite/notes/review-rv8-codex.md), each with a regression test: Windows path conversion fails with BadPathName instead of substituting U+FFFD; Windows process launch uses strict UTF-8 like Zig's Command; the WTF-8 decoder accepts paired- surrogate encodings like Zig; literal U+FDD0 Unicode key triggers; selection-word-chars and clipboard-codepoint-map reject invalid UTF-8; font style / codepoint-map family names use original bytes; C title actions forward bytes; D-Bus new-window/Flatpak conversions match Zig. Design, sweep and validation: docs/rewrite/notes/final-bytes-refactor.md. Also moves the bundled iTerm2-Color-Schemes license out of resources/themes/ so +list-themes no longer lists it as a theme (output is now byte-identical to Ghostty 1.3.1). Done by Codex (gpt-6-astra), reviewed and verified by the orchestrator. Test Plan: - cargo test --workspace --no-fail-fast (3428 passed, exit 0) - just check-macos (both), just check-windows, just check-wasm - +show-config --default --docs, +list-keybinds, +list-actions --docs, +list-themes --plain compared with /usr/bin/ghostty
181 lines
5.6 KiB
Rust
181 lines
5.6 KiB
Rust
//! Readable IO config values (port of `config/io.zig`).
|
|
|
|
use std::fmt;
|
|
|
|
use ghostty_os::osbytes::EncodedOs;
|
|
|
|
use crate::{
|
|
cli_args::{ArgError, ConfigField},
|
|
formatter::EntryFormatter,
|
|
string,
|
|
};
|
|
|
|
/// ReadableIO is some kind of IO source that is readable.
|
|
///
|
|
/// It can be either a direct string or a filepath. The filepath will
|
|
/// be deferred and read later, so it won't be checked for existence
|
|
/// or readability at configuration time. This allows using a path that
|
|
/// might be produced in an intermediate state.
|
|
#[derive(Debug, Clone, PartialEq, Eq)]
|
|
pub enum ReadableIO {
|
|
/// Raw bytes, available with `EncodedOs::to_bytes` after
|
|
/// [`ReadableIO::clone_parsed`] resolves string escapes.
|
|
Raw(EncodedOs),
|
|
/// A file path (decode with `EncodedOs::to_path` before opening).
|
|
Path(EncodedOs),
|
|
}
|
|
|
|
impl Default for ReadableIO {
|
|
fn default() -> Self {
|
|
ReadableIO::Raw(EncodedOs::new())
|
|
}
|
|
}
|
|
|
|
impl ReadableIO {
|
|
/// Same as clone but also parses the values as Zig strings in
|
|
/// the final resulting value all at once.
|
|
#[must_use]
|
|
pub fn clone_parsed(&self) -> Self {
|
|
// Parsing can't fail because we validate it in parse_bytes
|
|
match self {
|
|
ReadableIO::Raw(v) => ReadableIO::Raw(EncodedOs::from_bytes(
|
|
&string::parse_bytes(v.to_bytes()).unwrap_or_default(),
|
|
)),
|
|
ReadableIO::Path(v) => ReadableIO::Path(EncodedOs::from_bytes(
|
|
&string::parse_bytes(v.to_bytes()).unwrap_or_default(),
|
|
)),
|
|
}
|
|
}
|
|
}
|
|
|
|
impl ConfigField for ReadableIO {
|
|
fn parse_bytes(&mut self, input: Option<&[u8]>) -> Result<(), ArgError> {
|
|
let input = input.ok_or(ArgError::ValueRequired)?;
|
|
if input.is_empty() {
|
|
return Err(ArgError::ValueRequired);
|
|
}
|
|
|
|
// We only validate that string parsing works. We store the value
|
|
// as raw so that our formatting can recreate it.
|
|
string::parse_bytes(input)?;
|
|
|
|
// Next, parse the tagged union using normal rules. Invalid values in
|
|
// the tagged union are interpreted as raw values.
|
|
let (tag, rest) = crate::cli_args::split_tagged_union_bytes(input);
|
|
*self = match tag {
|
|
b"raw" => ReadableIO::Raw(EncodedOs::from_bytes(rest)),
|
|
b"path" => ReadableIO::Path(EncodedOs::from_bytes(rest)),
|
|
_ => ReadableIO::Raw(EncodedOs::from_bytes(input)),
|
|
};
|
|
Ok(())
|
|
}
|
|
|
|
fn format_entry(&self, f: &mut EntryFormatter<'_>) -> fmt::Result {
|
|
let (tag, v) = match self {
|
|
ReadableIO::Raw(v) => ("raw", v.as_encoded()),
|
|
ReadableIO::Path(v) => ("path", v.as_encoded()),
|
|
};
|
|
writeln!(f.writer, "{} = {tag}:{v}", f.name)
|
|
}
|
|
}
|
|
|
|
#[derive(Debug, Clone, PartialEq, Eq, Default)]
|
|
pub struct RepeatableReadableIO {
|
|
pub list: Vec<ReadableIO>,
|
|
}
|
|
|
|
impl RepeatableReadableIO {
|
|
/// See [`ReadableIO::clone_parsed`].
|
|
#[must_use]
|
|
pub fn clone_parsed(&self) -> Self {
|
|
Self {
|
|
list: self.list.iter().map(ReadableIO::clone_parsed).collect(),
|
|
}
|
|
}
|
|
}
|
|
|
|
impl ConfigField for RepeatableReadableIO {
|
|
fn parse_bytes(&mut self, input: Option<&[u8]>) -> Result<(), ArgError> {
|
|
let value = input.ok_or(ArgError::ValueRequired)?;
|
|
|
|
// Empty value resets the list
|
|
if value.is_empty() {
|
|
self.list.clear();
|
|
return Ok(());
|
|
}
|
|
|
|
let mut io = ReadableIO::default();
|
|
io.parse_bytes(Some(value))?;
|
|
self.list.push(io);
|
|
Ok(())
|
|
}
|
|
|
|
fn format_entry(&self, f: &mut EntryFormatter<'_>) -> fmt::Result {
|
|
if self.list.is_empty() {
|
|
return writeln!(f.writer, "{} = ", f.name);
|
|
}
|
|
for value in &self.list {
|
|
value.format_entry(f)?;
|
|
}
|
|
Ok(())
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
#[allow(clippy::unwrap_used)]
|
|
mod tests {
|
|
use super::*;
|
|
use crate::formatter::format_entry;
|
|
|
|
#[test]
|
|
fn readable_io_parse_cli() {
|
|
let mut io = ReadableIO::default();
|
|
io.parse_cli(Some("foo")).unwrap();
|
|
assert_eq!(io, ReadableIO::Raw("foo".into()));
|
|
io.parse_cli(Some("raw:foo")).unwrap();
|
|
assert_eq!(io, ReadableIO::Raw("foo".into()));
|
|
io.parse_cli(Some("path:foo")).unwrap();
|
|
assert_eq!(io, ReadableIO::Path(EncodedOs::from_plain_text("foo")));
|
|
}
|
|
|
|
#[test]
|
|
fn readable_io_path_decodes_to_the_original_bytes() {
|
|
let mut io = ReadableIO::default();
|
|
io.parse_bytes(Some(b"path:/tmp/\xffin")).unwrap();
|
|
let ReadableIO::Path(p) = io.clone_parsed() else {
|
|
panic!("path expected")
|
|
};
|
|
assert_eq!(p.to_bytes(), b"/tmp/\xffin");
|
|
}
|
|
|
|
#[test]
|
|
fn readable_io_format_entry() {
|
|
let mut v = ReadableIO::default();
|
|
v.parse_cli(Some("raw:foo")).unwrap();
|
|
let mut s = String::new();
|
|
format_entry("a", &v, &mut s).unwrap();
|
|
assert_eq!(s, "a = raw:foo\n");
|
|
}
|
|
|
|
#[test]
|
|
fn repeatable_readable_io_parse_cli() {
|
|
let mut list = RepeatableReadableIO::default();
|
|
list.parse_cli(Some("raw:A")).unwrap();
|
|
list.parse_cli(Some("path:B")).unwrap();
|
|
assert_eq!(list.list.len(), 2);
|
|
|
|
list.parse_cli(Some("")).unwrap();
|
|
assert_eq!(list.list.len(), 0);
|
|
}
|
|
|
|
#[test]
|
|
fn readable_io_errors_and_clone_parsed() {
|
|
let mut io = ReadableIO::default();
|
|
assert_eq!(io.parse_cli(None), Err(ArgError::ValueRequired));
|
|
assert_eq!(io.parse_cli(Some("")), Err(ArgError::ValueRequired));
|
|
assert!(io.parse_cli(Some("\\q")).is_err());
|
|
io.parse_cli(Some("raw:a\\nb")).unwrap();
|
|
assert_eq!(io.clone_parsed(), ReadableIO::Raw("a\nb".into()));
|
|
}
|
|
}
|