fix: correct direct gateway browser auth mode

This commit is contained in:
Kevin Yue committed 2026-06-22 08:24:48 +08:00
1 parent dc7a200b93
commit 40739739b5
9 files changed
+21 -22

No files matched your search

+4 -4
View File
@@ -48,7 +48,7 @@ impl ConnectHandler<'_> {
&self,
prelogin: &Prelogin,
server: &str,
portal_default_browser_enabled: bool,
gateway_external_browser_allowed: bool,
) -> anyhow::Result<Credential> {
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>) {
+2 -2
View File
@@ -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())
+2 -2
View File
@@ -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 {