Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 92a30913b4 | |||
| a288a8ef9a |
6
Cargo.lock
generated
6
Cargo.lock
generated
@@ -279,7 +279,7 @@ checksum = "a1d728cc89cf3aee9ff92b05e62b19ee65a02b5702cff7d5a377e32c6ae29d8d"
|
||||
|
||||
[[package]]
|
||||
name = "cm-dashboard"
|
||||
version = "0.1.247"
|
||||
version = "0.1.249"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"chrono",
|
||||
@@ -301,7 +301,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "cm-dashboard-agent"
|
||||
version = "0.1.247"
|
||||
version = "0.1.249"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"async-trait",
|
||||
@@ -325,7 +325,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "cm-dashboard-shared"
|
||||
version = "0.1.247"
|
||||
version = "0.1.249"
|
||||
dependencies = [
|
||||
"chrono",
|
||||
"serde",
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "cm-dashboard-agent"
|
||||
version = "0.1.248"
|
||||
version = "0.1.250"
|
||||
edition = "2021"
|
||||
|
||||
[dependencies]
|
||||
|
||||
@@ -920,12 +920,18 @@ impl SystemdCollector {
|
||||
|
||||
let output = match output {
|
||||
Ok(out) if out.status.success() => out,
|
||||
_ => return (String::new(), String::new()),
|
||||
_ => {
|
||||
debug!("Failed to run nft list ruleset");
|
||||
return (String::new(), String::new());
|
||||
}
|
||||
};
|
||||
|
||||
let output_str = match String::from_utf8(output.stdout) {
|
||||
Ok(s) => s,
|
||||
Err(_) => return (String::new(), String::new()),
|
||||
Err(_) => {
|
||||
debug!("Failed to parse nft output as UTF-8");
|
||||
return (String::new(), String::new());
|
||||
}
|
||||
};
|
||||
|
||||
let mut tcp_ports = std::collections::HashSet::new();
|
||||
@@ -933,26 +939,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;
|
||||
// Reset when exiting chain (closing brace) or entering other chains
|
||||
if line == "}" || (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 +967,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) {
|
||||
@@ -993,6 +991,8 @@ impl SystemdCollector {
|
||||
let tcp_str = tcp_vec.iter().map(|p| p.to_string()).collect::<Vec<_>>().join(", ");
|
||||
let udp_str = udp_vec.iter().map(|p| p.to_string()).collect::<Vec<_>>().join(", ");
|
||||
|
||||
debug!("nftables WAN ports - TCP: '{}', UDP: '{}'", tcp_str, udp_str);
|
||||
|
||||
(tcp_str, udp_str)
|
||||
}
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "cm-dashboard"
|
||||
version = "0.1.248"
|
||||
version = "0.1.250"
|
||||
edition = "2021"
|
||||
|
||||
[dependencies]
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "cm-dashboard-shared"
|
||||
version = "0.1.248"
|
||||
version = "0.1.250"
|
||||
edition = "2021"
|
||||
|
||||
[dependencies]
|
||||
|
||||
Reference in New Issue
Block a user