be resilient to bad lshw output (#2390)

Start9Labs · Aug 8, 2023 · 9322b3d · 9322b3d
1 parent 55f5329
commit 9322b3d
Showing 1 changed file with 16 additions and 2 deletions.
diff --git a/backend/src/util/lshw.rs b/backend/src/util/lshw.rs
@@ -44,6 +44,20 @@ pub async fn lshw() -> Result<Vec<LshwDevice>, Error> {
     for class in KNOWN_CLASSES {
         cmd.arg("-class").arg(*class);
     }
-    serde_json::from_slice(&cmd.invoke(crate::ErrorKind::Lshw).await?)
-        .with_kind(crate::ErrorKind::Deserialization)
+    Ok(
+        serde_json::from_slice::<Vec<serde_json::Value>>(
+            &cmd.invoke(crate::ErrorKind::Lshw).await?,
+        )
+        .with_kind(crate::ErrorKind::Deserialization)?
+        .into_iter()
+        .filter_map(|v| match serde_json::from_value(v) {
+            Ok(a) => Some(a),
+            Err(e) => {
+                tracing::error!("Failed to parse lshw output: {e}");
+                tracing::debug!("{e:?}");
+                None
+            }
+        })
+        .collect(),
+    )
 }