Skip to content

armgit / cua

Public Imported from GitHub
0

Scale computer-use 2.0 with open-source drivers, cross-OS sandboxes, and benchmarks for training, evaluation, and data generation.

fix(cua-spacesd): keep the doctor's token out of the probes it spawns (#6488)

injaneityeffe7a5ab279
diff --git a/libs/cua-spacesd/crates/cua-spacesd-doctor/src/checks/compat.rs b/libs/cua-spacesd/crates/cua-spacesd-doctor/src/checks/compat.rs
index 70c6c51086..1807343107 100644
--- a/libs/cua-spacesd/crates/cua-spacesd-doctor/src/checks/compat.rs
+++ b/libs/cua-spacesd/crates/cua-spacesd-doctor/src/checks/compat.rs
@@ -145,7 +145,7 @@ pub async fn run(ctx: &Ctx, rec: &mut Recorder<'_>) {
args.push(format!("{set}={port}"));
args.extend([exe.clone(), "--print-config".to_owned()]);
let args: Vec<&str> = args.iter().map(String::as_str).collect();
- let got = sys::run_local("env", &args, &[], Duration::from_secs(10))
+ let got = sys::run_local_keeping_token("env", &args, Duration::from_secs(10))
.await
.ok()
.and_then(|o| port_of(&o.stdout));
diff --git a/libs/cua-spacesd/crates/cua-spacesd-doctor/src/checks/meta.rs b/libs/cua-spacesd/crates/cua-spacesd-doctor/src/checks/meta.rs
index 5fe802201f..1a08cbeb0a 100644
--- a/libs/cua-spacesd/crates/cua-spacesd-doctor/src/checks/meta.rs
+++ b/libs/cua-spacesd/crates/cua-spacesd-doctor/src/checks/meta.rs
@@ -161,7 +161,8 @@ pub async fn run(ctx: &Ctx, rec: &mut Recorder<'_>) {
.skip_reason("not_applicable");
};
let exe_s = exe.to_string_lossy().into_owned();
- match crate::sys::run_local(&exe_s, &["--print-config"], &[], Duration::from_secs(15)).await
+ match crate::sys::run_local_keeping_token(&exe_s, &["--print-config"], Duration::from_secs(15))
+ .await
{
Ok(out) if out.ok() => match serde_json::from_str::<serde_json::Value>(&out.stdout) {
Ok(json) => {
diff --git a/libs/cua-spacesd/crates/cua-spacesd-doctor/src/sys.rs b/libs/cua-spacesd/crates/cua-spacesd-doctor/src/sys.rs
index 074a4aff82..5c0b138287 100644
--- a/libs/cua-spacesd/crates/cua-spacesd-doctor/src/sys.rs
+++ b/libs/cua-spacesd/crates/cua-spacesd-doctor/src/sys.rs
@@ -372,15 +372,42 @@ impl Local {
}
/// Runs a local command with a timeout and capped output. `env` adds
-/// variables. Errors when the program cannot start.
+/// variables. The token variables are removed first: a probe's detached
+/// children can outlive it and would hold the token where `auth.token_leak`
+/// finds it. Errors when the program cannot start.
pub async fn run_local(
program: &str,
args: &[&str],
env: &[(&str, &str)],
timeout: Duration,
+) -> std::io::Result<Local> {
+ run(program, args, env, true, timeout).await
+}
+
+/// [`run_local`] keeping the token variables, for a cua-spacesd that must
+/// resolve its configuration the way the running service did.
+pub async fn run_local_keeping_token(
+ program: &str,
+ args: &[&str],
+ timeout: Duration,
+) -> std::io::Result<Local> {
+ run(program, args, &[], false, timeout).await
+}
+
+async fn run(
+ program: &str,
+ args: &[&str],
+ env: &[(&str, &str)],
+ scrub: bool,
+ timeout: Duration,
) -> std::io::Result<Local> {
use tokio::io::AsyncReadExt as _;
let mut command = tokio::process::Command::new(program);
+ if scrub {
+ for var in cua_spacesd_server::process::spawn::SCRUBBED_ENV {
+ command.env_remove(var);
+ }
+ }
command
.args(args)
.envs(env.iter().copied())
@@ -520,6 +547,35 @@ mod tests {
);
}
+ // The doctor's own token must not reach a probe (or the detached
+ // children it leaves), except a cua-spacesd resolving its config.
+ #[cfg(unix)]
+ #[tokio::test]
+ async fn probes_do_not_inherit_the_token() {
+ // No other test in this crate reads these variables.
+ let vars = [
+ "CUA_ENV_TOKEN",
+ "CUA_SPACESD_TOKEN",
+ "CUA_GUESTD_TOKEN",
+ "CUA_RELAY_TOKEN",
+ ];
+ let script: String = vars
+ .iter()
+ .map(|v| format!("echo ${{{v}-unset}};"))
+ .collect();
+ let echo = ["-c", script.as_str()];
+ for var in vars {
+ std::env::set_var(var, "probe-token");
+ }
+ let probe = run_local("sh", &echo, &[], Duration::from_secs(5)).await;
+ let kept = run_local_keeping_token("sh", &echo, Duration::from_secs(5)).await;
+ for var in vars {
+ std::env::remove_var(var);
+ }
+ assert_eq!(probe.unwrap().stdout, "unset\n".repeat(vars.len()));
+ assert_eq!(kept.unwrap().stdout, "probe-token\n".repeat(vars.len()));
+ }
+
#[cfg(unix)]
#[test]
fn modes_and_names() {
diff --git a/libs/cua-spacesd/crates/cua-spacesd-server/src/process/spawn.rs b/libs/cua-spacesd/crates/cua-spacesd-server/src/process/spawn.rs
index f33d9e7c74..1caac1e2a1 100644
--- a/libs/cua-spacesd/crates/cua-spacesd-server/src/process/spawn.rs
+++ b/libs/cua-spacesd/crates/cua-spacesd-server/src/process/spawn.rs
@@ -119,7 +119,12 @@ pub fn current_user_name() -> String {
}
/// Environment variables never inherited by child processes.
-pub const SCRUBBED_ENV: &[&str] = &["CUA_ENV_TOKEN", "CUA_SPACESD_TOKEN", "CUA_RELAY_TOKEN"];
+pub const SCRUBBED_ENV: &[&str] = &[
+ "CUA_ENV_TOKEN",
+ "CUA_SPACESD_TOKEN",
+ "CUA_GUESTD_TOKEN",
+ "CUA_RELAY_TOKEN",
+];
/// Everything needed to spawn.
#[derive(Debug, Clone)]