diff --git a/Cargo.lock b/Cargo.lock index bea24fc..5353199 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1423,7 +1423,7 @@ dependencies = [ [[package]] name = "gpapi" -version = "2.0.0-beta5" +version = "2.0.0-beta6" dependencies = [ "anyhow", "base64 0.21.5", @@ -1452,7 +1452,7 @@ dependencies = [ [[package]] name = "gpauth" -version = "2.0.0-beta5" +version = "2.0.0-beta6" dependencies = [ "anyhow", "clap", @@ -1472,7 +1472,7 @@ dependencies = [ [[package]] name = "gpclient" -version = "2.0.0-beta5" +version = "2.0.0-beta6" dependencies = [ "anyhow", "clap", @@ -1493,7 +1493,7 @@ dependencies = [ [[package]] name = "gpservice" -version = "2.0.0-beta5" +version = "2.0.0-beta6" dependencies = [ "anyhow", "axum", @@ -2478,7 +2478,7 @@ dependencies = [ [[package]] name = "openconnect" -version = "2.0.0-beta5" +version = "2.0.0-beta6" dependencies = [ "cc", "is_executable", diff --git a/Cargo.toml b/Cargo.toml index 50db849..fac3e79 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,7 +4,7 @@ resolver = "2" members = ["crates/*", "apps/gpclient", "apps/gpservice", "apps/gpauth"] [workspace.package] -version = "2.0.0-beta5" +version = "2.0.0-beta6" authors = ["Kevin Yue "] homepage = "https://github.com/yuezk/GlobalProtect-openconnect" edition = "2021" diff --git a/apps/gpclient/src/cli.rs b/apps/gpclient/src/cli.rs index 00c0a5d..9d68582 100644 --- a/apps/gpclient/src/cli.rs +++ b/apps/gpclient/src/cli.rs @@ -115,7 +115,7 @@ pub(crate) async fn run() { eprintln!("{} --fix-openssl {}\n", args[0], args[1..].join(" ")); } - if err.contains("certificate verify failed") { + if err.contains("certificate verify failed") && !cli.ignore_tls_errors { eprintln!( "\nRe-run it with the `--ignore-tls-errors` option to ignore the certificate error, e.g.:\n" ); diff --git a/crates/gpapi/src/gateway/login.rs b/crates/gpapi/src/gateway/login.rs index ac8ad25..fe737c2 100644 --- a/crates/gpapi/src/gateway/login.rs +++ b/crates/gpapi/src/gateway/login.rs @@ -12,6 +12,7 @@ pub async fn gateway_login( ) -> anyhow::Result { let login_url = format!("https://{}/ssl-vpn/login.esp", gateway); let client = Client::builder() + .danger_accept_invalid_certs(gp_params.ignore_tls_errors()) .user_agent(gp_params.user_agent()) .build()?; diff --git a/crates/gpapi/src/portal/config.rs b/crates/gpapi/src/portal/config.rs index 5d4ab98..b44d2f1 100644 --- a/crates/gpapi/src/portal/config.rs +++ b/crates/gpapi/src/portal/config.rs @@ -120,6 +120,7 @@ pub async fn retrieve_config( let url = format!("{}/global-protect/getconfig.esp", portal); let client = Client::builder() + .danger_accept_invalid_certs(gp_params.ignore_tls_errors()) .user_agent(gp_params.user_agent()) .build()?;