refactor(health): separate user namespaces and fuse issues

pkgforge · Oct 30, 2024 · 4b7fd4f · 4b7fd4f
1 parent 286743e
commit 4b7fd4f
Showing 1 changed file with 36 additions and 24 deletions.
diff --git a/src/core/health.rs b/src/core/health.rs
@@ -47,9 +47,11 @@ pub async fn check_health() {
         Box::pin(check_userns_restrict()),
         Box::pin(check_apparmor_restrict()),
         Box::pin(check_capabilities()),
-        Box::pin(check_fusermount()),
     ];
 
+    println!("{0}  FUSE CHECK {0}", "☵".repeat(4));
+    check_fusermount().await;
+
     let results = join_all(checks).await;
 
     results.into_iter().for_each(|result| {
@@ -58,18 +60,22 @@ pub async fn check_health() {
         }
     });
 
+    println!();
+
+    println!("{0}  USER NAMESPACE CHECK {0}", "☵".repeat(4));
     for error in &errors {
         warn!("{}", error);
+    }
+
+    if errors.is_empty() {
+        success!("User namespace checked successfully.")
+    } else {
         println!(
             "{} {}",
             "More info at:".color(Color::Cyan),
             "https://l.ajam.dev/namespace".color(Color::Blue)
         )
     }
-
-    if errors.is_empty() {
-        success!("Everything is in order.")
-    }
 }
 
 async fn check_unprivileged_userns_clone() -> Option<&'static str> {
@@ -126,34 +132,40 @@ async fn check_capabilities() -> Option<&'static str> {
     None
 }
 
-async fn check_fusermount() -> Option<&'static str> {
+async fn check_fusermount() {
+    let mut error = String::new();
+
     match which::which("fusermount") {
         Ok(path) => match path.metadata() {
             Ok(meta) => {
                 let permissions = meta.permissions().mode();
                 if permissions != 0o104755 {
-                    return Some(Box::leak(
-                        format!(
-                            "Invalid {} file mode bits. Set 4755 for {}",
-                            "fusermount".color(Color::Blue),
-                            path.to_string_lossy().color(Color::Green)
-                        )
-                        .into_boxed_str(),
-                    ) as &'static str);
+                    error = format!(
+                        "Invalid {} file mode bits. Set 4755 for {}",
+                        "fusermount".color(Color::Blue),
+                        path.to_string_lossy().color(Color::Green)
+                    );
                 }
             }
-            Err(_) => return Some("Unable to read fusermount"),
+            Err(_) => error = "Unable to read fusermount".to_string(),
         },
         Err(_) => {
-            return Some(Box::leak(
-                format!(
-                    "{} not found. Please install {}",
-                    "fusermount".color(Color::Blue),
-                    "fuse".color(Color::Blue)
-                )
-                .into_boxed_str(),
-            ))
+            error = format!(
+                "{} not found. Please install {}",
+                "fusermount".color(Color::Blue),
+                "fuse".color(Color::Blue)
+            );
         }
     }
-    None
+
+    if !error.is_empty() {
+        warn!(
+            "{}\n{} {}",
+            error,
+            "More info at:".color(Color::Cyan),
+            "https://l.ajam.dev/fuse".color(Color::Blue)
+        );
+    } else {
+        success!("Fuse checked successfully.");
+    }
 }