diff --git a/test/test-manager/api-addrs.txt b/test/test-manager/api-addrs.txt deleted file mode 100644 index 22e9604dd6bf..000000000000 --- a/test/test-manager/api-addrs.txt +++ /dev/null @@ -1,34 +0,0 @@ -45.83.223.193 -185.217.116.1 -185.217.116.129 -45.83.223.196 -146.70.141.154 -37.120.218.170 -217.138.213.18 -198.44.140.226 -193.32.127.117 -91.193.4.210 -217.138.199.106 -185.213.155.117 -193.138.7.132 -193.32.126.117 -141.98.252.66 -89.238.134.58 -103.125.233.210 -185.242.4.34 -185.65.134.116 -91.90.44.10 -194.127.199.245 -5.253.206.194 -185.213.154.117 -193.138.218.71 -146.70.192.34 -66.115.180.241 -68.235.44.130 -174.127.113.18 -62.133.44.202 -146.70.183.34 -212.103.48.226 -38.132.121.146 -198.54.130.178 -69.4.234.146 diff --git a/test/test-manager/generate-api-endpoints.sh b/test/test-manager/generate-api-endpoints.sh deleted file mode 100755 index ab857fbce1c0..000000000000 --- a/test/test-manager/generate-api-endpoints.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env bash - -# Output known API IPs and bridge relay IPs - -dig +short api.mullvad.net -dig +short api.devmole.eu -dig +short api.stagemole.eu -echo "45.83.223.196" # old prod -curl -s https://api.mullvad.net/app/v1/relays | jq -r '.bridge.relays[] | .ipv4_addr_in' diff --git a/test/test-manager/src/tests/install.rs b/test/test-manager/src/tests/install.rs index 3b282e764861..b735128bd528 100644 --- a/test/test-manager/src/tests/install.rs +++ b/test/test-manager/src/tests/install.rs @@ -43,10 +43,8 @@ pub async fn test_install_previous_app(_: TestContext, rpc: ServiceClient) -> Re /// Upgrade to the "version under test". This test fails if: /// -/// * Outgoing traffic whose destination is not one of the bridge -/// relays or the API is detected during the upgrade. -/// * Leaks (TCP/UDP/ICMP) to a single public IP address are -/// successfully produced during the upgrade. +/// * Leaks (TCP/UDP/ICMP) to a single public IP address are successfully produced during the +/// upgrade. /// * The installer does not successfully complete. /// * The VPN service is not running after the upgrade. #[test_function(priority = -190)] @@ -54,12 +52,6 @@ pub async fn test_upgrade_app( ctx: TestContext, rpc: ServiceClient, ) -> Result<(), Error> { - // Parse api-addrs.txt - const API_ADDRS: Lazy> = Lazy::new(|| { - const API_ADDRS: &str = std::include_str!("../../api-addrs.txt"); - API_ADDRS.split('\n').map(|addr| addr.parse().unwrap()).collect() - }); - let inet_destination: SocketAddr = "1.1.1.1:1337".parse().unwrap(); let bind_addr: SocketAddr = "0.0.0.0:0".parse().unwrap(); @@ -115,7 +107,9 @@ pub async fn test_upgrade_app( let monitor = start_packet_monitor( move |packet| { - packet.source.ip() == guest_ip && !API_ADDRS.contains(&packet.destination.ip()) + // NOTE: Many packets will likely be observed for API traffic. Rather than filtering all + // of those specifically, simply fail if our probes are observed. + packet.source.ip() == guest_ip && packet.destination.ip() == inet_destination.ip() }, MonitorOptions::default(), )