scriptoriumadmin/fabro
1
0
Fork 0
mirror of https://github.com/fabro-sh/fabro.git synced 2026-10-07 03:00:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

fix(server): preserve worker terminal color env

Browse source 
Keep non-secret terminal color controls in the worker subprocess environment so inherited stdout logs use the same color decision as the foreground server.
This commit is contained in:
Bryan Helmkamp 2026-05-06 15:54:00 -04:00
parent f536bf2404
commit aa56b67096
No known key found for this signature in database
2 changed files with 19 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
lib/crates/fabro-server/src/spawn_env.rs
View file

@ -13,6 +13,10 @@ const WORKER_ENV_ALLOWLIST: &[&str] = &[
EnvVars::FABRO_LOG,
EnvVars::FABRO_HOME,
EnvVars::FABRO_STORAGE_ROOT,
EnvVars::TERM,
EnvVars::NO_COLOR,
EnvVars::CLICOLOR,
EnvVars::CLICOLOR_FORCE,
];
const RENDER_GRAPH_ENV_ALLOWLIST: &[&str] = &[EnvVars::PATH, EnvVars::HOME, EnvVars::TMPDIR];
@ -83,6 +87,10 @@ mod tests {
"FABRO_STORAGE_ROOT".to_string(),
"/tmp/fabro-storage".to_string(),
),
("TERM".to_string(), "xterm-256color".to_string()),
("NO_COLOR".to_string(), "1".to_string()),
("CLICOLOR".to_string(), "0".to_string()),
("CLICOLOR_FORCE".to_string(), "1".to_string()),
("SESSION_SECRET".to_string(), "leak".to_string()),
("FABRO_JWT_PRIVATE_KEY".to_string(), "leak".to_string()),
("FABRO_JWT_PUBLIC_KEY".to_string(), "leak".to_string()),
@ -106,6 +114,13 @@ mod tests {
assert_eq!(actual.get("PATH").map(String::as_str), Some("/bin"));
assert_eq!(actual.get("HOME").map(String::as_str), Some("/tmp/home"));
assert_eq!(actual.get("FABRO_LOG").map(String::as_str), Some("debug"));
assert_eq!(
actual.get("TERM").map(String::as_str),
Some("xterm-256color")
);
assert_eq!(actual.get("NO_COLOR").map(String::as_str), Some("1"));
assert_eq!(actual.get("CLICOLOR").map(String::as_str), Some("0"));
assert_eq!(actual.get("CLICOLOR_FORCE").map(String::as_str), Some("1"));
assert!(!actual.contains_key("FABRO_LOG_DESTINATION"));
assert_eq!(
actual.get("FABRO_DEV_TOKEN").map(String::as_str),

4
lib/crates/fabro-static/src/env_vars.rs
View file

@ -103,6 +103,8 @@ impl EnvVars {
pub const CARGO_HOME: &'static str = "CARGO_HOME";
pub const CARGO_MANIFEST_DIR: &'static str = "CARGO_MANIFEST_DIR";
pub const CI: &'static str = "CI";
pub const CLICOLOR: &'static str = "CLICOLOR";
pub const CLICOLOR_FORCE: &'static str = "CLICOLOR_FORCE";
pub const HOME: &'static str = "HOME";
pub const KUBERNETES_SERVICE_HOST: &'static str = "KUBERNETES_SERVICE_HOST";
pub const LANG: &'static str = "LANG";
@ -230,6 +232,8 @@ mod tests {
EnvVars::CARGO_HOME,
EnvVars::CARGO_MANIFEST_DIR,
EnvVars::CI,
EnvVars::CLICOLOR,
EnvVars::CLICOLOR_FORCE,
EnvVars::HOME,
EnvVars::KUBERNETES_SERVICE_HOST,
EnvVars::LANG,