Compare commits

...

2 Commits

Author SHA1 Message Date
Kevin Yue
13be9179f5 Bump version 2.0.0 2024-02-01 22:41:36 +08:00
Kevin Yue
0a55506077 Do not error when region is not found 2024-02-01 21:52:31 +08:00
3 changed files with 10 additions and 8 deletions

10
Cargo.lock generated
View File

@ -1423,7 +1423,7 @@ dependencies = [
[[package]] [[package]]
name = "gpapi" name = "gpapi"
version = "2.0.0-beta8" version = "2.0.0"
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-beta8" version = "2.0.0"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"clap", "clap",
@ -1472,7 +1472,7 @@ dependencies = [
[[package]] [[package]]
name = "gpclient" name = "gpclient"
version = "2.0.0-beta8" version = "2.0.0"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"clap", "clap",
@ -1493,7 +1493,7 @@ dependencies = [
[[package]] [[package]]
name = "gpservice" name = "gpservice"
version = "2.0.0-beta8" version = "2.0.0"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"axum", "axum",
@ -2478,7 +2478,7 @@ dependencies = [
[[package]] [[package]]
name = "openconnect" name = "openconnect"
version = "2.0.0-beta8" version = "2.0.0"
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-beta8" version = "2.0.0"
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

@ -150,8 +150,10 @@ fn parse_res_xml(res_xml: String, is_gateway: bool) -> anyhow::Result<Prelogin>
bail!("Prelogin failed: {}", msg) bail!("Prelogin failed: {}", msg)
} }
let region = xml::get_child_text(&doc, "region") let region = xml::get_child_text(&doc, "region").unwrap_or_else(|| {
.ok_or_else(|| anyhow::anyhow!("Prelogin response does not contain region element"))?; info!("Prelogin response does not contain region element");
String::from("Unknown")
});
let saml_method = xml::get_child_text(&doc, "saml-auth-method"); let saml_method = xml::get_child_text(&doc, "saml-auth-method");
let saml_request = xml::get_child_text(&doc, "saml-request"); let saml_request = xml::get_child_text(&doc, "saml-request");