feat: add hip parameter to ConnectArgs and VpnBuilder, update connection logic

This commit is contained in:
Kevin Yue committed 2025-11-12 23:35:44 +08:00
1 parent 49fe7447ff
commit 603975bfe0
4 files changed
+52 -14

No files matched your search

+5 -4
View File
@@ -312,12 +312,12 @@ impl<'a> ConnectHandler<'a> {
async fn connect_gateway(&self, gateway: &str, cookie: &str) -> anyhow::Result<()> {
let mtu = self.args.mtu.unwrap_or(0);
let csd_uid = get_csd_uid(&self.args.csd_user)?;
let csd_wrapper = if self.args.csd_wrapper.is_some() {
self.args.csd_wrapper.clone()
let (hip, csd_wrapper) = if let Some(csd_wrapper) = &self.args.csd_wrapper {
(true, Some(csd_wrapper.clone()))
} else if self.args.hip {
find_csd_wrapper()
(true, None)
} else {
None
(false, None)
};
let os = ClientOs::from(&self.args.os).to_openconnect_os().to_string();
@@ -329,6 +329,7 @@ impl<'a> ConnectHandler<'a> {
.certificate(self.args.certificate.clone())
.sslkey(self.args.sslkey.clone())
.key_password(self.latest_key_password.borrow().clone())
.hip(hip)
.csd_uid(csd_uid)
.csd_wrapper(csd_wrapper)
.reconnect_timeout(self.args.reconnect_timeout)
+1
View File
@@ -45,6 +45,7 @@ impl VpnTaskContext {
.certificate(args.certificate())
.sslkey(args.sslkey())
.key_password(args.key_password())
.hip(args.hip())
.csd_uid(args.csd_uid())
.csd_wrapper(args.csd_wrapper())
.reconnect_timeout(args.reconnect_timeout())
+11
View File
@@ -36,6 +36,7 @@ pub struct ConnectArgs {
certificate: Option<String>,
sslkey: Option<String>,
key_password: Option<String>,
hip: bool,
csd_uid: u32,
csd_wrapper: Option<String>,
reconnect_timeout: u32,
@@ -54,6 +55,7 @@ impl ConnectArgs {
certificate: None,
sslkey: None,
key_password: None,
hip: false,
csd_uid: 0,
csd_wrapper: None,
reconnect_timeout: 300,
@@ -91,6 +93,10 @@ impl ConnectArgs {
self.key_password.clone()
}
pub fn hip(&self) -> bool {
self.hip
}
pub fn csd_uid(&self) -> u32 {
self.csd_uid
}
@@ -135,6 +141,11 @@ impl ConnectRequest {
self
}
pub fn with_hip(mut self, hip: bool) -> Self {
self.args.hip = hip;
self
}
pub fn with_csd_uid(mut self, csd_uid: u32) -> Self {
self.args.csd_uid = csd_uid;
self
+35 -10
View File
@@ -127,6 +127,7 @@ pub struct VpnBuilder {
sslkey: Option<String>,
key_password: Option<String>,
hip: bool,
csd_uid: u32,
csd_wrapper: Option<String>,
@@ -153,6 +154,7 @@ impl VpnBuilder {
sslkey: None,
key_password: None,
hip: false,
csd_uid: 0,
csd_wrapper: None,
@@ -199,6 +201,11 @@ impl VpnBuilder {
self
}
pub fn hip(mut self, hip: bool) -> Self {
self.hip = hip;
self
}
pub fn csd_uid(mut self, csd_uid: u32) -> Self {
self.csd_uid = csd_uid;
self
@@ -234,18 +241,36 @@ impl VpnBuilder {
self
}
pub fn build(self) -> Result<Vpn, VpnError> {
let script = match self.script {
fn determine_script(&self) -> Result<String, VpnError> {
match &self.script {
Some(script) => {
check_executable(&script).map_err(|e| VpnError::new(e.to_string()))?;
script
check_executable(script).map_err(|e| VpnError::new(e.to_string()))?;
Ok(script.clone())
}
None => find_vpnc_script().ok_or_else(|| VpnError::new(String::from("Failed to find vpnc-script")))?,
};
if let Some(csd_wrapper) = &self.csd_wrapper {
check_executable(csd_wrapper).map_err(|e| VpnError::new(e.to_string()))?;
None => find_vpnc_script().ok_or_else(|| VpnError::new(String::from("Failed to find vpnc-script"))),
}
}
fn determine_csd_wrapper(&self) -> Result<Option<String>, VpnError> {
if !self.hip {
return Ok(None);
}
match &self.csd_wrapper {
Some(csd_wrapper) if !csd_wrapper.is_empty() => {
check_executable(csd_wrapper).map_err(|e| VpnError::new(e.to_string()))?;
Ok(Some(csd_wrapper.clone()))
}
_ => {
let s = find_csd_wrapper().ok_or_else(|| VpnError::new(String::from("Failed to find csd wrapper")))?;
Ok(Some(s))
}
}
}
pub fn build(self) -> Result<Vpn, VpnError> {
let script = self.determine_script()?;
let csd_wrapper = self.determine_csd_wrapper()?;
let user_agent = self.user_agent.unwrap_or_default();
let os = self.os.unwrap_or("linux".to_string());
@@ -264,7 +289,7 @@ impl VpnBuilder {
servercert: None,
csd_uid: self.csd_uid,
csd_wrapper: self.csd_wrapper.as_deref().map(Self::to_cstring),
csd_wrapper: csd_wrapper.as_deref().map(Self::to_cstring),
reconnect_timeout: self.reconnect_timeout,
mtu: self.mtu,