mirror of
https://github.com/yuezk/GlobalProtect-openconnect.git
synced 2026-11-19 06:26:14 -05:00
fix: correct direct gateway browser auth mode
This commit is contained in:
9 files changed
+21
-22
No files matched your search
@@ -135,7 +135,6 @@ jobs:
|
|||||||
- tarball
|
- tarball
|
||||||
strategy:
|
strategy:
|
||||||
fail-fast: false
|
fail-fast: false
|
||||||
max-parallel: 2
|
|
||||||
matrix:
|
matrix:
|
||||||
os:
|
os:
|
||||||
- runner: ubuntu-latest
|
- runner: ubuntu-latest
|
||||||
|
|||||||
@@ -101,7 +101,6 @@ jobs:
|
|||||||
needs:
|
needs:
|
||||||
- setup-matrix
|
- setup-matrix
|
||||||
strategy:
|
strategy:
|
||||||
max-parallel: 2
|
|
||||||
matrix: ${{ fromJson(needs.setup-matrix.outputs.matrix) }}
|
matrix: ${{ fromJson(needs.setup-matrix.outputs.matrix) }}
|
||||||
runs-on: ${{ matrix.os }}
|
runs-on: ${{ matrix.os }}
|
||||||
steps:
|
steps:
|
||||||
|
|||||||
@@ -128,7 +128,7 @@ impl Cli {
|
|||||||
|
|
||||||
let auth_request = match self.saml_request.as_deref() {
|
let auth_request = match self.saml_request.as_deref() {
|
||||||
Some(auth_request) => auth_request.to_string(),
|
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")]
|
#[cfg(feature = "webview-auth")]
|
||||||
|
|||||||
@@ -48,7 +48,7 @@ impl ConnectHandler<'_> {
|
|||||||
&self,
|
&self,
|
||||||
prelogin: &Prelogin,
|
prelogin: &Prelogin,
|
||||||
server: &str,
|
server: &str,
|
||||||
portal_default_browser_enabled: bool,
|
gateway_external_browser_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();
|
||||||
@@ -61,7 +61,7 @@ impl ConnectHandler<'_> {
|
|||||||
let external_browser_supported = default_browser_auth_allowed(
|
let external_browser_supported = default_browser_auth_allowed(
|
||||||
prelogin.support_default_browser(),
|
prelogin.support_default_browser(),
|
||||||
is_gateway,
|
is_gateway,
|
||||||
portal_default_browser_enabled,
|
gateway_external_browser_allowed,
|
||||||
);
|
);
|
||||||
let browser = if external_browser_supported {
|
let browser = if external_browser_supported {
|
||||||
self.args.browser.as_deref()
|
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(
|
fn default_browser_auth_allowed(
|
||||||
saml_support_default_browser: bool,
|
saml_support_default_browser: bool,
|
||||||
is_gateway: bool,
|
is_gateway: bool,
|
||||||
portal_default_browser_enabled: bool,
|
gateway_external_browser_allowed: bool,
|
||||||
) -> 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>) {
|
fn log_stdin_host_id(host_id: Option<&str>) {
|
||||||
|
|||||||
@@ -139,8 +139,8 @@ 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 prelogin = prelogin(gateway, &gp_params, self.prelogin_options(false)).await?;
|
let prelogin = prelogin(gateway, &gp_params, self.prelogin_options(true)).await?;
|
||||||
let cred = self.obtain_credential(&prelogin, gateway, false).await?;
|
let cred = self.obtain_credential(&prelogin, gateway, true).await?;
|
||||||
|
|
||||||
let login_session = self
|
let login_session = self
|
||||||
.login_gateway(gateway, &cred, &gp_params, gateway_context.as_ref())
|
.login_gateway(gateway, &cred, &gp_params, gateway_context.as_ref())
|
||||||
|
|||||||
@@ -65,10 +65,10 @@ impl<'a> ConnectHandler<'a> {
|
|||||||
builder.build()
|
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()
|
PreloginOptions::default()
|
||||||
.external_browser_requested(self.external_browser_requested())
|
.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 {
|
fn external_browser_requested(&self) -> bool {
|
||||||
|
|||||||
@@ -19,10 +19,11 @@ pub async fn auth_prelogin(
|
|||||||
server: &str,
|
server: &str,
|
||||||
gp_params: &GpParams,
|
gp_params: &GpParams,
|
||||||
external_browser_requested: bool,
|
external_browser_requested: bool,
|
||||||
|
gateway_external_browser_allowed: bool,
|
||||||
) -> anyhow::Result<String> {
|
) -> anyhow::Result<String> {
|
||||||
// gpauth only performs the initial portal/gateway prelogin. Portal policy is
|
let options = PreloginOptions::default()
|
||||||
// not available here, so gateway prelogin stays on the embedded value.
|
.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? {
|
match prelogin(server, gp_params, options).await? {
|
||||||
Prelogin::Saml(prelogin) => Ok(prelogin.saml_request().to_string()),
|
Prelogin::Saml(prelogin) => Ok(prelogin.saml_request().to_string()),
|
||||||
Prelogin::Standard(_) => bail!("Received non-SAML prelogin response"),
|
Prelogin::Standard(_) => bail!("Received non-SAML prelogin response"),
|
||||||
|
|||||||
@@ -184,7 +184,7 @@ impl<'a> WebviewAuthenticator<'a> {
|
|||||||
|
|
||||||
let auth_request = match self.auth_request {
|
let auth_request = match self.auth_request {
|
||||||
Some(auth_request) => auth_request.to_string(),
|
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::<anyhow::Result<()>>();
|
let (tx, rx) = oneshot::channel::<anyhow::Result<()>>();
|
||||||
@@ -257,7 +257,7 @@ impl<'a> WebviewAuthenticator<'a> {
|
|||||||
document.body.appendChild(loading);
|
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::<anyhow::Result<()>>();
|
let (tx, rx) = oneshot::channel::<anyhow::Result<()>>();
|
||||||
let webview_user_agent = self.webview_user_agent.clone();
|
let webview_user_agent = self.webview_user_agent.clone();
|
||||||
|
|||||||
@@ -90,7 +90,7 @@ impl Prelogin {
|
|||||||
#[derive(Debug, Clone, Copy, Default)]
|
#[derive(Debug, Clone, Copy, Default)]
|
||||||
pub struct PreloginOptions {
|
pub struct PreloginOptions {
|
||||||
external_browser_requested: bool,
|
external_browser_requested: bool,
|
||||||
portal_default_browser_enabled: bool,
|
gateway_external_browser_allowed: bool,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl PreloginOptions {
|
impl PreloginOptions {
|
||||||
@@ -99,13 +99,13 @@ impl PreloginOptions {
|
|||||||
self
|
self
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn portal_default_browser_enabled(mut self, portal_default_browser_enabled: bool) -> Self {
|
pub fn gateway_external_browser_allowed(mut self, gateway_external_browser_allowed: bool) -> Self {
|
||||||
self.portal_default_browser_enabled = portal_default_browser_enabled;
|
self.gateway_external_browser_allowed = gateway_external_browser_allowed;
|
||||||
self
|
self
|
||||||
}
|
}
|
||||||
|
|
||||||
fn browser_mode(self, is_gateway: bool) -> PreloginBrowserMode {
|
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
|
PreloginBrowserMode::External
|
||||||
} else {
|
} else {
|
||||||
PreloginBrowserMode::Embedded
|
PreloginBrowserMode::Embedded
|
||||||
@@ -307,12 +307,12 @@ mod tests {
|
|||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[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);
|
let options = PreloginOptions::default().external_browser_requested(true);
|
||||||
|
|
||||||
assert_eq!(options.browser_mode(true), PreloginBrowserMode::Embedded);
|
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);
|
assert_eq!(options.browser_mode(true), PreloginBrowserMode::External);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in new issue
Block a user