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

chore(gateway): remove dead IP detection (#5618)

Browse Source 
This does not work as well as intended and spams the logs. We may need
#5542 before we can implement this properly.

Fixes: #5593.
This commit is contained in:
Thomas Eizinger
2024-06-28 14:47:00 +10:00
committed by GitHub
parent fc8d89ea73
commit ed34ca096b
1 changed files with 1 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

129
rust/connlib/tunnel/src/peer.rs
View File

@@ -1,4 +1,4 @@
use std::collections::{BTreeMap, BTreeSet, HashMap, HashSet, VecDeque};
use std::collections::{HashMap, HashSet, VecDeque};
use std::net::{IpAddr, Ipv4Addr, Ipv6Addr};
use std::time::{Duration, Instant};
@@ -303,8 +303,6 @@ impl ClientOnGateway {
});
}
self.check_for_dead_ips(now);
self.nat_table.handle_timeout(now);
}
@@ -473,32 +471,6 @@ impl ClientOnGateway {
pub fn id(&self) -> ClientId {
self.id
}
/// Check all [`TranslationState`]s for dead but used IPs.
///
/// We don't want to be spamming this warning but it also shouldn't go unnoticed.
/// Thus, the strategy is to only print the log if:
/// - An IP has recently been used (we have seen outgoing traffic in the last 30s)
/// - An IP has not responded in the last 10s
fn check_for_dead_ips(&self, now: Instant) {
let mut dead_ips = BTreeMap::<DomainName, BTreeSet<IpAddr>>::new();
for state in self.permanent_translations.values() {
if state.is_used(now) && state.is_dead(now) {
dead_ips
.entry(state.name.clone())
.or_default()
.insert(state.resolved_ip);
}
}
if !dead_ips.is_empty() {
tracing::warn!(
?dead_ips,
"Dead IPs detected (never received any traffic); check your DNS configuration"
);
}
}
}
impl GatewayOnClient {
@@ -568,23 +540,6 @@ impl TranslationState {
}
}
/// We define a [`TranslationState`] as dead if we have seen outgoing traffic that is at least 10s old and _never_ received incoming traffic.
fn is_dead(&self, now: Instant) -> bool {
let sent_at_least_one_packet_10s_ago = self
.first_outgoing
.is_some_and(|first_outgoing| now.duration_since(first_outgoing) >= Self::USED_WINDOW);
let received_no_packets = self.last_incoming.is_none();
sent_at_least_one_packet_10s_ago && received_no_packets
}
/// We define a [`TranslationState`] as used if we have seen outgoing traffic in the last 10s.
fn is_used(&self, now: Instant) -> bool {
self.last_outgoing.is_some_and(|last_outgoing| {
now.duration_since(last_outgoing) <= Duration::from_secs(10)
})
}
fn is_expired(&self, now: Instant) -> bool {
// Note: we don't need to check that it's used here because the ack grace period already implies it
self.ack_grace_period_expired(now) && self.no_incoming_in_120s(now)
@@ -730,37 +685,6 @@ mod tests {
));
}
#[test]
fn initial_translation_state_is_not_dead() {
let now = Instant::now();
let state = TranslationState::new(
ResourceId::random(),
"example.com".parse().unwrap(),
IpAddr::V4(Ipv4Addr::LOCALHOST),
now,
);
assert!(!state.is_dead(now))
}
#[test]
fn initial_translation_state_is_not_active_if_last_packet_was_more_than_30s_ago() {
let mut now = Instant::now();
let mut state = TranslationState::new(
ResourceId::random(),
"example.com".parse().unwrap(),
IpAddr::V4(Ipv4Addr::LOCALHOST),
now,
);
now += Duration::from_secs(5);
state.on_outgoing_traffic(now);
now += Duration::from_secs(31);
assert!(!state.is_used(now))
}
#[test]
fn initial_translation_state_is_not_expired() {
let now = Instant::now();
@@ -1028,57 +952,6 @@ mod tests {
assert!(state.is_expired(now));
}
#[test]
fn initial_translation_state_is_active_if_last_packet_was_1s_ago() {
let mut now = Instant::now();
let mut state = TranslationState::new(
ResourceId::random(),
"example.com".parse().unwrap(),
IpAddr::V4(Ipv4Addr::LOCALHOST),
now,
);
now += Duration::from_secs(5);
state.on_outgoing_traffic(now);
now += Duration::from_secs(1);
assert!(state.is_used(now))
}
#[test]
fn is_only_dead_if_initial_outgoing_traffic_is_at_least_10s_old() {
let mut now = Instant::now();
let mut state = TranslationState::new(
ResourceId::random(),
"example.com".parse().unwrap(),
IpAddr::V4(Ipv4Addr::LOCALHOST),
now,
);
now += Duration::from_secs(1);
state.on_outgoing_traffic(now);
assert!(
!state.is_dead(now),
"1 second after outgoing traffic is not yet dead"
);
now += Duration::from_secs(9);
state.on_outgoing_traffic(now);
assert!(
!state.is_dead(now),
"9 second after outgoing traffic is not yet dead"
);
now += Duration::from_secs(1);
state.on_outgoing_traffic(now);
assert!(
state.is_dead(now),
"10 second after outgoing traffic is not yet dead"
);
}
fn source_v4_addr() -> Ipv4Addr {
"100.64.0.1".parse().unwrap()
}