From 40739739b5ddc82711252f4c4f88607d3caa47ca Mon Sep 17 00:00:00 2001 From: Kevin Yue Date: Mon, 22 Jun 2026 08:24:48 +0800 Subject: [PATCH] fix: correct direct gateway browser auth mode --- .github/workflows/build.yaml | 1 - .github/workflows/release.yaml | 1 - apps/gpauth/src/cli.rs | 2 +- apps/gpclient/src/connect/credential.rs | 8 ++++---- apps/gpclient/src/connect/gateway.rs | 4 ++-- apps/gpclient/src/connect/mod.rs | 4 ++-- crates/auth/src/lib.rs | 7 ++++--- crates/auth/src/webview/webview_auth.rs | 4 ++-- crates/gpapi/src/portal/prelogin.rs | 12 ++++++------ 9 files changed, 21 insertions(+), 22 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 1c1fa21..8104e56 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -135,7 +135,6 @@ jobs: - tarball strategy: fail-fast: false - max-parallel: 2 matrix: os: - runner: ubuntu-latest diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index ea44e09..5649a40 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -101,7 +101,6 @@ jobs: needs: - setup-matrix strategy: - max-parallel: 2 matrix: ${{ fromJson(needs.setup-matrix.outputs.matrix) }} runs-on: ${{ matrix.os }} steps: diff --git a/apps/gpauth/src/cli.rs b/apps/gpauth/src/cli.rs index fb3bc54..a69ef8b 100644 --- a/apps/gpauth/src/cli.rs +++ b/apps/gpauth/src/cli.rs @@ -128,7 +128,7 @@ impl Cli { let auth_request = match self.saml_request.as_deref() { Some(auth_request) => auth_request.to_string(), - None => auth_prelogin(&server, &gp_params, self.external_browser_requested()).await?, + None => auth_prelogin(&server, &gp_params, self.external_browser_requested(), self.gateway).await?, }; #[cfg(feature = "webview-auth")] diff --git a/apps/gpclient/src/connect/credential.rs b/apps/gpclient/src/connect/credential.rs index fb0fede..27efc86 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, - portal_default_browser_enabled: bool, + gateway_external_browser_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(); @@ -61,7 +61,7 @@ impl ConnectHandler<'_> { let external_browser_supported = default_browser_auth_allowed( prelogin.support_default_browser(), is_gateway, - portal_default_browser_enabled, + gateway_external_browser_allowed, ); let browser = if external_browser_supported { self.args.browser.as_deref() @@ -187,9 +187,9 @@ fn should_read_stdin_credential(cookie_on_stdin: bool, as_gateway: bool, prelogi fn default_browser_auth_allowed( saml_support_default_browser: bool, is_gateway: bool, - portal_default_browser_enabled: bool, + gateway_external_browser_allowed: bool, ) -> bool { - saml_support_default_browser && (!is_gateway || portal_default_browser_enabled) + saml_support_default_browser && (!is_gateway || gateway_external_browser_allowed) } fn log_stdin_host_id(host_id: Option<&str>) { diff --git a/apps/gpclient/src/connect/gateway.rs b/apps/gpclient/src/connect/gateway.rs index 7526a00..cd7ef5e 100644 --- a/apps/gpclient/src/connect/gateway.rs +++ b/apps/gpclient/src/connect/gateway.rs @@ -139,8 +139,8 @@ impl ConnectHandler<'_> { let mut gp_params = self.build_gp_params(); gp_params.set_is_gateway(true); - let prelogin = prelogin(gateway, &gp_params, self.prelogin_options(false)).await?; - let cred = self.obtain_credential(&prelogin, gateway, false).await?; + let prelogin = prelogin(gateway, &gp_params, self.prelogin_options(true)).await?; + let cred = self.obtain_credential(&prelogin, gateway, true).await?; let login_session = self .login_gateway(gateway, &cred, &gp_params, gateway_context.as_ref()) diff --git a/apps/gpclient/src/connect/mod.rs b/apps/gpclient/src/connect/mod.rs index b95571d..d933b7c 100644 --- a/apps/gpclient/src/connect/mod.rs +++ b/apps/gpclient/src/connect/mod.rs @@ -65,10 +65,10 @@ impl<'a> ConnectHandler<'a> { builder.build() } - pub(super) fn prelogin_options(&self, portal_default_browser_enabled: bool) -> PreloginOptions { + pub(super) fn prelogin_options(&self, gateway_external_browser_allowed: bool) -> PreloginOptions { PreloginOptions::default() .external_browser_requested(self.external_browser_requested()) - .portal_default_browser_enabled(portal_default_browser_enabled) + .gateway_external_browser_allowed(gateway_external_browser_allowed) } fn external_browser_requested(&self) -> bool { diff --git a/crates/auth/src/lib.rs b/crates/auth/src/lib.rs index 5081def..d1cd1e1 100644 --- a/crates/auth/src/lib.rs +++ b/crates/auth/src/lib.rs @@ -19,10 +19,11 @@ pub async fn auth_prelogin( server: &str, gp_params: &GpParams, external_browser_requested: bool, + gateway_external_browser_allowed: bool, ) -> anyhow::Result { - // gpauth only performs the initial portal/gateway prelogin. Portal policy is - // not available here, so gateway prelogin stays on the embedded value. - let options = PreloginOptions::default().external_browser_requested(external_browser_requested); + let options = PreloginOptions::default() + .external_browser_requested(external_browser_requested) + .gateway_external_browser_allowed(gateway_external_browser_allowed); match prelogin(server, gp_params, options).await? { Prelogin::Saml(prelogin) => Ok(prelogin.saml_request().to_string()), Prelogin::Standard(_) => bail!("Received non-SAML prelogin response"), diff --git a/crates/auth/src/webview/webview_auth.rs b/crates/auth/src/webview/webview_auth.rs index 9811753..d695832 100644 --- a/crates/auth/src/webview/webview_auth.rs +++ b/crates/auth/src/webview/webview_auth.rs @@ -184,7 +184,7 @@ impl<'a> WebviewAuthenticator<'a> { let auth_request = match self.auth_request { Some(auth_request) => auth_request.to_string(), - None => auth_prelogin(&self.server, &self.gp_params, false).await?, + None => auth_prelogin(&self.server, &self.gp_params, false, false).await?, }; let (tx, rx) = oneshot::channel::>(); @@ -257,7 +257,7 @@ impl<'a> WebviewAuthenticator<'a> { document.body.appendChild(loading); "#)?; - let auth_request = auth_prelogin(&self.server, &self.gp_params, false).await?; + let auth_request = auth_prelogin(&self.server, &self.gp_params, false, false).await?; let (tx, rx) = oneshot::channel::>(); let webview_user_agent = self.webview_user_agent.clone(); diff --git a/crates/gpapi/src/portal/prelogin.rs b/crates/gpapi/src/portal/prelogin.rs index 26d9013..43a98a6 100644 --- a/crates/gpapi/src/portal/prelogin.rs +++ b/crates/gpapi/src/portal/prelogin.rs @@ -90,7 +90,7 @@ impl Prelogin { #[derive(Debug, Clone, Copy, Default)] pub struct PreloginOptions { external_browser_requested: bool, - portal_default_browser_enabled: bool, + gateway_external_browser_allowed: bool, } impl PreloginOptions { @@ -99,13 +99,13 @@ impl PreloginOptions { self } - pub fn portal_default_browser_enabled(mut self, portal_default_browser_enabled: bool) -> Self { - self.portal_default_browser_enabled = portal_default_browser_enabled; + pub fn gateway_external_browser_allowed(mut self, gateway_external_browser_allowed: bool) -> Self { + self.gateway_external_browser_allowed = gateway_external_browser_allowed; self } fn browser_mode(self, is_gateway: bool) -> PreloginBrowserMode { - if self.external_browser_requested && (!is_gateway || self.portal_default_browser_enabled) { + if self.external_browser_requested && (!is_gateway || self.gateway_external_browser_allowed) { PreloginBrowserMode::External } else { PreloginBrowserMode::Embedded @@ -307,12 +307,12 @@ mod tests { } #[test] - fn browser_mode_requires_portal_policy_for_gateway_external() { + fn browser_mode_requires_gateway_external_browser_allowed_for_gateway_external() { let options = PreloginOptions::default().external_browser_requested(true); assert_eq!(options.browser_mode(true), PreloginBrowserMode::Embedded); - let options = options.portal_default_browser_enabled(true); + let options = options.gateway_external_browser_allowed(true); assert_eq!(options.browser_mode(true), PreloginBrowserMode::External); }