Skip to content

Commit

Permalink
Remove relay selection logic from multihop and udp2tcp tests (same as…
Browse files Browse the repository at this point in the history 
… test_bridge)
  • Loading branch information
@dlon
dlon committed Nov 22, 2023
1 parent eed7a7d commit 937c8ff
Show file tree
Hide file tree
Showing 3 changed files with 49 additions and 83 deletions.
24 changes: 0 additions & 24 deletions test/test-manager/src/tests/helpers.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -472,30 +472,6 @@ pub fn unreachable_wireguard_tunnel() -> talpid_types::net::wireguard::Connectio
}
}

/// Randomly select an entry and exit node from the daemon's relay list.
/// The exit node is distinct from the entry node.
///
/// * `mullvad_client` - An interface to the Mullvad daemon.
/// * `critera` - A function used to determine which relays to include in random selection.
pub async fn random_entry_and_exit<Filter>(
mullvad_client: &mut ManagementServiceClient,
criteria: Filter,
) -> Result<(Relay, Relay), Error>
where
Filter: Fn(&Relay) -> bool,
{
use itertools::Itertools;
// Pluck the first 2 relays and return them as a tuple.
// This will fail if there are less than 2 relays in the relay list.
filter_relays(mullvad_client, criteria)
.await?
.into_iter()
.next_tuple()
.ok_or(Error::Other(
"failed to randomly select two relays from daemon's relay list".to_string(),
))
}

