Git-Mirrors/veilid
1
0
Fork 0
mirror of https://gitlab.com/veilid/veilid.git synced 2024-10-01 01:26:08 -04:00
Code Issues Packages Projects Releases Wiki Activity

better version

Browse Source
This commit is contained in:
Christien Rioux 2024-01-19 22:10:10 -05:00
parent 617d059eb5
commit 599677bb2d
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
veilid-server/src/settings.rs
View File

@ -806,13 +806,23 @@ impl Settings {
.unwrap_or_else(|| PathBuf::from("./veilid-server.conf")) .unwrap_or_else(|| PathBuf::from("./veilid-server.conf"))
} }
#[allow(dead_code)] fn get_or_create_private_directory<P: AsRef<Path>>(path: P, group_read: bool) -> bool {
let path = path.as_ref();
if !path.is_dir()
&& (std::fs::create_dir_all(path).is_err()
|| ensure_directory_private_owner(path, group_read).is_err())
{
return false;
}
true
}
fn get_or_create_default_directory(subpath: &str) -> PathBuf { fn get_or_create_default_directory(subpath: &str) -> PathBuf {
#[cfg(unix)] #[cfg(unix)]
if PathBuf::from("/var/db/veilid-server").is_dir() { {
let globalpath = PathBuf::from("/var/db/veilid-server").join(subpath); let globalpath = PathBuf::from("/var/db/veilid-server").join(subpath);
let _ = std::fs::create_dir_all(&globalpath);
if globalpath.is_dir() { if Self::get_or_create_private_directory(&globalpath, true) {
return globalpath; return globalpath;
} }
} }
@ -823,9 +833,12 @@ impl Settings {
PathBuf::from("./") PathBuf::from("./")
}; };
ts_path.push(subpath); ts_path.push(subpath);
let _ = std::fs::create_dir_all(&ts_path);
ts_path if Self::get_or_create_private_directory(&ts_path, true) {
return ts_path;
}
panic!("Failed to create private directory for '{}'", subpath);
} }
pub fn get_default_ipc_directory() -> PathBuf { pub fn get_default_ipc_directory() -> PathBuf {