automatically determine if path is a directory

Author: j-chmielewski

src-tauri/src/app_config.rs

@@ -21,9 +21,9 @@ fn get_config_file_path(app: &AppHandle) -> PathBuf {
     if !config_file_path.exists() {
         create_dir_all(&config_file_path).expect("Failed to create missing app data dir");
     }
-    set_perms(&config_file_path, true);
+    set_perms(&config_file_path);
     config_file_path.push(APP_CONFIG_FILE_NAME);
-    set_perms(&config_file_path, false);
+    set_perms(&config_file_path);
     config_file_path
 }
 

src-tauri/src/bin/defguard-client.rs

@@ -287,8 +287,8 @@ fn main() {
                 .unwrap_or_else(|_| "UNDEFINED LOG DIRECTORY".into());
 
             // Ensure directories have appropriate permissions (dg25-28).
-            set_perms(&data_dir, true);
-            set_perms(&log_dir, true);
+            set_perms(&data_dir);
+            set_perms(&log_dir);
             info!(
                 "Application data (database file) will be stored in: {data_dir:?} and application logs in: {log_dir:?}. \
                 Logs of the background Defguard service responsible for managing VPN connections at the \

src-tauri/src/database/mod.rs

@@ -59,7 +59,7 @@ fn prepare_db_url() -> Result<String, Error> {
                 app_dir.to_string_lossy()
             );
         }
-        set_perms(&app_dir, true);
+        set_perms(&app_dir);
         let db_path = app_dir.join(DB_NAME);
         if db_path.exists() {
             debug!(
@@ -78,7 +78,7 @@ fn prepare_db_url() -> Result<String, Error> {
                 db_path.to_string_lossy()
             );
         }
-        set_perms(&db_path, false);
+        set_perms(&db_path);
         debug!(
             "Application's database file is located at: {}",
             db_path.to_string_lossy()

src-tauri/src/lib.rs

@@ -85,10 +85,10 @@ pub fn app_data_dir() -> Option<PathBuf> {
 /// Ensures path has appropriate permissions set (dg25-28):
 /// - 700 for directories
 /// - 600 for files
-pub fn set_perms(path: &PathBuf, is_directory: bool) {
+pub fn set_perms(path: &PathBuf) {
     #[cfg(not(windows))]
     {
-        let perms = if is_directory { 0o700 } else { 0o600 };
+        let perms = if path.is_dir() { 0o700 } else { 0o600 };
         if let Err(err) = set_permissions(path, Permissions::from_mode(perms)) {
             warn!("Failed to set permissions on path {path:?}: {err}");
         }