LightCraft: An open-source non-destructive photo editor written by scratch in pure Rust
LC-003: reject non-UTF-8 CLI arguments cleanly
Dominic Anaeto939055897fff
diff --git a/apps/lightcraft-cli/src/main.rs b/apps/lightcraft-cli/src/main.rsindex c1f9d258c..a650ef748 100644--- a/apps/lightcraft-cli/src/main.rs+++ b/apps/lightcraft-cli/src/main.rs@@ -155,7 +155,16 @@ fn main() -> ExitCode {// Warnings (a GPU render redone on the CPU, an unknown backend name) on stderr; LIGHTCRAFT_LOG// or RUST_LOG picks another level (#168).lightcraft_engine::logging::install("lightcraft-cli");- let args: Vec<String> = std::env::args().skip(1).collect();+ let mut args: Vec<String> = Vec::new();+ for (index, arg) in std::env::args_os().skip(1).enumerate() {+ match arg.into_string() {+ Ok(arg) => args.push(arg),+ Err(_) => {+ eprintln!("lightcraft-cli: argument {} is not valid UTF-8; use a UTF-8 encoded argument", index + 1);+ return ExitCode::FAILURE;+ }+ }+ }let r = match args.first().map(String::as_str) {Some("run") => run(&args[1..]),Some("mcp") => mcp(&args[1..]),diff --git a/apps/lightcraft-cli/tests/it/cli.rs b/apps/lightcraft-cli/tests/it/cli.rsindex 8a11f5c9a..cb898005c 100644--- a/apps/lightcraft-cli/tests/it/cli.rs+++ b/apps/lightcraft-cli/tests/it/cli.rs@@ -162,6 +162,24 @@ fn mcp_over_stdio_sets_exposure_and_renders() {assert!(b > a + 10.0, "{a} → {b}");}+#[cfg(unix)]+#[test]+fn non_utf8_argument_fails_without_a_panic() {+ use std::ffi::OsString;+ use std::os::unix::ffi::OsStringExt;++ let out = tmp("non-utf8-output.png");+ let _ = std::fs::remove_file(&out);+ let output = Command::new(binary()).arg("render").arg(OsString::from_vec(b"bad-\xff.png".to_vec())).arg("-o").arg(&out).output().unwrap();+ let stderr = String::from_utf8_lossy(&output.stderr);+ assert_eq!(output.status.code(), Some(1), "{stderr}");+ assert!(stderr.contains("argument 2"), "{stderr}");+ assert!(stderr.contains("UTF-8"), "{stderr}");+ assert!(!stderr.contains("panicked"), "{stderr}");+ assert!(!out.exists());+ assert!(Command::new(binary()).arg("--version").status().unwrap().success());+}+#[test]fn render_subcommand() {let input = tmp("r-in.png");