diff --git a/Cargo.lock b/Cargo.lock index dacdd85..a2e062a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -279,7 +279,7 @@ checksum = "a1d728cc89cf3aee9ff92b05e62b19ee65a02b5702cff7d5a377e32c6ae29d8d" [[package]] name = "cm-dashboard" -version = "0.1.247" +version = "0.1.248" dependencies = [ "anyhow", "chrono", @@ -301,7 +301,7 @@ dependencies = [ [[package]] name = "cm-dashboard-agent" -version = "0.1.247" +version = "0.1.248" dependencies = [ "anyhow", "async-trait", @@ -325,7 +325,7 @@ dependencies = [ [[package]] name = "cm-dashboard-shared" -version = "0.1.247" +version = "0.1.248" dependencies = [ "chrono", "serde", diff --git a/agent/Cargo.toml b/agent/Cargo.toml index bb570b4..28bde9d 100644 --- a/agent/Cargo.toml +++ b/agent/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "cm-dashboard-agent" -version = "0.1.248" +version = "0.1.249" edition = "2021" [dependencies] diff --git a/agent/src/collectors/systemd.rs b/agent/src/collectors/systemd.rs index cb51252..588f9ca 100644 --- a/agent/src/collectors/systemd.rs +++ b/agent/src/collectors/systemd.rs @@ -933,26 +933,26 @@ impl SystemdCollector { // Parse nftables output for WAN incoming accept rules with dport // Looking for patterns like: tcp dport 22 accept or tcp dport { 22, 80, 443 } accept - // Only include rules in input chain without private network source restrictions - let mut in_input_chain = false; + // Only include rules in input_wan chain + let mut in_wan_chain = false; for line in output_str.lines() { let line = line.trim(); - // Track if we're in the input chain - if line.contains("chain input") || line.contains("chain INPUT") { - in_input_chain = true; + // Track if we're in the input_wan chain + if line.contains("chain input_wan") { + in_wan_chain = true; continue; } // Reset when entering other chains - if line.starts_with("chain ") && !line.contains("input") && !line.contains("INPUT") { - in_input_chain = false; + if line.starts_with("chain ") && !line.contains("input_wan") { + in_wan_chain = false; continue; } - // Only process rules in input chain - if !in_input_chain { + // Only process rules in input_wan chain + if !in_wan_chain { continue; } @@ -961,14 +961,6 @@ impl SystemdCollector { continue; } - // Skip internal network traffic (LAN/private networks) - if line.contains("ip saddr 192.168.") || - line.contains("ip saddr 10.") || - line.contains("ip saddr 172.16.") || - line.contains("iifname \"lo\"") { - continue; - } - // Parse TCP ports if line.contains("tcp dport") { for port in self.extract_ports_from_nft_rule(line) { diff --git a/dashboard/Cargo.toml b/dashboard/Cargo.toml index 30e67f1..8877d0a 100644 --- a/dashboard/Cargo.toml +++ b/dashboard/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "cm-dashboard" -version = "0.1.248" +version = "0.1.249" edition = "2021" [dependencies] diff --git a/shared/Cargo.toml b/shared/Cargo.toml index 7748d6f..04a9945 100644 --- a/shared/Cargo.toml +++ b/shared/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "cm-dashboard-shared" -version = "0.1.248" +version = "0.1.249" edition = "2021" [dependencies]