cassidy/GlobalProtect-openconnect
1
0
Fork 0
mirror of https://github.com/yuezk/GlobalProtect-openconnect.git synced 2025-05-20 07:26:58 -04:00
Code Issues Projects Releases Wiki Activity

Improve the error message

Browse Source 
Related #327
This commit is contained in:
Kevin Yue
2024-03-23 20:05:54 +08:00
parent 558485f5a9
commit 08bd4efefa
4 changed files with 42 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
crates/gpapi/src/portal/config.rs
View File

@@ -1,5 +1,5 @@
use anyhow::bail;
use log::info;
use log::{info, warn};
use reqwest::{Client, StatusCode};
use roxmltree::Document;
use serde::Serialize;
@@ -10,7 +10,7 @@ use crate::{
gateway::{parse_gateways, Gateway},
gp_params::GpParams,
portal::PortalError,
utils::{normalize_server, remove_url_scheme, xml},
utils::{normalize_server, parse_gp_error, remove_url_scheme, xml},
};
#[derive(Debug, Serialize, Type)]
@@ -110,7 +110,14 @@ pub async fn retrieve_config(portal: &str, cred: &Credential, gp_params: &GpPara
}
if status.is_client_error() || status.is_server_error() {
bail!("Portal config error: {}", status)
let (reason, res) = parse_gp_error(res).await;
warn!(
"Portal config error: reason={}, status={}, response={}",
reason, status, res
);
bail!("Portal config error, reason: {}", reason);
}
let res_xml = res.text().await.map_err(|e| PortalError::ConfigError(e.to_string()))?;