web-passwd

Author: wesl-ee

Cargo.lock

@@ -37,4 +37,5 @@ serde_json = "1.0"
 chrono = "0.4"
 jsonwebtoken = "9.0"
 bcrypt = "0.17"
+user_dirs = "0.2"
 

hooyad/Cargo.toml

@@ -1,5 +1,5 @@
-use std::path::PathBuf;
 use std::fs;
+use std::path::PathBuf;
 
 pub const DEFAULT_HOOYAD_ENDPOINT: &str = "127.0.0.1:8531";
 
@@ -20,7 +20,9 @@ impl RuntimeConfig {
         Ok(())
     }
 
-    pub fn ensure_filestore_structure(&self) -> Result<(), Box<dyn std::error::Error>> {
+    pub fn ensure_filestore_structure(
+        &self,
+    ) -> Result<(), Box<dyn std::error::Error>> {
         self.ensure_data_dir()?;
         fs::create_dir_all(self.data_dir.join("store"))?;
         fs::create_dir_all(self.data_dir.join("forgotten"))?;
@@ -38,23 +40,30 @@ impl RuntimeConfig {
     }
 
     pub fn web_password_hash_path(&self) -> PathBuf {
-        self.data_dir.join("web-password-hash")
+        self.data_dir.join("web-passwd")
     }
 
-    pub fn store_password_hash(&self, password: &str) -> Result<(), Box<dyn std::error::Error>> {
+    pub fn store_password_hash(
+        &self,
+        password: &str,
+    ) -> Result<(), Box<dyn std::error::Error>> {
         use bcrypt::{hash, DEFAULT_COST};
         self.ensure_data_dir()?;
         let hashed = hash(password, DEFAULT_COST)?;
         fs::write(self.web_password_hash_path(), hashed)?;
         Ok(())
     }
 
-    pub fn load_password_hash(&self) -> Result<String, Box<dyn std::error::Error>> {
+    pub fn load_password_hash(
+        &self,
+    ) -> Result<String, Box<dyn std::error::Error>> {
         let hash_content = fs::read_to_string(self.web_password_hash_path())?;
         Ok(hash_content.trim().to_string())
     }
 
-    pub fn ensure_password_exists(&self) -> Result<Option<String>, Box<dyn std::error::Error>> {
+    pub fn ensure_password_exists(
+        &self,
+    ) -> Result<Option<String>, Box<dyn std::error::Error>> {
         let hash_file = self.web_password_hash_path();
 
         if hash_file.exists() {
@@ -63,7 +72,8 @@ impl RuntimeConfig {
 
         // Generate new password
         use rand::Rng;
-        const CHARSET: &[u8] = b"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
+        const CHARSET: &[u8] =
+            b"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
         let mut rng = rand::thread_rng();
         let password: String = (0..16)
             .map(|_| {

hooyad/src/config.rs

@@ -15,12 +15,7 @@ use hooya::runtime::Runtime;
 use rand::distributions::DistString;
 use sqlx::migrate::MigrateDatabase;
 use sqlx::{Sqlite, SqlitePool};
-use std::{
-    fs::File,
-    io::Write,
-    path::PathBuf,
-    pin::Pin,
-};
+use std::{fs::File, io::Write, path::PathBuf, pin::Pin};
 use tokio_stream::StreamExt;
 use tonic::{transport::Server, Request, Response, Status};
 
@@ -415,14 +410,14 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
         .arg(Arg::new("db-uri").long("db-uri").env("HOOYAD_DB_URI"))
         .get_matches();
 
-    // Apply XDG logic if using default path
-    let mut filestore_path = matches.get_one::<PathBuf>("filestore").unwrap().clone();
-    if filestore_path == PathBuf::from(".hooya") && !std::env::var("HOOYAD_FILESTORE").is_ok() {
-        if let Ok(xdg_pictures_dir) = std::env::var("XDG_PICTURES_DIR") {
-            let xdg_pictures_path = std::path::Path::new(&xdg_pictures_dir);
-            if xdg_pictures_path.is_dir() {
-                filestore_path = xdg_pictures_path.join("hooya");
-            }
+    // Apply cross-platform user directory logic if using default path
+    let mut filestore_path =
+        matches.get_one::<PathBuf>("filestore").unwrap().clone();
+    if filestore_path == PathBuf::from(".hooya")
+        && !std::env::var("HOOYAD_FILESTORE").is_ok()
+    {
+        if let Ok(data_dir) = user_dirs::data_dir() {
+            filestore_path = data_dir.join("hooya");
         }
     }
 
@@ -452,10 +447,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
     Server::builder()
         .accept_http1(true)
         .add_service(ControlServer::new(IControl {
-            runtime: Runtime {
-                filestore_path,
-                db,
-            },
+            runtime: Runtime { filestore_path, db },
         }))
         .serve(matches.get_one::<String>("endpoint").unwrap().parse()?)
         .await?;