Macro is a unified workspace for teams: email, chat, docs, tasks, agents, calls, and CRM — @-linked together with shared AI memory.
TypeScript agentaiai-agentsall-in-onecrmcrm-systememaillinearmcpmessagingnotesnotionofficerustslackslack-alternativestartupstartup-toolstypescriptworkspace
fix(xtask_local): isolate sdk webhook ssh from user config (#5851)
teobba3147b00e6
diff --git a/tooling/xtask/crates/xtask_local/src/local/sdk_webhook.rs b/tooling/xtask/crates/xtask_local/src/local/sdk_webhook.rsindex 14b431e74d..a1780c26b7 100644--- a/tooling/xtask/crates/xtask_local/src/local/sdk_webhook.rs+++ b/tooling/xtask/crates/xtask_local/src/local/sdk_webhook.rs@@ -1,6 +1,7 @@//! Instance-local relay for SDK webhook receivers running on the host.-use std::path::PathBuf;+use std::io::Read;+use std::path::{Path, PathBuf};use std::process::{Child, Command, Stdio};use std::time::Duration;@@ -8,9 +9,44 @@ use anyhow::{Context, Result, bail};use super::instance::{Instance, Port};+#[cfg(test)]+mod test;+const RELAY_PORT: u16 = 8787;const USER: &str = "sdk-webhook";+fn ssh_client_flags(private_key: &Path, ssh_port: u16, host_receiver_port: u16) -> Vec<String> {+ vec![+ "-N".into(),+ "-T".into(),+ "-F".into(),+ "/dev/null".into(),+ "-o".into(),+ "BatchMode=yes".into(),+ "-o".into(),+ "IdentitiesOnly=yes".into(),+ "-o".into(),+ "ExitOnForwardFailure=yes".into(),+ "-o".into(),+ "StrictHostKeyChecking=no".into(),+ "-o".into(),+ "UserKnownHostsFile=/dev/null".into(),+ "-o".into(),+ "ConnectTimeout=2".into(),+ "-o".into(),+ "ServerAliveInterval=15".into(),+ "-o".into(),+ "ServerAliveCountMax=3".into(),+ "-i".into(),+ private_key.display().to_string(),+ "-p".into(),+ ssh_port.to_string(),+ "-R".into(),+ format!("0.0.0.0:{RELAY_PORT}:127.0.0.1:{host_receiver_port}"),+ format!("{USER}@127.0.0.1"),+ ]+}+pub fn relay_url() -> &'static str {"http://sdk-webhook-relay:8787/macro-events"}@@ -62,42 +98,27 @@ pub fn start(instance: &Instance) -> Result<Child> {ensure_keys(instance)?;stop(instance);let mut child = Command::new("ssh")- .args([- "-N",- "-T",- "-o",- "ExitOnForwardFailure=yes",- "-o",- "StrictHostKeyChecking=no",- "-o",- "UserKnownHostsFile=/dev/null",- "-o",- "ConnectTimeout=2",- "-o",- "ServerAliveInterval=15",- "-o",- "ServerAliveCountMax=3",- "-i",- ])- .arg(private_key(instance))- .args(["-p"])- .arg(ssh_port(instance).to_string())- .args([- "-R",- &format!(- "0.0.0.0:{RELAY_PORT}:127.0.0.1:{}",- host_receiver_port(instance)- ),- ])- .arg(format!("{USER}@127.0.0.1"))+ .args(ssh_client_flags(+ &private_key(instance),+ ssh_port(instance),+ host_receiver_port(instance),+ )).stdout(Stdio::null())- .stderr(Stdio::null())+ .stderr(Stdio::piped()).spawn().context("starting the SDK webhook SSH reverse tunnel")?;std::thread::sleep(Duration::from_millis(300));if let Some(status) = child.try_wait()? {- bail!("SDK webhook SSH reverse tunnel exited with {status}");+ let mut err = String::new();+ if let Some(mut stderr) = child.stderr.take() {+ let _ = stderr.read_to_string(&mut err);+ }+ let err = err.trim();+ if err.is_empty() {+ bail!("SDK webhook SSH reverse tunnel exited with {status}");+ }+ bail!("SDK webhook SSH reverse tunnel exited with {status}: {err}");}std::fs::write(pid_path(instance), child.id().to_string())?;Ok(child)diff --git a/tooling/xtask/crates/xtask_local/src/local/sdk_webhook/test.rs b/tooling/xtask/crates/xtask_local/src/local/sdk_webhook/test.rsnew file mode 100644index 0000000000..1377758bf7--- /dev/null+++ b/tooling/xtask/crates/xtask_local/src/local/sdk_webhook/test.rs@@ -0,0 +1,63 @@+use super::*;+use std::process::Command;++use crate::local::instance::Instance;++#[test]+fn isolated_ssh_ignores_apple_usekeychain() {+ let config = std::env::temp_dir().join(format!(+ "sdk-webhook-usekeychain-{}-{}.conf",+ std::process::id(),+ std::time::SystemTime::now()+ .duration_since(std::time::UNIX_EPOCH)+ .expect("clock")+ .as_nanos()+ ));+ std::fs::write(&config, "Host *\n UseKeychain yes\n").expect("write UseKeychain config");++ let rejected = Command::new("ssh")+ .args(["-F"])+ .arg(&config)+ .args(["-o", "BatchMode=yes", "-o", "ConnectTimeout=1", "-p", "1"])+ .arg("[email protected]")+ .output()+ .expect("spawn ssh");+ let rejected_err = String::from_utf8_lossy(&rejected.stderr);+ let _ = std::fs::remove_file(&config);++ assert!(+ rejected_err.to_ascii_lowercase().contains("usekeychain"),+ "expected Nix/OpenSSH to reject UseKeychain: {rejected_err}"+ );++ let flags = ssh_client_flags(std::path::Path::new("/tmp/missing-relay-key"), 1, 1);+ assert!(+ flags.windows(2).any(|pair| pair == ["-F", "/dev/null"]),+ "relay ssh must ignore ~/.ssh/config, flags={flags:?}"+ );+ assert!(+ flags.windows(2).any(|pair| pair == ["-o", "BatchMode=yes"]),+ "relay ssh must not prompt, flags={flags:?}"+ );+ assert!(+ flags+ .windows(2)+ .any(|pair| pair == ["-o", "IdentitiesOnly=yes"]),+ "relay ssh must use only the generated key, flags={flags:?}"+ );+}++#[test]+fn start_surfaces_ssh_stderr() {+ let instance = Instance::derive(+ Some(&format!("sdk-wh-{}", std::process::id())),+ Some(31_000),+ )+ .unwrap();+ let err = start(&instance).unwrap_err().to_string();+ let _ = std::fs::remove_dir_all(instance.artifact_dir());+ assert!(+ err.contains("Connection refused") || err.to_ascii_lowercase().contains("ssh:"),+ "expected the real ssh error, got {err}"+ );+}