Fix ignore TLS errors

This commit is contained in:
Kevin Yue 2024-01-22 23:20:25 -05:00
parent c3bd7aeb93
commit 9655b735a1
5 changed files with 9 additions and 7 deletions

10
Cargo.lock generated
View File

@ -1423,7 +1423,7 @@ dependencies = [
[[package]] [[package]]
name = "gpapi" name = "gpapi"
version = "2.0.0-beta5" version = "2.0.0-beta6"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"base64 0.21.5", "base64 0.21.5",
@ -1452,7 +1452,7 @@ dependencies = [
[[package]] [[package]]
name = "gpauth" name = "gpauth"
version = "2.0.0-beta5" version = "2.0.0-beta6"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"clap", "clap",
@ -1472,7 +1472,7 @@ dependencies = [
[[package]] [[package]]
name = "gpclient" name = "gpclient"
version = "2.0.0-beta5" version = "2.0.0-beta6"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"clap", "clap",
@ -1493,7 +1493,7 @@ dependencies = [
[[package]] [[package]]
name = "gpservice" name = "gpservice"
version = "2.0.0-beta5" version = "2.0.0-beta6"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"axum", "axum",
@ -2478,7 +2478,7 @@ dependencies = [
[[package]] [[package]]
name = "openconnect" name = "openconnect"
version = "2.0.0-beta5" version = "2.0.0-beta6"
dependencies = [ dependencies = [
"cc", "cc",
"is_executable", "is_executable",

View File

@ -4,7 +4,7 @@ resolver = "2"
members = ["crates/*", "apps/gpclient", "apps/gpservice", "apps/gpauth"] members = ["crates/*", "apps/gpclient", "apps/gpservice", "apps/gpauth"]
[workspace.package] [workspace.package]
version = "2.0.0-beta5" version = "2.0.0-beta6"
authors = ["Kevin Yue <k3vinyue@gmail.com>"] authors = ["Kevin Yue <k3vinyue@gmail.com>"]
homepage = "https://github.com/yuezk/GlobalProtect-openconnect" homepage = "https://github.com/yuezk/GlobalProtect-openconnect"
edition = "2021" edition = "2021"

View File

@ -115,7 +115,7 @@ pub(crate) async fn run() {
eprintln!("{} --fix-openssl {}\n", args[0], args[1..].join(" ")); 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!( eprintln!(
"\nRe-run it with the `--ignore-tls-errors` option to ignore the certificate error, e.g.:\n" "\nRe-run it with the `--ignore-tls-errors` option to ignore the certificate error, e.g.:\n"
); );

View File

@ -12,6 +12,7 @@ pub async fn gateway_login(
) -> anyhow::Result<String> { ) -> anyhow::Result<String> {
let login_url = format!("https://{}/ssl-vpn/login.esp", gateway); let login_url = format!("https://{}/ssl-vpn/login.esp", gateway);
let client = Client::builder() let client = Client::builder()
.danger_accept_invalid_certs(gp_params.ignore_tls_errors())
.user_agent(gp_params.user_agent()) .user_agent(gp_params.user_agent())
.build()?; .build()?;

View File

@ -120,6 +120,7 @@ pub async fn retrieve_config(
let url = format!("{}/global-protect/getconfig.esp", portal); let url = format!("{}/global-protect/getconfig.esp", portal);
let client = Client::builder() let client = Client::builder()
.danger_accept_invalid_certs(gp_params.ignore_tls_errors())
.user_agent(gp_params.user_agent()) .user_agent(gp_params.user_agent())
.build()?; .build()?;