various: bail when --profile resolves to invalid path

Signed-off-by: NotAShelf <[email protected]>
Change-Id: I6a6a69640fea6789de7fd14d88a130fa0c488933

Author: NotAShelf

src/darwin.rs

@@ -57,6 +57,15 @@ impl DarwinRebuildArgs {
   ) -> Result<()> {
     use DarwinRebuildVariant::{Build, Switch};
 
+    if let Some(profile) = self.profile.as_ref() {
+      if !std::path::Path::new(profile).exists() {
+        bail!(
+          "--profile path provided but does not exist: {}",
+          profile.display()
+        );
+      }
+    }
+
     if nix::unistd::Uid::effective().is_root() && !self.bypass_root_check {
       bail!("Don't run nh os as root. I will call sudo internally as needed");
     }
@@ -155,10 +164,11 @@ impl DarwinRebuildArgs {
     }
 
     if matches!(variant, Switch) {
-      let profile_path = self.profile.as_ref().map_or_else(
-        || std::ffi::OsStr::new(SYSTEM_PROFILE),
-        |p| p.as_os_str(),
-      );
+      let profile_path = if let Some(profile) = self.profile.as_ref() {
+        profile.as_os_str()
+      } else {
+        std::ffi::OsStr::new(SYSTEM_PROFILE)
+      };
       Command::new("nix")
         .args(["build", "--no-link", "--profile"])
         .arg(profile_path)

src/home.rs

@@ -1,5 +1,8 @@
 use std::{env, ffi::OsString, path::PathBuf};
 
+const USER_PROFILE_PATH: &str = "/nix/var/nix/profiles/per-user";
+const HOME_PROFILE_PATH: &str = ".local/state/nix/profiles/home-manager";
+
 use color_eyre::{
   Result,
   eyre::{Context, bail, eyre},
@@ -99,27 +102,33 @@ impl HomeRebuildArgs {
       .run()
       .wrap_err("Failed to build Home-Manager configuration")?;
 
-    let prev_generation: Option<PathBuf> = if let Some(ref profile) =
-      self.profile
-    {
-      if profile.exists() {
-        Some(profile.clone())
-      } else {
-        None
+    if let Some(ref profile) = self.profile {
+      if !profile.exists() {
+        bail!(
+          "--profile path provided but does not exist: {}",
+          profile.display()
+        );
       }
-    } else {
-      [
-        PathBuf::from("/nix/var/nix/profiles/per-user")
+    }
+    let prev_generation: Option<PathBuf> =
+      if let Some(ref profile) = self.profile {
+        if profile.exists() {
+          Some(profile.clone())
+        } else {
+          None
+        }
+      } else {
+        let user_profile = PathBuf::from(USER_PROFILE_PATH)
           .join(env::var("USER").map_err(|_| eyre!("Couldn't get username"))?)
-          .join("home-manager"),
-        PathBuf::from(
+          .join("home-manager");
+        let home_profile = PathBuf::from(
           env::var("HOME").map_err(|_| eyre!("Couldn't get home directory"))?,
         )
-        .join(".local/state/nix/profiles/home-manager"),
-      ]
-      .into_iter()
-      .find(|next| next.exists())
-    };
+        .join(HOME_PROFILE_PATH);
+        [user_profile, home_profile]
+          .into_iter()
+          .find(|next| next.exists())
+      };
 
     debug!("Previous generation: {prev_generation:?}");
 

src/nixos.rs

@@ -82,6 +82,15 @@ impl OsRebuildArgs {
   ) -> Result<()> {
     use OsRebuildVariant::{Boot, Build, BuildVm, Switch, Test};
 
+    if let Some(profile) = self.profile.as_ref() {
+      if !std::path::Path::new(profile).exists() {
+        bail!(
+          "--profile path provided but does not exist: {}",
+          profile.display()
+        );
+      }
+    }
+
     if self.build_host.is_some() || self.target_host.is_some() {
       // if it fails its okay
       let _ = ensure_ssh_key_login();
@@ -330,10 +339,11 @@ impl OsRebuildArgs {
         .canonicalize()
         .context("Failed to resolve output path")?;
 
-      let system_profile_path = self.profile.as_ref().map_or_else(
-        || std::ffi::OsStr::new(SYSTEM_PROFILE),
-        |p| p.as_os_str(),
-      );
+      let system_profile_path = if let Some(profile) = self.profile.as_ref() {
+        profile.as_os_str()
+      } else {
+        std::ffi::OsStr::new(SYSTEM_PROFILE)
+      };
       Command::new("nix")
         .elevate(elevate.then_some(elevation.clone()))
         .args(["build", "--no-link", "--profile"])
@@ -406,10 +416,11 @@ impl OsRollbackArgs {
     info!("Rolling back to generation {}", target_generation.number);
 
     // Construct path to the generation
-    let system_profile_path = self
-      .profile
-      .as_deref()
-      .unwrap_or_else(|| Path::new(SYSTEM_PROFILE));
+    let system_profile_path = if let Some(profile) = self.profile.as_ref() {
+      profile.as_path()
+    } else {
+      Path::new(SYSTEM_PROFILE)
+    };
     let profile_dir = system_profile_path.parent().unwrap_or_else(|| {
       tracing::warn!(
         "SYSTEM_PROFILE has no parent, defaulting to /nix/var/nix/profiles"
@@ -478,10 +489,11 @@ impl OsRollbackArgs {
     info!("Setting system profile...");
 
     // Instead of direct symlink operations, use a command with proper elevation
-    let system_profile_path = self
-      .profile
-      .as_deref()
-      .unwrap_or_else(|| Path::new(SYSTEM_PROFILE));
+    let system_profile_path = if let Some(profile) = self.profile.as_ref() {
+      profile.as_path()
+    } else {
+      Path::new(SYSTEM_PROFILE)
+    };
     Command::new("ln")
             .arg("-sfn") // force, symbolic link
             .arg(&generation_link)
@@ -547,10 +559,12 @@ impl OsRollbackArgs {
           let current_gen_link =
             profile_dir.join(format!("system-{current_gen_number}-link"));
 
-          let system_profile_path = self
-            .profile
-            .as_deref()
-            .unwrap_or_else(|| Path::new(SYSTEM_PROFILE));
+          let system_profile_path = if let Some(profile) = self.profile.as_ref()
+          {
+            profile.as_path()
+          } else {
+            Path::new(SYSTEM_PROFILE)
+          };
           Command::new("ln")
                         .arg("-sfn") // Force, symbolic link
                         .arg(&current_gen_link)