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

revert: "chore(connlib): don't add routes for DNS sentinel servers" (#6775)

Browse Source 
Reverts firezone/firezone#6755

The problem was that ipv6 dns sentinel range falls outside the dns
resources ipv6 range..
This commit is contained in:
Jamil
2024-09-18 22:50:41 -07:00
committed by GitHub
parent 28e55ae420
commit fcea93bd66
2 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
rust/connlib/tunnel/src/client.rs
View File

@@ -815,6 +815,8 @@ impl ClientState {
.map(|(ip, _)| ip)
.chain(iter::once(IPV4_RESOURCES.into()))
.chain(iter::once(IPV6_RESOURCES.into()))
.chain(iter::once(DNS_SENTINELS_V4.into()))
.chain(iter::once(DNS_SENTINELS_V6.into()))
.chain(
self.internet_resource
.map(|_| Ipv4Network::DEFAULT_ROUTE.into()),
@@ -1841,7 +1843,9 @@ mod proptests {
resource_routes
.into_iter()
.chain(iter::once(IPV4_RESOURCES.into()))
.chain(iter::once(IPV6_RESOURCES.into())),
.chain(iter::once(IPV6_RESOURCES.into()))
.chain(iter::once(DNS_SENTINELS_V4.into()))
.chain(iter::once(DNS_SENTINELS_V6.into())),
)
}

22
rust/connlib/tunnel/src/tests/sim_client.rs
View File

@@ -947,15 +947,25 @@ fn ref_client(
}
fn default_routes_v4() -> Vec<Ipv4Network> {
vec![Ipv4Network::new(Ipv4Addr::new(100, 96, 0, 0), 11).unwrap()]
vec![
Ipv4Network::new(Ipv4Addr::new(100, 96, 0, 0), 11).unwrap(),
Ipv4Network::new(Ipv4Addr::new(100, 100, 111, 0), 24).unwrap(),
]
}
fn default_routes_v6() -> Vec<Ipv6Network> {
vec![Ipv6Network::new(
Ipv6Addr::new(0xfd00, 0x2021, 0x1111, 0x8000, 0, 0, 0, 0),
107,
)
.unwrap()]
vec![
Ipv6Network::new(
Ipv6Addr::new(0xfd00, 0x2021, 0x1111, 0x8000, 0, 0, 0, 0),
107,
)
.unwrap(),
Ipv6Network::new(
Ipv6Addr::new(0xfd00, 0x2021, 0x1111, 0x8000, 0x0100, 0x0100, 0x0111, 0),
120,
)
.unwrap(),
]
}
fn known_hosts() -> impl Strategy<Value = BTreeMap<String, Vec<IpAddr>>> {