Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Write e2e tests for split tunneling #5906

Merged
merged 10 commits into from
Mar 20, 2024
Merged

Write e2e tests for split tunneling #5906

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
8aee9e2
Refactor forward_messages to use select macro
hulthe Mar 4, 2024
aca51ed
Add basic split-tunnel test
hulthe Mar 4, 2024
1badc46
Make e2e tests accept anyhow errors
hulthe Mar 4, 2024
bea5570
Refactor test_macro error handling without panics
hulthe Mar 5, 2024
611efc0
Use curl for split tunnel test
hulthe Mar 5, 2024
69d2c50
Make OVMF paths configurable per VM
hulthe Mar 6, 2024
17814ac
Add am-i-mullvad cli for testing split tunneling
hulthe Mar 6, 2024
8354142
Add split tunnel test for windows
hulthe Mar 6, 2024
e548765
Group platform split tunnel tests under one test
hulthe Mar 6, 2024
6594c6d
Test leaking TCP/UDP/ICMP packets in split tunnel
hulthe Mar 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions mullvad-management-interface/src/client.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ use mullvad_types::{
version::AppVersionInfo,
wireguard::{PublicKey, QuantumResistantState, RotationInterval},
};
#[cfg(target_os = "windows")]
use std::path::Path;
use std::str::FromStr;
#[cfg(target_os = "windows")]
Expand Down Expand Up @@ -592,7 +591,6 @@ impl MullvadProxyClient {
.map(drop)
}

#[cfg(target_os = "linux")]
pub async fn get_split_tunnel_processes(&mut self) -> Result<Vec<i32>> {
use futures::TryStreamExt;

Expand All @@ -605,7 +603,6 @@ impl MullvadProxyClient {
procs.try_collect().await.map_err(Error::Rpc)
}

#[cfg(target_os = "linux")]
pub async fn add_split_tunnel_process(&mut self, pid: i32) -> Result<()> {
self.0
.add_split_tunnel_process(pid)
Expand All @@ -614,7 +611,6 @@ impl MullvadProxyClient {
Ok(())
}

#[cfg(target_os = "linux")]
pub async fn remove_split_tunnel_process(&mut self, pid: i32) -> Result<()> {
self.0
.remove_split_tunnel_process(pid)
Expand All @@ -623,7 +619,6 @@ impl MullvadProxyClient {
Ok(())
}

#[cfg(target_os = "linux")]
pub async fn clear_split_tunnel_processes(&mut self) -> Result<()> {
self.0
.clear_split_tunnel_processes(())
Expand All @@ -632,7 +627,6 @@ impl MullvadProxyClient {
Ok(())
}

#[cfg(target_os = "windows")]
pub async fn add_split_tunnel_app<P: AsRef<Path>>(&mut self, path: P) -> Result<()> {
let path = path.as_ref().to_str().ok_or(Error::PathMustBeUtf8)?;
self.0
Expand All @@ -642,7 +636,6 @@ impl MullvadProxyClient {
Ok(())
}

#[cfg(target_os = "windows")]
pub async fn remove_split_tunnel_app<P: AsRef<Path>>(&mut self, path: P) -> Result<()> {
let path = path.as_ref().to_str().ok_or(Error::PathMustBeUtf8)?;
self.0
Expand All @@ -652,7 +645,6 @@ impl MullvadProxyClient {
Ok(())
}

#[cfg(target_os = "windows")]
pub async fn clear_split_tunnel_apps(&mut self) -> Result<()> {
self.0
.clear_split_tunnel_apps(())
Expand All @@ -661,7 +653,6 @@ impl MullvadProxyClient {
Ok(())
}

#[cfg(target_os = "windows")]
pub async fn set_split_tunnel_state(&mut self, state: bool) -> Result<()> {
self.0
.set_split_tunnel_state(state)
Expand Down
184 changes: 179 additions & 5 deletions test/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 7 additions & 1 deletion test/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,13 @@ rust-version = "1.75.0"

[workspace]
resolver = "2"
members = ["test-manager", "test-runner", "test-rpc", "socks-server"]
members = [
"test-manager",
"test-runner",
"test-rpc",
"socks-server",
"connection-checker",
]

[workspace.lints.rust]
rust_2018_idioms = "deny"
Expand Down
Loading
Loading