From dcd350ec2c26a3f7e8f2fd425d43d9e363e28760 Mon Sep 17 00:00:00 2001 From: Christoffer Martinsson Date: Thu, 11 Dec 2025 10:59:00 +0100 Subject: [PATCH] Add NFS export permissions and network display, fix SMB service detection Display NFS exports with ro/rw permissions and network ranges for better visibility into share configuration. Support both smbd and samba-smbd service names for SMB share detection across different distributions. --- Cargo.lock | 6 +- agent/Cargo.toml | 2 +- agent/src/collectors/systemd.rs | 123 +++++++++++++++----------------- dashboard/Cargo.toml | 2 +- shared/Cargo.toml | 2 +- 5 files changed, 63 insertions(+), 72 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 50f0416..d795109 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -279,7 +279,7 @@ checksum = "a1d728cc89cf3aee9ff92b05e62b19ee65a02b5702cff7d5a377e32c6ae29d8d" [[package]] name = "cm-dashboard" -version = "0.1.272" +version = "0.1.273" dependencies = [ "anyhow", "chrono", @@ -301,7 +301,7 @@ dependencies = [ [[package]] name = "cm-dashboard-agent" -version = "0.1.272" +version = "0.1.273" dependencies = [ "anyhow", "async-trait", @@ -325,7 +325,7 @@ dependencies = [ [[package]] name = "cm-dashboard-shared" -version = "0.1.272" +version = "0.1.273" dependencies = [ "chrono", "serde", diff --git a/agent/Cargo.toml b/agent/Cargo.toml index f27d8f1..6273d2d 100644 --- a/agent/Cargo.toml +++ b/agent/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "cm-dashboard-agent" -version = "0.1.273" +version = "0.1.274" edition = "2021" [dependencies] diff --git a/agent/src/collectors/systemd.rs b/agent/src/collectors/systemd.rs index d53ae19..943c7fe 100644 --- a/agent/src/collectors/systemd.rs +++ b/agent/src/collectors/systemd.rs @@ -233,23 +233,22 @@ impl SystemdCollector { if service_name == "nfs-server" && status_info.active_state == "active" { // Add NFS exports as sub-services let exports = self.get_nfs_exports(); - for (export_path, options) in exports { - let metrics = Vec::new(); - let display = if !options.is_empty() { - format!("{} ({})", export_path, options) + for (export_path, info) in exports { + let display = if !info.is_empty() { + format!("{} {}", export_path, info) } else { export_path }; sub_services.push(SubServiceData { name: display, service_status: Status::Info, - metrics, + metrics: Vec::new(), service_type: "nfs_export".to_string(), }); } } - if service_name == "smbd" && status_info.active_state == "active" { + if (service_name == "smbd" || service_name == "samba-smbd") && status_info.active_state == "active" { // Add SMB shares as sub-services let shares = self.get_smb_shares(); for (share_name, share_path) in shares { @@ -1045,79 +1044,71 @@ impl SystemdCollector { } /// Get NFS exports from exportfs - /// Returns a list of (export_path, options) tuples + /// Returns a list of (export_path, info_string) tuples fn get_nfs_exports(&self) -> Vec<(String, String)> { - match Command::new("timeout") + let output = match Command::new("timeout") .args(["2", "exportfs", "-v"]) .output() { - Ok(output) if output.status.success() => { - let exports_output = String::from_utf8_lossy(&output.stdout); - let mut exports_map: std::collections::HashMap = std::collections::HashMap::new(); + Ok(output) if output.status.success() => output, + _ => return Vec::new(), + }; - for line in exports_output.lines() { - let line = line.trim(); - if line.is_empty() || line.starts_with('#') { - continue; - } + let exports_output = String::from_utf8_lossy(&output.stdout); + let mut exports_map: std::collections::HashMap> = + std::collections::HashMap::new(); + let mut current_path: Option = None; - // Format: "/path/to/export hostname(options)" or "/path/to/export 192.168.1.0/24(options)" - // Split only at first whitespace to get path and rest - let parts: Vec<&str> = line.splitn(2, char::is_whitespace).collect(); - if parts.is_empty() { - continue; - } + for line in exports_output.lines() { + let trimmed = line.trim(); - let export_path = parts[0].trim().to_string(); + if trimmed.is_empty() || trimmed.starts_with('#') { + continue; + } - // Find options in parentheses from the entire rest of the line - let options = if parts.len() > 1 { - let rest = parts[1].trim(); - // Find all text in parentheses (there might be spaces before the parentheses) - if let Some(start) = rest.find('(') { - if let Some(end) = rest.find(')') { - // Extract key options only: rw/ro, sync/async - let opts = rest[start+1..end].to_string(); - // Simplify options to just show key ones - let mut key_opts = Vec::new(); - if opts.contains("rw") { - key_opts.push("rw"); - } else if opts.contains("ro") { - key_opts.push("ro"); - } - if opts.contains("sync") { - key_opts.push("sync"); - } else if opts.contains("async") { - key_opts.push("async"); - } - if !key_opts.is_empty() { - key_opts.join(",") - } else { - String::new() - } - } else { - String::new() - } + if trimmed.starts_with('/') { + // New export path line + current_path = trimmed.split_whitespace().next().map(|s| s.to_string()); + } else if let Some(ref path) = current_path { + // Continuation line with network and options + // Format: "192.168.0.0/16(options...)" + if let Some(paren_pos) = trimmed.find('(') { + let network = trimmed[..paren_pos].trim(); + + // Extract ro/rw from options + if let Some(end_paren) = trimmed.find(')') { + let options = &trimmed[paren_pos+1..end_paren]; + let mode = if options.contains(",rw,") || options.ends_with(",rw") { + "rw" } else { - String::new() - } - } else { - String::new() - }; + "ro" + }; - // Only store the first occurrence of each path (deduplicates multiple clients) - exports_map.entry(export_path).or_insert(options); + exports_map.entry(path.clone()) + .or_insert_with(Vec::new) + .push((network.to_string(), mode.to_string())); + } + } + } + } + + // Build display strings: "path: mode [networks]" + let mut exports: Vec<(String, String)> = exports_map + .into_iter() + .map(|(path, mut entries)| { + if entries.is_empty() { + return (path, String::new()); } - // Convert HashMap to Vec - let mut exports: Vec<(String, String)> = exports_map.into_iter().collect(); - // Sort by path for consistent display - exports.sort_by(|a, b| a.0.cmp(&b.0)); + let mode = entries[0].1.clone(); + let networks: Vec = entries.drain(..).map(|(n, _)| n).collect(); + let info = format!("{} [{}]", mode, networks.join(", ")); + (path, info) + }) + .collect(); - exports - } - _ => Vec::new(), - } + exports.sort_by(|a, b| a.0.cmp(&b.0)); + exports } /// Get SMB shares from smb.conf diff --git a/dashboard/Cargo.toml b/dashboard/Cargo.toml index eb64802..2ed0bc7 100644 --- a/dashboard/Cargo.toml +++ b/dashboard/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "cm-dashboard" -version = "0.1.273" +version = "0.1.274" edition = "2021" [dependencies] diff --git a/shared/Cargo.toml b/shared/Cargo.toml index 7065966..c9089b4 100644 --- a/shared/Cargo.toml +++ b/shared/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "cm-dashboard-shared" -version = "0.1.273" +version = "0.1.274" edition = "2021" [dependencies]