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

test(connlib): use same tunnel IP subnets as real code (#5162)

Browse Source 
This doesn't really matter for the functionality of the test because in
connlib, we don't expect the IPs to adhere to a certain range.
Nevertheless, to make output more readable, it is nicer if these IPs
match what we also see in production logs.
This commit is contained in:
Thomas Eizinger
2024-05-30 13:21:08 +10:00
committed by GitHub
parent 20cfcac7da
commit 73085f2f00
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
rust/connlib/tunnel/src/tests.rs
View File

@@ -10,7 +10,7 @@ use connlib_shared::{
StaticSecret,
};
use firezone_relay::{AddressFamily, AllocationPort, ClientSocket, PeerSocket};
use ip_network::Ipv4Network;
use ip_network::{Ipv4Network, Ipv6Network};
use ip_network_table::IpNetworkTable;
use ip_packet::MutableIpPacket;
use pretty_assertions::assert_eq;
@@ -1477,9 +1477,10 @@ fn gateway_id() -> impl Strategy<Value = GatewayId> {
/// Generates an IPv4 address for the tunnel interface.
///
/// We use the CG-NAT range for IPv4.
/// See <https://github.com/firezone/firezone/blob/81dfa90f38299595e14ce9e022d1ee919909f124/elixir/apps/domain/lib/domain/network.ex#L7>.
fn tunnel_ip4() -> impl Strategy<Value = Ipv4Addr> {
any::<sample::Index>().prop_map(|idx| {
let cgnat_block = Ipv4Network::new(Ipv4Addr::new(100, 64, 0, 0), 10).unwrap();
let cgnat_block = Ipv4Network::new(Ipv4Addr::new(100, 64, 0, 0), 11).unwrap();
let mut hosts = cgnat_block.hosts();
@@ -1489,9 +1490,19 @@ fn tunnel_ip4() -> impl Strategy<Value = Ipv4Addr> {
/// Generates an IPv6 address for the tunnel interface.
///
/// TODO: Which subnet do we use here?
/// See <https://github.com/firezone/firezone/blob/81dfa90f38299595e14ce9e022d1ee919909f124/elixir/apps/domain/lib/domain/network.ex#L8>.
fn tunnel_ip6() -> impl Strategy<Value = Ipv6Addr> {
any::<Ipv6Addr>()
any::<sample::Index>().prop_map(|idx| {
let cgnat_block =
Ipv6Network::new(Ipv6Addr::new(64_768, 8_225, 4_369, 0, 0, 0, 0, 0), 107).unwrap();
let mut subnets = cgnat_block.subnets_with_prefix(128);
subnets
.nth(idx.index(subnets.len()))
.unwrap()
.network_address()
})
}
fn sim_node_prototype<ID>(