Files
ghostty-rs/crates/ghostty-cli/src/validate_config.rs
T
ddidderr 6f9b3129e1 refactor(config): parse config values from raw bytes like Zig
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
2026-10-12 11:57:01 +02:00

158 lines
5.0 KiB
Rust

//! `+validate-config` (ZIG/src/cli/validate_config.zig).
use std::io::Write;
use ghostty_config::{config::Config, config_struct};
use ghostty_os::osbytes::EncodedOs;
use crate::error::Error;
config_struct! {
pub struct Options {
/// The path of the config file to validate. If this isn't specified,
/// then the default config file paths will be validated.
"config-file" => config_file: Option<EncodedOs> = None,
}
}
cli_options!(Options, help);
/// The `validate-config` command is used to validate a Ghostty config file.
///
/// When executed without any arguments, this will load the config from the default
/// location.
///
/// Flags:
///
/// * `--config-file`: can be passed to validate a specific target config file in
/// a non-default location
pub fn run(args: &[impl AsRef<[u8]>]) -> Result<u8, Error> {
let mut opts = Options::default();
crate::parse_options(&mut opts, args)?;
let mut stdout = std::io::BufWriter::new(std::io::stdout().lock());
let result = run_inner(&opts, &mut stdout);
stdout.flush()?;
result
}
fn run_inner(opts: &Options, stdout: &mut dyn Write) -> Result<u8, Error> {
let mut cfg = Config::new_default();
// If a config path is passed, validate it, otherwise validate default configs
if let Some(config_path) = &opts.config_file {
// Byte-preserving: the option string carries non-UTF-8 bytes via the
// reversible `osbytes` escape and the canonical path may too.
let abs_path = std::fs::canonicalize(config_path.to_path()?)?;
cfg.load_file(&EncodedOs::from_path(&abs_path))?;
cfg.load_recursive_files()?;
} else {
cfg = Config::load()?;
}
cfg.finalize()?;
if !cfg.diagnostics.items().is_empty() {
for diag in cfg.diagnostics.items() {
// Diagnostics embed config values in the reversible byte
// encoding; print the original bytes.
stdout.write_all(&ghostty_os::osbytes::config_str_to_bytes(&format!(
"{diag}\n"
)))?;
}
return Ok(1);
}
Ok(0)
}
#[cfg(test)]
mod tests {
#![allow(clippy::unwrap_used)]
use super::*;
fn write_tmp(name: &str, content: &str) -> String {
let dir =
std::env::temp_dir().join(format!("ghostty-cli-vc-{}-{name}", std::process::id()));
std::fs::create_dir_all(&dir).unwrap();
let p = dir.join("config");
std::fs::write(&p, content).unwrap();
p.to_string_lossy().into_owned()
}
#[test]
fn validate_good_file() {
let p = write_tmp("good", "font-size = 14\n");
let opts = Options {
config_file: Some(p.into()),
};
let mut out = Vec::new();
assert_eq!(0, run_inner(&opts, &mut out).unwrap());
assert_eq!(0, out.len());
}
#[test]
fn validate_bad_file_prints_diagnostics() {
let p = write_tmp("bad", "not-a-key = 1\nfont-size = abc\n");
let opts = Options {
config_file: Some(p.clone().into()),
};
let mut out = Vec::new();
assert_eq!(1, run_inner(&opts, &mut out).unwrap());
let s = String::from_utf8(out).unwrap();
assert!(
s.contains(&format!("{p}:1:not-a-key: unknown field\n")),
"{s}"
);
assert!(
s.contains(&format!("{p}:2:font-size: invalid value \"abc\"\n")),
"{s}"
);
}
#[cfg(unix)]
#[test]
fn diagnostics_print_original_bytes() {
use std::os::unix::ffi::OsStrExt;
let tmp = tempfile::tempdir().unwrap();
let path = tmp.path().join("config");
std::fs::write(&path, b"bad\xffkey = 1\n").unwrap();
let opts = Options {
config_file: Some(EncodedOs::from_path(&path)),
};
let mut out = Vec::new();
assert_eq!(1, run_inner(&opts, &mut out).unwrap());
assert!(
out.windows(7).any(|w| w == b"bad\xffkey"),
"{:?}",
String::from_utf8_lossy(&out)
);
assert!(!out.contains(&0xef), "no escape encoding in the output");
let _ = path.as_os_str().as_bytes();
}
#[test]
fn validate_missing_file_is_error() {
let opts = Options {
config_file: Some("/nonexistent/ghostty/config".into()),
};
assert!(run_inner(&opts, &mut Vec::new()).is_err());
}
#[cfg(unix)]
#[test]
fn validate_symlink_to_non_utf8_target() {
use std::os::unix::ffi::OsStrExt;
let tmp = tempfile::tempdir().unwrap();
let target = tmp.path().join(std::ffi::OsStr::from_bytes(b"cfg\xff"));
std::fs::write(&target, "font-size = 14\n").unwrap();
let link = tmp.path().join("link");
std::os::unix::fs::symlink(&target, &link).unwrap();
let opts = Options {
config_file: Some(EncodedOs::from_path(&link)),
};
let mut out = Vec::new();
assert_eq!(0, run_inner(&opts, &mut out).unwrap());
assert_eq!(out.len(), 0);
}
}