mirror of
https://github.com/yuezk/GlobalProtect-openconnect.git
synced 2026-11-19 06:26:14 -05:00
refactor: align GP profile and packaging flow
Main changes: - Refactor connect/auth flows around a single OS profile and host identity model, including gateway fallback and cookie-on-stdin handling. - Align request parameters, HIP host-id propagation, SAML webview user-agent behavior, and portal default-browser handling with observed official client behavior. - Add opt-in cookie cache support and Microsoft Defender HIP reporting while keeping host-id validation explicit. - Add BSD build, packaging, release artifact, and provenance support with FreeBSD/OpenBSD path and dependency cleanup. - Update NixOS install documentation and dependency compatibility fixes.
This commit is contained in:
92 files changed
+9847
-2868
No files matched your search
@@ -0,0 +1,62 @@
|
||||
use crate::{credential::Credential, gp_params::GpParams};
|
||||
|
||||
const EMPTY_PORTAL_COOKIE: &str = "empty";
|
||||
|
||||
fn portal_cookie_param(value: Option<&str>) -> String {
|
||||
match value {
|
||||
Some(value) if !value.is_empty() => value.to_string(),
|
||||
_ => EMPTY_PORTAL_COOKIE.to_string(),
|
||||
}
|
||||
}
|
||||
|
||||
pub(crate) fn build(cred: &Credential, gp_params: &GpParams) -> Vec<(String, String)> {
|
||||
let mut params = Vec::new();
|
||||
params.push(("user".to_string(), cred.username().to_string()));
|
||||
|
||||
let (passwd, prelogin_cookie, portal_userauthcookie, portal_prelogonuserauthcookie, token) = match cred {
|
||||
Credential::Password(cred) => (Some(cred.password()), None, None, None, None),
|
||||
Credential::Prelogin(cred) => (
|
||||
Some(gp_params.os_profile().saml_password()),
|
||||
cred.prelogin_cookie(),
|
||||
cred.portal_userauthcookie(),
|
||||
None,
|
||||
cred.token(),
|
||||
),
|
||||
Credential::AuthCookie(cred) => (
|
||||
Some(
|
||||
cred
|
||||
.password()
|
||||
.unwrap_or_else(|| gp_params.os_profile().saml_password()),
|
||||
),
|
||||
None,
|
||||
Some(cred.user_auth_cookie()),
|
||||
Some(cred.prelogon_user_auth_cookie()),
|
||||
None,
|
||||
),
|
||||
Credential::Cached(cred) => (
|
||||
cred.password(),
|
||||
None,
|
||||
cred.auth_cookie().map(|cred| cred.user_auth_cookie()),
|
||||
cred.auth_cookie().map(|cred| cred.prelogon_user_auth_cookie()),
|
||||
None,
|
||||
),
|
||||
};
|
||||
|
||||
params.push(("passwd".to_string(), passwd.unwrap_or_default().to_string()));
|
||||
params.push((
|
||||
"prelogin-cookie".to_string(),
|
||||
prelogin_cookie.unwrap_or_default().to_string(),
|
||||
));
|
||||
params.push((
|
||||
"portal-userauthcookie".to_string(),
|
||||
portal_cookie_param(portal_userauthcookie),
|
||||
));
|
||||
params.push((
|
||||
"portal-prelogonuserauthcookie".to_string(),
|
||||
portal_cookie_param(portal_prelogonuserauthcookie),
|
||||
));
|
||||
|
||||
params.push(("token".to_string(), token.unwrap_or_default().to_string()));
|
||||
|
||||
params
|
||||
}
|
||||
Reference in new issue
Block a user