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

Simplify code

Browse Source
This commit is contained in:
Kevin Yue 2024-01-29 07:54:58 -05:00
parent 9bc0994a8e
commit 8860efa82e
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -127,7 +127,7 @@ The project depends on `openconnect >= 8.20`, `webkit2gtk`, `libsecret`, `libaya
## About Trial ## About Trial
The CLI version is always free, while the GUI version is paid. There two trial modes for the GUI version: The CLI version is always free, while the GUI version is paid. There are two trial modes for the GUI version:
1. 10-day trial: You can use the GUI stable release for 10 days after the installation. 1. 10-day trial: You can use the GUI stable release for 10 days after the installation.
2. 14-day trial: Each beta release has a fresh trial period (at most 14 days) after released. 2. 14-day trial: Each beta release has a fresh trial period (at most 14 days) after released.

8
crates/gpapi/src/process/auth_launcher.rs
View File

@ -1,5 +1,6 @@
use std::process::Stdio; use std::process::Stdio;
use anyhow::bail;
use tokio::process::Command; use tokio::process::Command;
use crate::{auth::SamlAuthResult, credential::Credential, GP_AUTH_BINARY}; use crate::{auth::SamlAuthResult, credential::Credential, GP_AUTH_BINARY};
@ -129,12 +130,13 @@ impl<'a> SamlAuthLauncher<'a> {
.wait_with_output() .wait_with_output()
.await?; .await?;
let auth_result = serde_json::from_slice::<SamlAuthResult>(&output.stdout) let Ok(auth_result) = serde_json::from_slice::<SamlAuthResult>(&output.stdout) else {
.map_err(|_| anyhow::anyhow!("Failed to parse auth data"))?; bail!("Failed to parse auth data")
};
match auth_result { match auth_result {
SamlAuthResult::Success(auth_data) => Credential::try_from(auth_data), SamlAuthResult::Success(auth_data) => Credential::try_from(auth_data),
SamlAuthResult::Failure(msg) => Err(anyhow::anyhow!(msg)), SamlAuthResult::Failure(msg) => bail!(msg),
} }
} }
} }