cassidy/GlobalProtect-openconnect
1
0
Fork 0
mirror of https://github.com/yuezk/GlobalProtect-openconnect.git synced 2025-04-02 18:31:50 -04:00
Code Issues Projects Releases Wiki Activity

Merge branch 'feature/as_gateway' into release/2.1.3

Browse Source
This commit is contained in:
Kevin Yue 2024-04-07 20:44:29 +08:00
commit 0814c3153a
3 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
apps/gpauth/src/auth_window.rs
View File

@ -366,17 +366,14 @@ fn read_auth_data_from_html(html: &str) -> Result<SamlAuthData, AuthDataParseErr
return Err(AuthDataParseError::Invalid); return Err(AuthDataParseError::Invalid);
} }
match SamlAuthData::from_html(html) { SamlAuthData::from_html(html).or_else(|err| {
Ok(auth_data) => Ok(auth_data), if let Some(gpcallback) = extract_gpcallback(html) {
Err(err) => { info!("Found gpcallback from html...");
if let Some(gpcallback) = extract_gpcallback(html) { SamlAuthData::from_gpcallback(&gpcallback)
info!("Found gpcallback from html..."); } else {
SamlAuthData::from_gpcallback(&gpcallback) Err(err)
} else {
Err(err)
}
} }
} })
} }
fn extract_gpcallback(html: &str) -> Option<String> { fn extract_gpcallback(html: &str) -> Option<String> {

8
crates/gpapi/src/credential.rs
View File

@ -162,7 +162,7 @@ pub enum Credential {
Password(PasswordCredential), Password(PasswordCredential),
Prelogin(PreloginCredential), Prelogin(PreloginCredential),
AuthCookie(AuthCookieCredential), AuthCookie(AuthCookieCredential),
CachedCredential(CachedCredential), Cached(CachedCredential),
} }
impl Credential { impl Credential {
@ -179,7 +179,7 @@ impl Credential {
Credential::Password(cred) => cred.username(), Credential::Password(cred) => cred.username(),
Credential::Prelogin(cred) => cred.username(), Credential::Prelogin(cred) => cred.username(),
Credential::AuthCookie(cred) => cred.username(), Credential::AuthCookie(cred) => cred.username(),
Credential::CachedCredential(cred) => cred.username(), Credential::Cached(cred) => cred.username(),
} }
} }
@ -197,7 +197,7 @@ impl Credential {
Some(cred.prelogon_user_auth_cookie()), Some(cred.prelogon_user_auth_cookie()),
None, None,
), ),
Credential::CachedCredential(cred) => ( Credential::Cached(cred) => (
cred.password(), cred.password(),
None, None,
Some(cred.auth_cookie.user_auth_cookie()), Some(cred.auth_cookie.user_auth_cookie()),
@ -244,6 +244,6 @@ impl From<&AuthCookieCredential> for Credential {
impl From<&CachedCredential> for Credential { impl From<&CachedCredential> for Credential {
fn from(value: &CachedCredential) -> Self { fn from(value: &CachedCredential) -> Self {
Self::CachedCredential(value.clone()) Self::Cached(value.clone())
} }
} }

4
crates/gpapi/src/gp_params.rs
View File

@ -130,13 +130,15 @@ pub struct GpParamsBuilder {
impl GpParamsBuilder { impl GpParamsBuilder {
pub fn new() -> Self { pub fn new() -> Self {
let computer = whoami::fallible::hostname().unwrap_or_else(|_| String::from("localhost"));
Self { Self {
is_gateway: false, is_gateway: false,
user_agent: GP_USER_AGENT.to_string(), user_agent: GP_USER_AGENT.to_string(),
client_os: ClientOs::Linux, client_os: ClientOs::Linux,
os_version: Default::default(), os_version: Default::default(),
client_version: Default::default(), client_version: Default::default(),
computer: whoami::hostname(), computer,
ignore_tls_errors: false, ignore_tls_errors: false,
} }
} }