Compare commits

...
1 Commits
Author SHA1 Message Date
Kevin Yue a708ce0115 chore: release 2.6.2 2026-06-22 20:33:14 +08:00
6 changed files with 70 additions and 35 deletions

No files matched your search

Generated
+8 -8
View File
@@ -214,7 +214,7 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
[[package]] [[package]]
name = "auth" name = "auth"
version = "2.6.1" version = "2.6.2"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"block2", "block2",
@@ -705,7 +705,7 @@ dependencies = [
[[package]] [[package]]
name = "common" name = "common"
version = "2.6.1" version = "2.6.2"
[[package]] [[package]]
name = "compile-time" name = "compile-time"
@@ -1732,7 +1732,7 @@ dependencies = [
[[package]] [[package]]
name = "gpapi" name = "gpapi"
version = "2.6.1" version = "2.6.2"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"base64 0.22.1", "base64 0.22.1",
@@ -1776,7 +1776,7 @@ dependencies = [
[[package]] [[package]]
name = "gpauth" name = "gpauth"
version = "2.6.1" version = "2.6.2"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"auth", "auth",
@@ -1796,7 +1796,7 @@ dependencies = [
[[package]] [[package]]
name = "gpclient" name = "gpclient"
version = "2.6.1" version = "2.6.2"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"askama", "askama",
@@ -1825,7 +1825,7 @@ dependencies = [
[[package]] [[package]]
name = "gpgui-helper" name = "gpgui-helper"
version = "2.6.1" version = "2.6.2"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"clap", "clap",
@@ -1843,7 +1843,7 @@ dependencies = [
[[package]] [[package]]
name = "gpservice" name = "gpservice"
version = "2.6.1" version = "2.6.2"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"axum", "axum",
@@ -3191,7 +3191,7 @@ dependencies = [
[[package]] [[package]]
name = "openconnect" name = "openconnect"
version = "2.6.1" version = "2.6.2"
dependencies = [ dependencies = [
"autotools", "autotools",
"cc", "cc",
+1 -1
View File
@@ -11,7 +11,7 @@ members = [
[workspace.package] [workspace.package]
rust-version = "1.89" rust-version = "1.89"
version = "2.6.1" version = "2.6.2"
authors = ["Kevin Yue <[email protected]>"] authors = ["Kevin Yue <[email protected]>"]
homepage = "https://github.com/yuezk/GlobalProtect-openconnect" homepage = "https://github.com/yuezk/GlobalProtect-openconnect"
edition = "2024" edition = "2024"
+12 -12
View File
@@ -48,7 +48,7 @@ impl ConnectHandler<'_> {
&self, &self,
prelogin: &Prelogin, prelogin: &Prelogin,
server: &str, server: &str,
gateway_external_browser_allowed: bool, gateway_browser_auth_allowed: bool,
) -> anyhow::Result<Credential> { ) -> anyhow::Result<Credential> {
if should_read_stdin_credential(self.args.cookie_on_stdin, self.args.as_gateway, prelogin.is_gateway()) { if should_read_stdin_credential(self.args.cookie_on_stdin, self.args.as_gateway, prelogin.is_gateway()) {
return self.read_cookie_from_stdin(); return self.read_cookie_from_stdin();
@@ -58,10 +58,10 @@ impl ConnectHandler<'_> {
match prelogin { match prelogin {
Prelogin::Saml(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(), prelogin.support_default_browser(),
is_gateway, is_gateway,
gateway_external_browser_allowed, gateway_browser_auth_allowed,
); );
let browser = if external_browser_supported { let browser = if external_browser_supported {
self.args.browser.as_deref() 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) cookie_on_stdin && (!prelogin_is_gateway || as_gateway)
} }
fn default_browser_auth_allowed( fn can_use_external_browser_auth(
saml_support_default_browser: bool, saml_support_default_browser: bool,
is_gateway: bool, is_gateway: bool,
gateway_external_browser_allowed: bool, gateway_browser_auth_allowed: bool,
) -> 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>) { fn log_stdin_host_id(host_id: Option<&str>) {
@@ -254,18 +254,18 @@ mod tests {
#[test] #[test]
fn portal_saml_can_use_default_browser_when_supported() { 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] #[test]
fn gateway_saml_requires_portal_default_browser_policy() { fn gateway_saml_requires_gateway_browser_auth_allowance() {
assert!(!default_browser_auth_allowed(true, true, false)); assert!(!can_use_external_browser_auth(true, true, false));
assert!(default_browser_auth_allowed(true, true, true)); assert!(can_use_external_browser_auth(true, true, true));
} }
#[test] #[test]
fn default_browser_auth_requires_saml_support() { fn default_browser_auth_requires_saml_support() {
assert!(!default_browser_auth_allowed(false, false, true)); assert!(!can_use_external_browser_auth(false, false, true));
assert!(!default_browser_auth_allowed(false, true, true)); assert!(!can_use_external_browser_auth(false, true, true));
} }
} }
+6 -9
View File
@@ -139,10 +139,10 @@ impl ConnectHandler<'_> {
let mut gp_params = self.build_gp_params(); let mut gp_params = self.build_gp_params();
gp_params.set_is_gateway(true); 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 prelogin = prelogin(gateway, &gp_params, self.direct_gateway_prelogin_options()).await?;
let cred = self let cred = self
.obtain_credential(&prelogin, gateway, gateway_external_browser_allowed) .obtain_credential(&prelogin, gateway, gateway_browser_auth_allowed)
.await?; .await?;
let login_session = self let login_session = self
@@ -177,19 +177,16 @@ impl ConnectHandler<'_> {
gateway: &str, gateway: &str,
portal_cred: &AuthCookieCredential, portal_cred: &AuthCookieCredential,
allow_extend_session: bool, allow_extend_session: bool,
portal_default_browser_enabled: bool, portal_config_default_browser: bool,
gateway_context: GatewayLoginContext, gateway_context: GatewayLoginContext,
) -> Result<(), GatewayConnectError> { ) -> Result<(), GatewayConnectError> {
info!("Connecting to gateway with portal-cookie first, gateway prelogin fallback..."); info!("Connecting to gateway with portal-cookie first, gateway prelogin fallback...");
let mut gp_params = self.build_gp_params(); let mut gp_params = self.build_gp_params();
gp_params.set_is_gateway(true); gp_params.set_is_gateway(true);
let gateway_browser_auth_allowed = self.gateway_browser_auth_allowed(portal_config_default_browser);
let gateway_prelogin = prelogin( let gateway_prelogin = prelogin(gateway, &gp_params, self.prelogin_options(gateway_browser_auth_allowed))
gateway,
&gp_params,
self.prelogin_options(portal_default_browser_enabled),
)
.await .await
.map_err(GatewayConnectError::before_tunnel)?; .map_err(GatewayConnectError::before_tunnel)?;
@@ -222,7 +219,7 @@ impl ConnectHandler<'_> {
} }
let gateway_cred = match self let gateway_cred = match self
.obtain_credential(&gateway_prelogin, gateway, portal_default_browser_enabled) .obtain_credential(&gateway_prelogin, gateway, gateway_browser_auth_allowed)
.await .await
{ {
Ok(cred) => cred, Ok(cred) => cred,
+34 -5
View File
@@ -65,16 +65,20 @@ impl<'a> ConnectHandler<'a> {
builder.build() 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() PreloginOptions::default()
.external_browser_requested(self.external_browser_requested()) .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 { pub(super) fn direct_gateway_prelogin_options(&self) -> PreloginOptions {
self.prelogin_options(true) 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 { fn external_browser_requested(&self) -> bool {
#[cfg(feature = "webview-auth")] #[cfg(feature = "webview-auth")]
{ {
@@ -173,7 +177,8 @@ impl<'a> ConnectHandler<'a> {
None => portal_config.auth_cookie().clone(), None => portal_config.auth_cookie().clone(),
}; };
let allow_extend_session = portal_config.allow_extend_session().unwrap_or(false); 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 { if self.args.auto_gateway {
let gateways = portal_config.gateways(); let gateways = portal_config.gateways();
@@ -198,7 +203,7 @@ impl<'a> ConnectHandler<'a> {
gateway.server(), gateway.server(),
&auth_cookie, &auth_cookie,
allow_extend_session, allow_extend_session,
portal_default_browser_enabled, portal_config_default_browser,
gateway_context, gateway_context,
) )
.await .await
@@ -263,7 +268,7 @@ impl<'a> ConnectHandler<'a> {
gateway, gateway,
&auth_cookie, &auth_cookie,
allow_extend_session, allow_extend_session,
portal_default_browser_enabled, portal_config_default_browser,
gateway_context, gateway_context,
) )
.await .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));
}
}
+9
View File
@@ -1,5 +1,14 @@
# Changelog # 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 ## 2.6.1
### Changed ### Changed