diff --git a/apps/gpclient/src/connect.rs b/apps/gpclient/src/connect.rs index 1276b99..b37c6d4 100644 --- a/apps/gpclient/src/connect.rs +++ b/apps/gpclient/src/connect.rs @@ -206,15 +206,21 @@ impl<'a> ConnectHandler<'a> { } fn build_gp_params(&self) -> GpParams { - GpParams::builder() + let mut builder = GpParams::builder(); + builder .user_agent(&self.user_agent()) .client_os(ClientOs::from(&self.args.os)) .os_version(self.args.os_version().to_owned()) .ignore_tls_errors(self.shared_args.ignore_tls_errors) .certificate(self.args.certificate.clone()) .sslkey(self.args.sslkey.clone()) - .key_password(self.latest_key_password.borrow().clone()) - .build() + .key_password(self.latest_key_password.borrow().clone()); + + if let Some(local_hostname) = self.args.local_hostname.as_deref() { + builder.computer(local_hostname); + } + + builder.build() } pub(crate) async fn handle(&self) -> anyhow::Result<()> { diff --git a/crates/gpapi/src/gateway/login.rs b/crates/gpapi/src/gateway/login.rs index fc485a1..35c89cd 100644 --- a/crates/gpapi/src/gateway/login.rs +++ b/crates/gpapi/src/gateway/login.rs @@ -3,7 +3,7 @@ use std::borrow::Cow; use anyhow::bail; use log::{debug, info, warn}; use reqwest::Client; -use urlencoding::encode; +use urlencoding::{decode, encode}; use xmltree::Element; use crate::{ @@ -74,14 +74,19 @@ fn build_gateway_token(element: &Element, computer: &str) -> anyhow::Result>(); - let params = [ - read_args(&args, 1, "authcookie")?, - read_args(&args, 3, "portal")?, - read_args(&args, 4, "user")?, - read_args(&args, 7, "domain")?, - read_args(&args, 15, "preferred-ip")?, - ("computer", computer), - ]; + let mut params = vec![ + read_required_arg(&args, 1, "authcookie")?, + read_optional_arg(&args, 2, "persistent-cookie")?, + read_optional_arg(&args, 3, "portal")?, + read_required_arg(&args, 4, "user")?, + read_optional_arg(&args, 7, "domain")?, + read_optional_arg(&args, 15, "preferred-ip")?, + read_optional_arg(&args, 18, "preferred-ipv6")?, + ] + .into_iter() + .flatten() + .collect::>(); + params.push(("computer", computer.to_string())); let token = params .iter() @@ -92,11 +97,43 @@ fn build_gateway_token(element: &Element, computer: &str) -> anyhow::Result(args: &'a [Cow<'_, str>], index: usize, key: &'a str) -> anyhow::Result<(&'a str, &'a str)> { - args - .get(index) - .ok_or_else(|| anyhow::anyhow!("Failed to read {key} from args")) - .map(|s| (key, s.as_ref())) +fn read_required_arg( + args: &[Cow<'_, str>], + index: usize, + key: &'static str, +) -> anyhow::Result> { + let Some(value) = read_arg_value(args, index)? else { + bail!("Failed to read {key} from args"); + }; + + Ok(Some((key, value))) +} + +fn read_optional_arg( + args: &[Cow<'_, str>], + index: usize, + key: &'static str, +) -> anyhow::Result> { + Ok(read_arg_value(args, index)?.map(|value| (key, value))) +} + +fn read_arg_value(args: &[Cow<'_, str>], index: usize) -> anyhow::Result> { + Ok( + args + .get(index) + .map(|s| normalize_arg_value(s.as_ref())) + .transpose() + .map_err(|err| anyhow::anyhow!("Failed to decode gateway login argument {index}: {err}"))? + .flatten(), + ) +} + +fn normalize_arg_value(value: &str) -> anyhow::Result> { + if value.is_empty() || value == "(null)" || value == "-1" { + return Ok(None); + } + + Ok(Some(decode(value)?.into_owned())) } fn parse_mfa(res: &str) -> Option<(String, String)> { @@ -127,4 +164,78 @@ thisForm.inputStr.value = "5ef64e83000119ed";"#; assert_eq!(message, "MFA message"); assert_eq!(input_str, "5ef64e83000119ed"); } + + #[test] + fn gateway_token_keeps_upstream_cookie_fields() { + let res = r#" + + + + AUTHCOOKIE + PERSISTENTCOOKIE + vpn.example.com + alice + LDAP-auth + vsys1 + %28empty_domain%29 + + + + + tunnel + -1 + 4100 + 10.0.0.10 + unused-user-cookie + unused-prelogon-cookie + 2001:db8::10 + + +"#; + + let root = Element::parse(res.as_bytes()).unwrap(); + let token = build_gateway_token(&root, "metalklesk").unwrap(); + + assert_eq!( + token, + "authcookie=AUTHCOOKIE&persistent-cookie=PERSISTENTCOOKIE&portal=vpn.example.com&user=alice&domain=%28empty_domain%29&preferred-ip=10.0.0.10&preferred-ipv6=2001%3Adb8%3A%3A10&computer=metalklesk" + ); + } + + #[test] + fn gateway_token_omits_empty_optional_fields() { + let res = r#" + + + + AUTHCOOKIE + + vpn.example.com + alice + LDAP-auth + vsys1 + -1 + + + + + tunnel + -1 + 4100 + + unused-user-cookie + unused-prelogon-cookie + (null) + + +"#; + + let root = Element::parse(res.as_bytes()).unwrap(); + let token = build_gateway_token(&root, "metalklesk").unwrap(); + + assert_eq!( + token, + "authcookie=AUTHCOOKIE&portal=vpn.example.com&user=alice&computer=metalklesk" + ); + } }