feat: allow ~user/ in path names, not just ~/

Add the home-dir crate as a dependency for tilde expansion.

Sponsored-by: author

1 files changed, 12 insertions, 7 deletions

diff --git a/src/config.rs b/src/config.rs
index 6829151..9e91eb4 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -53,6 +53,10 @@ pub enum ConfigurationError {
     /// YAML parsing error.
     #[error(transparent)]
     YamlError(#[from] serde_yaml::Error),
+
+    /// Error expanding a ~user in a path name.
+    #[error(transparent)]
+    HomeDirError(#[from] home_dir::Error)
 }
 
 impl Configuration {
@@ -63,7 +67,7 @@ impl Configuration {
             let config = fs::read(filename)
                 .map_err(|err| ConfigurationError::ReadError(filename.to_path_buf(), err))?;
             let mut config: Configuration = serde_yaml::from_slice(&config)?;
-            config.expand_tildes();
+            config.expand_tildes()?;
             config.fill_in_missing_networks();
             debug!("config: {:#?}", config);
             Ok(config)
@@ -78,11 +82,12 @@ impl Configuration {
         }
     }
 
-    fn expand_tildes(&mut self) {
-        expand_optional_pathbuf(&mut self.default_base_image);
-        expand_optional_pathbuf(&mut self.image_directory);
-        expand_optional_pathbuf(&mut self.image_directory);
-        expand_optional_pathbuf(&mut self.ca_key);
-        expand_optional_pathbufs(&mut self.authorized_keys)
+    fn expand_tildes(&mut self) -> Result<(), home_dir::Error> {
+        expand_optional_pathbuf(&mut self.default_base_image)?;
+        expand_optional_pathbuf(&mut self.image_directory)?;
+        expand_optional_pathbuf(&mut self.image_directory)?;
+        expand_optional_pathbuf(&mut self.ca_key)?;
+        expand_optional_pathbufs(&mut self.authorized_keys)?;
+        Ok(())
     }
 }