alterwain/Frida
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Trying to make linux client great again

Browse Source 
modified:   frida_client/src/client.rs
This commit is contained in:
Michael Wain 2024-12-10 03:08:50 +03:00
parent d98e60c6d8
commit d121cd42d7
1 changed files with 42 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
frida_client/src/client.rs
View File

@ -217,48 +217,67 @@ pub mod desktop {
info!("Main network interface: {:?}", inter_name); info!("Main network interface: {:?}", inter_name);
/*let mut ip_output = std::process::Command::new("sudo") /*
.arg("ip") let mut ip_output = std::process::Command::new("sudo")
.arg("route") .arg("route")
.arg("del") .arg("add")
.arg("default") .arg("-host")
.arg(endpoint_ip)
.arg("gw")
.arg() // default interface gateway
.arg("dev")
.arg() // default interface
.output() .output()
.expect("Failed to delete default gateway."); .expect("Failed to execute route command.");
if !ip_output.status.success() { if !ip_output.status.success() {
error!("Failed to delete default gateway: {:?}", String::from_utf8_lossy(&ip_output.stderr)); log::error!("Failed to execute route command: {:?}", String::from_utf8_lossy(&ip_output.stderr));
}*/ }
let mut ip_output = std::process::Command::new("sudo") let mut ip_output = std::process::Command::new("sudo")
.arg("ip") .arg("ip")
.arg("-4")
.arg("route") .arg("route")
.arg("add") .arg("add")
.arg("0.0.0.0/0") .arg("0.0.0.0/0")
.arg("dev") .arg("dev")
.arg("tun0") .arg() // tun adapter name
.output() .output()
.expect("Failed to execute ip route command."); .expect("Failed to execute ip route command.");
if !ip_output.status.success() { if !ip_output.status.success() {
log::error!("Failed to route all traffic: {:?}", String::from_utf8_lossy(&ip_output.stderr)); log::error!("Failed to execute ip route command: {:?}", String::from_utf8_lossy(&ip_output.stderr));
} }
// TODO: replace 192.168.0.1 with relative variable
ip_output = std::process::Command::new("sudo") let mut ip_output = std::process::Command::new("sudo")
.arg("ip") .arg("ip")
.arg("route") .arg("route")
.arg("add") .arg("add")
.arg(endpoint_ip.to_owned()+"/32") .arg("128.0.0.0/1")
.arg("via")
.arg("192.168.0.1")
.arg("dev") .arg("dev")
.arg(inter_name) .arg() // tun adapter name
.output() .output()
.expect("Failed to make exception for vpns endpoint."); .expect("Failed to execute ip route command.");
if !ip_output.status.success() { if !ip_output.status.success() {
log::error!("Failed to forward packets: {:?}", String::from_utf8_lossy(&ip_output.stderr)); log::error!("Failed to execute ip route command: {:?}", String::from_utf8_lossy(&ip_output.stderr));
} }
let mut ip_output = std::process::Command::new("sudo")
.arg("route")
.arg("add")
.arg("-host")
.arg(endpoint_ip)
.arg("gw")
.arg() // default interface gateway
.arg("dev")
.arg() // default interface
.output()
.expect("Failed to execute route command.");
if !ip_output.status.success() {
log::error!("Failed to execute route command: {:?}", String::from_utf8_lossy(&ip_output.stderr));
}
*/
} }
pub struct DesktopClient { pub struct DesktopClient {
@ -287,11 +306,11 @@ pub mod desktop {
let mut client = CoreVpnClient{ client_config: self.client_config.clone(), close_token: tokio_util::sync::CancellationToken::new()}; let mut client = CoreVpnClient{ client_config: self.client_config.clone(), close_token: tokio_util::sync::CancellationToken::new()};
info!("Platform specific code"); info!("Platform specific code");
/* #[cfg(target_os = "linux")] #[cfg(target_os = "linux")]
{ {
let s_a: std::net::SocketAddr = self.client_config.server.endpoint.parse().unwrap(); let s_a: std::net::SocketAddr = self.client_config.server.endpoint.parse().unwrap();
configure_routes(&s_a.ip().to_string(), self.s_interface.clone()); configure_routes(&s_a.ip().to_string(), self.s_interface.clone());
}*/ }
client.start(sock, dev_reader, dev_writer, mtu).await; client.start(sock, dev_reader, dev_writer, mtu).await;
} }