From 9b940ebd1922a5adc418a54bc4fd271f6ae04b2a Mon Sep 17 00:00:00 2001
From: Christoffer Martinsson <cm@cmtec.se>
Date: Sun, 23 Nov 2025 14:52:09 +0100
Subject: [PATCH] Fix string slicing bounds error in metric parsing

Fixed critical bug where dashboard crashed with 'begin <= end' slice error
when parsing disk metrics with new naming format. Added bounds checking
to prevent invalid string slicing operations.

- Fixed extract_pool_name string slicing bounds check
- Removed ineffective panic handling that caused infinite loop
- Dashboard now handles new disk collector metrics correctly
---
 Cargo.lock                         |  6 +++---
 agent/Cargo.toml                   |  2 +-
 dashboard/Cargo.toml               |  2 +-
 dashboard/src/ui/widgets/system.rs | 24 +++++++-----------------
 shared/Cargo.toml                  |  2 +-
 5 files changed, 13 insertions(+), 23 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 0564330..868a1a3 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -279,7 +279,7 @@ checksum = "a1d728cc89cf3aee9ff92b05e62b19ee65a02b5702cff7d5a377e32c6ae29d8d"
 
 [[package]]
 name = "cm-dashboard"
-version = "0.1.110"
+version = "0.1.111"
 dependencies = [
  "anyhow",
  "chrono",
@@ -301,7 +301,7 @@ dependencies = [
 
 [[package]]
 name = "cm-dashboard-agent"
-version = "0.1.110"
+version = "0.1.111"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -324,7 +324,7 @@ dependencies = [
 
 [[package]]
 name = "cm-dashboard-shared"
-version = "0.1.110"
+version = "0.1.111"
 dependencies = [
  "chrono",
  "serde",
diff --git a/agent/Cargo.toml b/agent/Cargo.toml
index 82aaea5..75909dd 100644
--- a/agent/Cargo.toml
+++ b/agent/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cm-dashboard-agent"
-version = "0.1.111"
+version = "0.1.112"
 edition = "2021"
 
 [dependencies]
diff --git a/dashboard/Cargo.toml b/dashboard/Cargo.toml
index d4ff14c..515fc47 100644
--- a/dashboard/Cargo.toml
+++ b/dashboard/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cm-dashboard"
-version = "0.1.111"
+version = "0.1.112"
 edition = "2021"
 
 [dependencies]
diff --git a/dashboard/src/ui/widgets/system.rs b/dashboard/src/ui/widgets/system.rs
index 63c78c5..d4a9ea8 100644
--- a/dashboard/src/ui/widgets/system.rs
+++ b/dashboard/src/ui/widgets/system.rs
@@ -163,11 +163,7 @@ impl SystemWidget {
         
         for metric in metrics {
             if metric.name.starts_with("disk_") {
-                // Wrap individual metric parsing in error handling
-                if let Ok(pool_name) = std::panic::catch_unwind(std::panic::AssertUnwindSafe(|| {
-                    self.extract_pool_name(&metric.name)
-                })) {
-                    if let Some(pool_name) = pool_name {
+                if let Some(pool_name) = self.extract_pool_name(&metric.name) {
                     let mount_point = self.get_mount_point_for_pool(&pool_name);
                     let pool = pools.entry(pool_name.clone()).or_insert_with(|| StoragePool {
                         name: pool_name.clone(),
@@ -332,10 +328,7 @@ impl SystemWidget {
                             }
                         }
                     }
-                    }  // Close pool_name Some check
-                } else {
-                    tracing::warn!("Failed to extract pool name from metric: {}", metric.name);
-                }  // Close error handling for extract_pool_name
+                }
             }
         }
 
@@ -357,7 +350,9 @@ impl SystemWidget {
                 // Find the second-to-last underscore to get pool name
                 let before_suffix = &metric_name[..suffix_pos];
                 if let Some(drive_start) = before_suffix.rfind('_') {
-                    return Some(metric_name[5..drive_start].to_string()); // Skip "disk_"
+                    if drive_start > 5 {
+                        return Some(metric_name[5..drive_start].to_string()); // Skip "disk_"
+                    }
                 }
             }
             // Handle filesystem metrics: disk_{pool}_fs_{filesystem}_{metric}
@@ -712,13 +707,8 @@ impl Widget for SystemWidget {
             }
         }
 
-        // Update storage from all disk metrics (with error handling)
-        if let Err(e) = std::panic::catch_unwind(std::panic::AssertUnwindSafe(|| {
-            self.update_storage_from_metrics(metrics);
-        })) {
-            tracing::error!("Storage metrics parsing failed, continuing with empty storage: {:?}", e);
-            self.storage_pools = Vec::new();
-        }
+        // Update storage from all disk metrics
+        self.update_storage_from_metrics(metrics);
     }
 
 }
diff --git a/shared/Cargo.toml b/shared/Cargo.toml
index 10223f5..7e5b0c0 100644
--- a/shared/Cargo.toml
+++ b/shared/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cm-dashboard-shared"
-version = "0.1.111"
+version = "0.1.112"
 edition = "2021"
 
 [dependencies]