From ce8cc5b8ddd5445a3a415301edb0d9314a319d05 Mon Sep 17 00:00:00 2001 From: Kevin Yue Date: Sun, 19 Jul 2026 09:01:31 +0800 Subject: [PATCH] fix: quote bundled macOS VPN script path --- apps/gpservice/src/vpn_task.rs | 9 ++++-- crates/openconnect/src/vpn.rs | 51 ++++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 2 deletions(-) diff --git a/apps/gpservice/src/vpn_task.rs b/apps/gpservice/src/vpn_task.rs index ca14adc..e77a5c4 100644 --- a/apps/gpservice/src/vpn_task.rs +++ b/apps/gpservice/src/vpn_task.rs @@ -53,8 +53,13 @@ impl VpnTaskContext { } }; let allow_extend_session = args.allow_extend_session(); - let vpn = match Vpn::builder(req.gateway().server(), args.cookie()) - .script(args.vpnc_script()) + let mut vpn_builder = Vpn::builder(req.gateway().server(), args.cookie()); + vpn_builder = if self.brokered_macos { + vpn_builder.script_path(args.vpnc_script()) + } else { + vpn_builder.script(args.vpnc_script()) + }; + let vpn = match vpn_builder .user_agent(args.user_agent()) .os(args.openconnect_os()) .os_version(args.os_version()) diff --git a/crates/openconnect/src/vpn.rs b/crates/openconnect/src/vpn.rs index eeca6c7..83607ff 100644 --- a/crates/openconnect/src/vpn.rs +++ b/crates/openconnect/src/vpn.rs @@ -184,6 +184,7 @@ pub struct VpnBuilder { server: String, cookie: String, script: Option, + script_is_path: bool, interface: Option, script_tun: bool, @@ -217,6 +218,7 @@ impl VpnBuilder { server: server.to_string(), cookie: cookie.to_string(), script: None, + script_is_path: false, interface: None, script_tun: false, @@ -246,6 +248,13 @@ impl VpnBuilder { pub fn script>>(mut self, script: T) -> Self { self.script = script.into(); + self.script_is_path = false; + self + } + + pub fn script_path>>(mut self, script: T) -> Self { + self.script = script.into(); + self.script_is_path = true; self } @@ -352,6 +361,9 @@ impl VpnBuilder { fn determine_script(&self) -> Result<&str, VpnError> { match &self.script { Some(script) => { + if self.script_is_path && !std::path::Path::new(script).exists() { + return Err(VpnError::new(format!("VPN script does not exist: {script}"))); + } check_executable(script).map_err(|e| VpnError::new(e.to_string()))?; Ok(script) } @@ -378,6 +390,11 @@ impl VpnBuilder { pub fn build(self) -> Result { let script = self.determine_script()?.to_owned(); + let script = if self.script_is_path { + shell_quote_path(&script) + } else { + script + }; let csd_wrapper = self.determine_csd_wrapper()?.map(|s| s.to_owned()); let user_agent = self.user_agent.unwrap_or_default(); @@ -422,11 +439,45 @@ impl VpnBuilder { } } +fn shell_quote_path(path: &str) -> String { + format!("'{}'", path.replace('\'', "'\\''")) +} + #[cfg(test)] mod tests { use super::*; use std::ffi::CString; + #[test] + fn quotes_vpnc_script_path_for_the_shell() { + assert_eq!( + shell_quote_path("/Applications/GP Connect.app/Contents/Helpers/vpnc-script"), + "'/Applications/GP Connect.app/Contents/Helpers/vpnc-script'" + ); + assert_eq!(shell_quote_path("/tmp/user's script"), "'/tmp/user'\\''s script'"); + } + + #[test] + fn preserves_vpnc_script_commands() { + let command = "\"/tmp/script with spaces\" --option"; + let vpn = Vpn::builder("vpn.example.com", "cookie") + .script(command.to_string()) + .build() + .unwrap(); + + assert_eq!(vpn.script.to_str().unwrap(), command); + } + + #[test] + fn quotes_explicit_vpnc_script_paths() { + let vpn = Vpn::builder("vpn.example.com", "cookie") + .script_path("/bin/sh".to_string()) + .build() + .unwrap(); + + assert_eq!(vpn.script.to_str().unwrap(), "'/bin/sh'"); + } + #[test] fn maps_session_info_from_callback_payload() { let message = CString::new("Session expires soon").unwrap();