refactor: backport xmltree parser migration to 2.3.x

This commit is contained in:
Kevin Yue committed 2026-04-19 00:40:00 +08:00
1 parent c206e72885
commit e733b38ab7
9 files changed
+138 -114

No files matched your search

+9 -10
View File
@@ -1,14 +1,14 @@
use anyhow::bail;
use log::{info, warn};
use reqwest::Client;
use roxmltree::Document;
use urlencoding::encode;
use xmltree::Element;
use crate::{
credential::Credential,
error::PortalError,
gp_params::GpParams,
utils::{normalize_server, parse_gp_response, remove_url_scheme},
utils::{normalize_server, parse_gp_response, remove_url_scheme, xml::ElementExt},
};
pub enum GatewayLogin {
@@ -52,18 +52,17 @@ pub async fn gateway_login(gateway: &str, cred: &Credential, gp_params: &GpParam
return Ok(GatewayLogin::Mfa(message, input_str));
}
let doc = Document::parse(&res)?;
let cookie = build_gateway_token(&doc, gp_params.computer())?;
let root = Element::parse(res.as_bytes())?;
let cookie = build_gateway_token(&root, gp_params.computer())?;
Ok(GatewayLogin::Cookie(cookie))
}
fn build_gateway_token(doc: &Document, computer: &str) -> anyhow::Result<String> {
let args = doc
.descendants()
.filter(|n| n.has_tag_name("argument"))
.map(|n| n.text().unwrap_or("").to_string())
fn build_gateway_token(root: &Element, computer: &str) -> anyhow::Result<String> {
let args = root
.descendants("argument")
.iter()
.map(|element| element.get_text().unwrap_or_default().to_string())
.collect::<Vec<_>>();
let params = [