From e1eb9e20f1de89262d2deee01d77b5141f95db29 Mon Sep 17 00:00:00 2001 From: Kevin Yue Date: Tue, 8 Jul 2025 23:26:04 +0800 Subject: [PATCH] feat: update VPN connection to parse URL and ensure HTTPS prefix --- apps/gpauth/src/cli.rs | 2 +- crates/openconnect/src/ffi/vpn.c | 2 +- crates/openconnect/src/vpn.rs | 14 ++++++++++---- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/apps/gpauth/src/cli.rs b/apps/gpauth/src/cli.rs index 014875d..7f51f2a 100644 --- a/apps/gpauth/src/cli.rs +++ b/apps/gpauth/src/cli.rs @@ -122,7 +122,7 @@ impl Cli { let browser = self .browser .as_deref() - .or_else(|| self.default_browser.then(|| "default")); + .or_else(|| self.default_browser.then_some("default")); #[cfg(not(feature = "webview-auth"))] let browser = self.browser.as_deref().or(Some("default")); diff --git a/crates/openconnect/src/ffi/vpn.c b/crates/openconnect/src/ffi/vpn.c index 626cf25..5b34158 100644 --- a/crates/openconnect/src/ffi/vpn.c +++ b/crates/openconnect/src/ffi/vpn.c @@ -77,7 +77,7 @@ int vpn_connect(const vpn_options *options, vpn_connected_callback callback) openconnect_set_loglevel(vpninfo, PRG_TRACE); openconnect_init_ssl(); openconnect_set_protocol(vpninfo, "gp"); - openconnect_set_hostname(vpninfo, options->server); + openconnect_parse_url(vpninfo, options->server); openconnect_set_cookie(vpninfo, options->cookie); if (options->os) { diff --git a/crates/openconnect/src/vpn.rs b/crates/openconnect/src/vpn.rs index bd4c11b..a2714bb 100644 --- a/crates/openconnect/src/vpn.rs +++ b/crates/openconnect/src/vpn.rs @@ -36,7 +36,13 @@ pub struct Vpn { impl Vpn { pub fn builder(server: &str, cookie: &str) -> VpnBuilder { - VpnBuilder::new(server, cookie) + // prepend "https://" to the server if it doesn't already start with it + let server = if server.starts_with("https://") { + server.to_string() + } else { + format!("https://{}", server) + }; + VpnBuilder::new(server, cookie.to_string()) } pub fn connect(&self, on_connected: impl FnOnce() + 'static + Send + Sync) -> i32 { @@ -134,10 +140,10 @@ pub struct VpnBuilder { } impl VpnBuilder { - fn new(server: &str, cookie: &str) -> Self { + fn new(server: String, cookie: String) -> Self { Self { - server: server.to_string(), - cookie: cookie.to_string(), + server, + cookie, script: None, interface: None,