/// Return a filtered version of the daemon's relay list.
///
/// * `mullvad_client` - An interface to the Mullvad daemon.
Expand Down
1 change: 1 addition & 0 deletions test/test-manager/src/tests/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ pub enum Error {
#[error(display = "Failed to parse gRPC response")]
InvalidGrpcResponse(#[error(source)] types::FromProtobufTypeError),

#[cfg(target_os = "macos")]
#[error(display = "An error occurred: {}", _0)]
Other(String),
}
Expand Down
107 changes: 48 additions & 59 deletions test/test-manager/src/tests/tunnel.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ use mullvad_types::relay_constraints::{
OpenVpnConstraints, RelayConstraints, RelaySettings, SelectedObfuscation, TransportPort,
Udp2TcpObfuscationSettings, WireguardConstraints,
};
use mullvad_types::relay_list::{Relay, RelayEndpointData};
use mullvad_types::wireguard;
use pnet_packet::ip::IpNextHeaderProtocols;
use talpid_types::net::{TransportProtocol, TunnelType};
Expand Down Expand Up @@ -123,18 +122,14 @@ pub async fn test_wireguard_tunnel(
Ok(())
}

/// Use udp2tcp obfuscation. This test connects to a
/// WireGuard relay over TCP. It fails if no outgoing TCP
/// traffic to the relay is observed on the expected port.
/// Use udp2tcp obfuscation. This test connects to a WireGuard relay over TCP. It fails if no
/// outgoing TCP traffic to the relay is observed on the expected port.
#[test_function]
pub async fn test_udp2tcp_tunnel(
_: TestContext,
rpc: ServiceClient,
mut mullvad_client: ManagementServiceClient,
) -> Result<(), Error> {
// TODO: check if src <-> target / tcp is observed (only)
// TODO: ping a public IP on the fake network (not possible using real relay)

mullvad_client
.set_obfuscation_settings(types::ObfuscationSettings::from(ObfuscationSettings {
selected_obfuscation: SelectedObfuscation::Udp2Tcp,
Expand All @@ -158,22 +153,19 @@ pub async fn test_udp2tcp_tunnel(

connect_and_wait(&mut mullvad_client).await?;

let endpoint = match helpers::get_tunnel_state(&mut mullvad_client).await {
mullvad_types::states::TunnelState::Connected { endpoint, .. } => endpoint.endpoint,
_ => panic!("unexpected tunnel state"),
};

//
// Set up packet monitor
//

let non_tunnel_interface = rpc
.get_default_interface()
.await
.expect("failed to obtain non-tun interface");
let guest_ip = rpc
.get_interface_ip(non_tunnel_interface)
.await
.expect("failed to obtain inet interface IP");

let monitor = start_packet_monitor(
move |packet| {
packet.source.ip() != guest_ip || (packet.protocol == IpNextHeaderProtocols::Tcp)
packet.destination.ip() == endpoint.address.ip()
&& packet.protocol == IpNextHeaderProtocols::Tcp
},
MonitorOptions::default(),
)
Expand All @@ -189,9 +181,10 @@ pub async fn test_udp2tcp_tunnel(
);

let monitor_result = monitor.into_result().await.unwrap();
assert_eq!(monitor_result.discarded_packets, 0);

disconnect_and_wait(&mut mullvad_client).await?;
assert!(
!monitor_result.packets.is_empty(),
"detected no tcp traffic",
);

Ok(())
}
Expand Down Expand Up @@ -239,22 +232,19 @@ pub async fn test_bridge(

log::info!("Connect to OpenVPN relay via bridge");

connect_and_wait(&mut mullvad_client)
.await
.expect("connect_and_wait");
connect_and_wait(&mut mullvad_client).await?;

let tunnel = helpers::get_tunnel_state(&mut mullvad_client).await;
let (entry, exit) = match tunnel {
let (entry, exit) = match helpers::get_tunnel_state(&mut mullvad_client).await {
mullvad_types::states::TunnelState::Connected { endpoint, .. } => {
(endpoint.proxy.unwrap().endpoint, endpoint.endpoint)
}
_ => return Err(Error::DaemonError("daemon entered error state".to_string())),
_ => panic!("unexpected tunnel state"),
};

log::info!(
"Selected entry bridge {entry_ip} & exit relay {exit_ip}",
entry_ip = entry.address.ip().to_string(),
exit_ip = exit.address.ip().to_string()
"Selected entry bridge {entry_addr} & exit relay {exit_addr}",
entry_addr = entry.address,
exit_addr = exit.address
);

// Start recording outgoing packets. Their destination will be verified
Expand Down Expand Up @@ -288,39 +278,24 @@ pub async fn test_bridge(
"detected no traffic to entry server",
);

disconnect_and_wait(&mut mullvad_client).await?;

Ok(())
}

/// Test whether WireGuard multihop works. This fails if:
/// * No outgoing traffic to the entry relay is
/// observed from the SUT.
/// * No outgoing traffic to the entry relay is observed from the SUT.
/// * The conncheck reports an unexpected exit relay.
#[test_function]
pub async fn test_multihop(
_: TestContext,
rpc: ServiceClient,
mut mullvad_client: ManagementServiceClient,
) -> Result<(), Error> {
//
// Set relays to use
//

log::info!("Select relay");
let relay_filter = |relay: &Relay| {
relay.active && matches!(relay.endpoint_data, RelayEndpointData::Wireguard(_))
};
let (entry, exit) = helpers::random_entry_and_exit(&mut mullvad_client, relay_filter).await?;
let exit_constraint = helpers::into_constraint(&exit);
let wireguard_constraints = WireguardConstraints {
use_multihop: true,
entry_location: helpers::into_constraint(&entry),
..Default::default()
};

let relay_settings = RelaySettings::Normal(RelayConstraints {
location: exit_constraint,
wireguard_constraints,
..Default::default()
});
Expand All @@ -333,25 +308,32 @@ pub async fn test_multihop(
// Connect
//

let monitor = start_packet_monitor(
move |packet| {
packet.destination.ip() == entry.ipv4_addr_in
&& packet.protocol == IpNextHeaderProtocols::Udp
},
MonitorOptions::default(),
)
.await;
log::info!("Connect using WG multihop");

connect_and_wait(&mut mullvad_client).await?;

let (entry, exit) = match helpers::get_tunnel_state(&mut mullvad_client).await {
mullvad_types::states::TunnelState::Connected { endpoint, .. } => {
(endpoint.entry_endpoint.unwrap(), endpoint.endpoint)
}
_ => panic!("unexpected tunnel state"),
};

log::info!(
"Selected entry {entry_addr} & exit relay {exit_addr}",
entry_addr = entry.address,
exit_addr = exit.address
);

//
// Verify entry IP
// Record outgoing packets to the entry relay
//

log::info!("Verifying entry server");

let monitor_result = monitor.into_result().await.unwrap();
assert!(!monitor_result.packets.is_empty(), "no matching packets",);
let monitor = start_packet_monitor(
move |packet| packet.destination.ip() == entry.address.ip(),
MonitorOptions::default(),
)
.await;

//
// Verify exit IP
Expand All @@ -362,7 +344,14 @@ pub async fn test_multihop(
"expected Mullvad exit IP"
);

disconnect_and_wait(&mut mullvad_client).await?;
//
// Verify entry IP
//

log::info!("Verifying entry server");

let monitor_result = monitor.into_result().await.unwrap();
assert!(!monitor_result.packets.is_empty(), "no matching packets",);

Ok(())
}
Expand Down

0 comments on commit 937c8ff

Please sign in to comment.