From a708ce0115d33374e0e7d2a3613aafdfc0cb9e30 Mon Sep 17 00:00:00 2001 From: Kevin Yue Date: Mon, 22 Jun 2026 20:33:14 +0800 Subject: [PATCH] chore: release 2.6.2 --- Cargo.lock | 16 +++++----- Cargo.toml | 2 +- apps/gpclient/src/connect/credential.rs | 24 +++++++-------- apps/gpclient/src/connect/gateway.rs | 19 +++++------- apps/gpclient/src/connect/mod.rs | 39 +++++++++++++++++++++---- changelog.md | 9 ++++++ 6 files changed, 72 insertions(+), 37 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index af662ab..c7e0d22 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -214,7 +214,7 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" [[package]] name = "auth" -version = "2.6.1" +version = "2.6.2" dependencies = [ "anyhow", "block2", @@ -705,7 +705,7 @@ dependencies = [ [[package]] name = "common" -version = "2.6.1" +version = "2.6.2" [[package]] name = "compile-time" @@ -1732,7 +1732,7 @@ dependencies = [ [[package]] name = "gpapi" -version = "2.6.1" +version = "2.6.2" dependencies = [ "anyhow", "base64 0.22.1", @@ -1776,7 +1776,7 @@ dependencies = [ [[package]] name = "gpauth" -version = "2.6.1" +version = "2.6.2" dependencies = [ "anyhow", "auth", @@ -1796,7 +1796,7 @@ dependencies = [ [[package]] name = "gpclient" -version = "2.6.1" +version = "2.6.2" dependencies = [ "anyhow", "askama", @@ -1825,7 +1825,7 @@ dependencies = [ [[package]] name = "gpgui-helper" -version = "2.6.1" +version = "2.6.2" dependencies = [ "anyhow", "clap", @@ -1843,7 +1843,7 @@ dependencies = [ [[package]] name = "gpservice" -version = "2.6.1" +version = "2.6.2" dependencies = [ "anyhow", "axum", @@ -3191,7 +3191,7 @@ dependencies = [ [[package]] name = "openconnect" -version = "2.6.1" +version = "2.6.2" dependencies = [ "autotools", "cc", diff --git a/Cargo.toml b/Cargo.toml index 9525fb2..a429214 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,7 +11,7 @@ members = [ [workspace.package] rust-version = "1.89" -version = "2.6.1" +version = "2.6.2" authors = ["Kevin Yue "] homepage = "https://github.com/yuezk/GlobalProtect-openconnect" edition = "2024" diff --git a/apps/gpclient/src/connect/credential.rs b/apps/gpclient/src/connect/credential.rs index f6a0b6b..52c8279 100644 --- a/apps/gpclient/src/connect/credential.rs +++ b/apps/gpclient/src/connect/credential.rs @@ -48,7 +48,7 @@ impl ConnectHandler<'_> { &self, prelogin: &Prelogin, server: &str, - gateway_external_browser_allowed: bool, + gateway_browser_auth_allowed: bool, ) -> anyhow::Result { if should_read_stdin_credential(self.args.cookie_on_stdin, self.args.as_gateway, prelogin.is_gateway()) { return self.read_cookie_from_stdin(); @@ -58,10 +58,10 @@ impl ConnectHandler<'_> { match prelogin { Prelogin::Saml(prelogin) => { - let external_browser_supported = default_browser_auth_allowed( + let external_browser_supported = can_use_external_browser_auth( prelogin.support_default_browser(), is_gateway, - gateway_external_browser_allowed, + gateway_browser_auth_allowed, ); let browser = if external_browser_supported { self.args.browser.as_deref() @@ -188,12 +188,12 @@ fn should_read_stdin_credential(cookie_on_stdin: bool, as_gateway: bool, prelogi cookie_on_stdin && (!prelogin_is_gateway || as_gateway) } -fn default_browser_auth_allowed( +fn can_use_external_browser_auth( saml_support_default_browser: bool, is_gateway: bool, - gateway_external_browser_allowed: bool, + gateway_browser_auth_allowed: bool, ) -> bool { - saml_support_default_browser && (!is_gateway || gateway_external_browser_allowed) + saml_support_default_browser && (!is_gateway || gateway_browser_auth_allowed) } fn log_stdin_host_id(host_id: Option<&str>) { @@ -254,18 +254,18 @@ mod tests { #[test] fn portal_saml_can_use_default_browser_when_supported() { - assert!(default_browser_auth_allowed(true, false, false)); + assert!(can_use_external_browser_auth(true, false, false)); } #[test] - fn gateway_saml_requires_portal_default_browser_policy() { - assert!(!default_browser_auth_allowed(true, true, false)); - assert!(default_browser_auth_allowed(true, true, true)); + fn gateway_saml_requires_gateway_browser_auth_allowance() { + assert!(!can_use_external_browser_auth(true, true, false)); + assert!(can_use_external_browser_auth(true, true, true)); } #[test] fn default_browser_auth_requires_saml_support() { - assert!(!default_browser_auth_allowed(false, false, true)); - assert!(!default_browser_auth_allowed(false, true, true)); + assert!(!can_use_external_browser_auth(false, false, true)); + assert!(!can_use_external_browser_auth(false, true, true)); } } diff --git a/apps/gpclient/src/connect/gateway.rs b/apps/gpclient/src/connect/gateway.rs index 384a8f8..184cd67 100644 --- a/apps/gpclient/src/connect/gateway.rs +++ b/apps/gpclient/src/connect/gateway.rs @@ -139,10 +139,10 @@ impl ConnectHandler<'_> { let mut gp_params = self.build_gp_params(); gp_params.set_is_gateway(true); - let gateway_external_browser_allowed = true; + let gateway_browser_auth_allowed = true; let prelogin = prelogin(gateway, &gp_params, self.direct_gateway_prelogin_options()).await?; let cred = self - .obtain_credential(&prelogin, gateway, gateway_external_browser_allowed) + .obtain_credential(&prelogin, gateway, gateway_browser_auth_allowed) .await?; let login_session = self @@ -177,21 +177,18 @@ impl ConnectHandler<'_> { gateway: &str, portal_cred: &AuthCookieCredential, allow_extend_session: bool, - portal_default_browser_enabled: bool, + portal_config_default_browser: bool, gateway_context: GatewayLoginContext, ) -> Result<(), GatewayConnectError> { info!("Connecting to gateway with portal-cookie first, gateway prelogin fallback..."); let mut gp_params = self.build_gp_params(); gp_params.set_is_gateway(true); + let gateway_browser_auth_allowed = self.gateway_browser_auth_allowed(portal_config_default_browser); - let gateway_prelogin = prelogin( - gateway, - &gp_params, - self.prelogin_options(portal_default_browser_enabled), - ) - .await - .map_err(GatewayConnectError::before_tunnel)?; + let gateway_prelogin = prelogin(gateway, &gp_params, self.prelogin_options(gateway_browser_auth_allowed)) + .await + .map_err(GatewayConnectError::before_tunnel)?; if portal_cred.can_authenticate_gateway() { let portal_cred_for_login: Credential = portal_cred.into(); @@ -222,7 +219,7 @@ impl ConnectHandler<'_> { } let gateway_cred = match self - .obtain_credential(&gateway_prelogin, gateway, portal_default_browser_enabled) + .obtain_credential(&gateway_prelogin, gateway, gateway_browser_auth_allowed) .await { Ok(cred) => cred, diff --git a/apps/gpclient/src/connect/mod.rs b/apps/gpclient/src/connect/mod.rs index 68c41a3..39fc07d 100644 --- a/apps/gpclient/src/connect/mod.rs +++ b/apps/gpclient/src/connect/mod.rs @@ -65,16 +65,20 @@ impl<'a> ConnectHandler<'a> { builder.build() } - pub(super) fn prelogin_options(&self, gateway_external_browser_allowed: bool) -> PreloginOptions { + pub(super) fn prelogin_options(&self, gateway_browser_auth_allowed: bool) -> PreloginOptions { PreloginOptions::default() .external_browser_requested(self.external_browser_requested()) - .gateway_external_browser_allowed(gateway_external_browser_allowed) + .gateway_external_browser_allowed(gateway_browser_auth_allowed) } pub(super) fn direct_gateway_prelogin_options(&self) -> PreloginOptions { self.prelogin_options(true) } + pub(super) fn gateway_browser_auth_allowed(&self, portal_config_default_browser: bool) -> bool { + gateway_browser_auth_allowed(portal_config_default_browser, self.external_browser_requested()) + } + fn external_browser_requested(&self) -> bool { #[cfg(feature = "webview-auth")] { @@ -173,7 +177,8 @@ impl<'a> ConnectHandler<'a> { None => portal_config.auth_cookie().clone(), }; let allow_extend_session = portal_config.allow_extend_session().unwrap_or(false); - let portal_default_browser_enabled = portal_config.default_browser().unwrap_or(false); + let portal_config_default_browser = portal_config.default_browser().unwrap_or(false); + info!("Portal config default-browser: {}", portal_config_default_browser); if self.args.auto_gateway { let gateways = portal_config.gateways(); @@ -198,7 +203,7 @@ impl<'a> ConnectHandler<'a> { gateway.server(), &auth_cookie, allow_extend_session, - portal_default_browser_enabled, + portal_config_default_browser, gateway_context, ) .await @@ -263,7 +268,7 @@ impl<'a> ConnectHandler<'a> { gateway, &auth_cookie, allow_extend_session, - portal_default_browser_enabled, + portal_config_default_browser, gateway_context, ) .await @@ -283,3 +288,27 @@ impl<'a> ConnectHandler<'a> { ); } } + +fn gateway_browser_auth_allowed(portal_config_default_browser: bool, external_browser_requested: bool) -> bool { + portal_config_default_browser || external_browser_requested +} + +#[cfg(test)] +mod tests { + use super::gateway_browser_auth_allowed; + + #[test] + fn gateway_browser_auth_is_allowed_by_portal_config() { + assert!(gateway_browser_auth_allowed(true, false)); + } + + #[test] + fn gateway_browser_auth_is_allowed_by_explicit_browser_request() { + assert!(gateway_browser_auth_allowed(false, true)); + } + + #[test] + fn gateway_browser_auth_is_disabled_without_portal_config_or_user_request() { + assert!(!gateway_browser_auth_allowed(false, false)); + } +} diff --git a/changelog.md b/changelog.md index 0456737..9a88a2b 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,14 @@ # Changelog +## 2.6.2 + +### Fixed + +- Fixed gateway fallback browser authentication when external browser authentication is explicitly requested. +- Added logging for portal config default-browser behavior. +- Added GUI managed configuration support with `gpgui.conf`, including reset to managed config. +- Improved GUI config directory migration and managed license auto activation. + ## 2.6.1 ### Changed