github-personal/firezone
1
0
Fork 0
mirror of https://github.com/outbackdingo/firezone.git synced 2026-01-27 10:18:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

test(connlib): reduce number of duplicate IPs (#7685)

Browse Source 
For our test-suite, we need to sample a unique, non-overlapping IP for
each component that is being simulated (client, gateways and relays).
These are sampled from a predefined range.

Currently, we only consider the first 100 IPs of this range and pick it
from an allocated `Vec`. This isn't ideal for performance and increases
the likelihood of two hosts having the same IP. IPv4 and IPv6 addresses
can also just be represented as numbers. Instead of sampling a random IP
from a list, we can simply sample a random number between the first and
last address of the particular IP network to achieve the same effect.
This commit is contained in:
Thomas Eizinger
2025-01-07 17:51:53 +01:00
committed by GitHub
parent 49ddcf87f7
commit 21fc8efd5e
2 changed files with 16 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
rust/connlib/tunnel/src/tests/sim_net.rs
View File

@@ -2,10 +2,8 @@ use crate::tests::buffered_transmits::BufferedTransmits;
use crate::tests::strategies::documentation_ip6s;
use connlib_model::{ClientId, GatewayId, RelayId};
use firezone_relay::{AddressFamily, IpStack};
use ip_network::{IpNetwork, Ipv4Network};
use ip_network::IpNetwork;
use ip_network_table::IpNetworkTable;
use itertools::Itertools as _;
use prop::sample;
use proptest::prelude::*;
use snownet::Transmit;
use std::{
@@ -308,13 +306,10 @@ pub(crate) fn dual_ip_stack() -> impl Strategy<Value = IpStack> {
///
/// This uses the `TEST-NET-3` (`203.0.113.0/24`) address space reserved for documentation and examples in [RFC5737](https://datatracker.ietf.org/doc/html/rfc5737).
pub(crate) fn host_ip4s() -> impl Strategy<Value = Ipv4Addr> {
let ips = Ipv4Network::new(Ipv4Addr::new(203, 0, 113, 0), 24)
.unwrap()
.hosts()
.take(100)
.collect_vec();
const FIRST: Ipv4Addr = Ipv4Addr::new(203, 0, 113, 0);
const LAST: Ipv4Addr = Ipv4Addr::new(203, 0, 113, 255);
sample::select(ips)
(FIRST.to_bits()..=LAST.to_bits()).prop_map(Ipv4Addr::from_bits)
}
/// A [`Strategy`] of [`Ipv6Addr`]s used for routing packets between hosts within our test.
@@ -323,5 +318,5 @@ pub(crate) fn host_ip4s() -> impl Strategy<Value = Ipv4Addr> {
pub(crate) fn host_ip6s() -> impl Strategy<Value = Ipv6Addr> {
const HOST_SUBNET: u16 = 0x1010;
documentation_ip6s(HOST_SUBNET, 100)
documentation_ip6s(HOST_SUBNET)
}

25
rust/connlib/tunnel/src/tests/strategies.rs
View File

@@ -278,12 +278,10 @@ pub(crate) fn subdomain_records(
/// This uses the `TEST-NET-2` (`198.51.100.0/24`) address space reserved for documentation and examples in [RFC5737](https://datatracker.ietf.org/doc/html/rfc5737).
/// `TEST-NET-2` only contains 256 addresses which is small enough to generate overlapping IPs for our DNS resources (i.e. two different domains pointing to the same IP).
fn dns_resource_ip4s() -> impl Strategy<Value = Ipv4Addr> {
let ips = Ipv4Network::new(Ipv4Addr::new(198, 51, 100, 0), 24)
.unwrap()
.hosts()
.collect_vec();
const FIRST: Ipv4Addr = Ipv4Addr::new(198, 51, 100, 0);
const LAST: Ipv4Addr = Ipv4Addr::new(198, 51, 100, 255);
sample::select(ips)
(FIRST.to_bits()..=LAST.to_bits()).prop_map(Ipv4Addr::from_bits)
}
/// A [`Strategy`] of [`Ipv6Addr`]s used for the "real" IPs of DNS resources.
@@ -292,21 +290,20 @@ fn dns_resource_ip4s() -> impl Strategy<Value = Ipv4Addr> {
fn dns_resource_ip6s() -> impl Strategy<Value = Ipv6Addr> {
const DNS_SUBNET: u16 = 0x2020;
documentation_ip6s(DNS_SUBNET, 256)
documentation_ip6s(DNS_SUBNET)
}
pub(crate) fn documentation_ip6s(subnet: u16, num_ips: usize) -> impl Strategy<Value = Ipv6Addr> {
let ips = Ipv6Network::new_truncate(
pub(crate) fn documentation_ip6s(subnet: u16) -> impl Strategy<Value = Ipv6Addr> {
let network = Ipv6Network::new_truncate(
Ipv6Addr::new(0x2001, 0xDB80, subnet, subnet, 0, 0, 0, 0),
32,
)
.unwrap()
.subnets_with_prefix(128)
.map(|n| n.network_address())
.take(num_ips)
.collect_vec();
.unwrap();
sample::select(ips)
let first = network.network_address().to_bits();
let last = network.last_address().to_bits();
(first..=last).prop_map(Ipv6Addr::from_bits)
}
pub(crate) fn system_dns_servers() -> impl Strategy<Value = Vec<IpAddr>> {