herocode/herodb
12
0
Fork 0
Code Issues 6 Pull Requests Actions Packages Projects Releases Wiki Activity

don't use strings for paths

Browse Source
This commit is contained in:
Maxime Van Hees
2025-09-25 16:25:08 +02:00
parent 7f689ae29b
commit 77a53bae86
13 changed files with 54 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
src/admin_meta.rs
View File

@@ -1,4 +1,4 @@
use std::path::PathBuf;
use std::path::{Path, PathBuf};
use std::sync::{Arc, OnceLock, Mutex, RwLock};
use std::collections::HashMap;
@@ -35,11 +35,11 @@ static DATA_STORAGES: OnceLock<RwLock<HashMap<u64, Arc<dyn StorageBackend>>>> =
static DATA_INIT_LOCK: Mutex<()> = Mutex::new(());
fn init_admin_storage(
base_dir: &str,
base_dir: &Path,
backend: options::BackendType,
admin_secret: &str,
) -> Result<Arc<dyn StorageBackend>, DBError> {
let db_file = PathBuf::from(base_dir).join("0.db");
let db_file = base_dir.join("0.db");
if let Some(parent_dir) = db_file.parent() {
std::fs::create_dir_all(parent_dir).map_err(|e| {
DBError(format!("Failed to create directory {}: {}", parent_dir.display(), e))
@@ -57,24 +57,25 @@ fn init_admin_storage(
// Get or initialize a cached handle to admin DB 0 per base_dir (thread-safe, no double-open race)
pub fn open_admin_storage(
base_dir: &str,
base_dir: &Path,
backend: options::BackendType,
admin_secret: &str,
) -> Result<Arc<dyn StorageBackend>, DBError> {
let map = ADMIN_STORAGES.get_or_init(|| RwLock::new(HashMap::new()));
let key = base_dir.display().to_string();
// Fast path
if let Some(st) = map.read().unwrap().get(base_dir) {
if let Some(st) = map.read().unwrap().get(&key) {
return Ok(st.clone());
}
// Slow path with write lock
{
let mut w = map.write().unwrap();
if let Some(st) = w.get(base_dir) {
if let Some(st) = w.get(&key) {
return Ok(st.clone());
}
// Detect existing 0.db backend by filesystem, if present.
let admin_path = PathBuf::from(base_dir).join("0.db");
let admin_path = base_dir.join("0.db");
let detected = if admin_path.exists() {
if admin_path.is_file() {
Some(options::BackendType::Redb)
@@ -102,14 +103,14 @@ pub fn open_admin_storage(
};
let st = init_admin_storage(base_dir, effective_backend, admin_secret)?;
w.insert(base_dir.to_string(), st.clone());
w.insert(key, st.clone());
Ok(st)
}
}
// Ensure admin structures exist in encrypted DB 0
pub fn ensure_bootstrap(
base_dir: &str,
base_dir: &Path,
backend: options::BackendType,
admin_secret: &str,
) -> Result<(), DBError> {
@@ -125,7 +126,7 @@ pub fn ensure_bootstrap(
// Get or initialize a shared handle to a data DB (> 0), avoiding double-open across subsystems
pub fn open_data_storage(
base_dir: &str,
base_dir: &Path,
backend: options::BackendType,
admin_secret: &str,
id: u64,
@@ -159,7 +160,7 @@ pub fn open_data_storage(
// 2) If missing, sniff filesystem (file => Redb, dir => Sled), then persist into admin meta
// 3) Fallback to requested 'backend' (startup default) if nothing else is known
let meta_backend = get_database_backend(base_dir, backend.clone(), admin_secret, id).ok().flatten();
let db_path = PathBuf::from(base_dir).join(format!("{}.db", id));
let db_path = base_dir.join(format!("{}.db", id));
let sniffed_backend = if db_path.exists() {
if db_path.is_file() {
Some(options::BackendType::Redb)
@@ -214,7 +215,7 @@ pub fn open_data_storage(
// Allocate the next DB id and persist new pointer
pub fn allocate_next_id(
base_dir: &str,
base_dir: &Path,
backend: options::BackendType,
admin_secret: &str,
) -> Result<u64, DBError> {
@@ -238,7 +239,7 @@ pub fn allocate_next_id(
// Check existence of a db id in admin:dbs
pub fn db_exists(
base_dir: &str,
base_dir: &Path,
backend: options::BackendType,
admin_secret: &str,
id: u64,
@@ -249,7 +250,7 @@ pub fn db_exists(
// Get per-db encryption key, if any
pub fn get_enc_key(
base_dir: &str,
base_dir: &Path,
backend: options::BackendType,
admin_secret: &str,
id: u64,
@@ -260,7 +261,7 @@ pub fn get_enc_key(
// Set per-db encryption key (called during create)
pub fn set_enc_key(
base_dir: &str,
base_dir: &Path,
backend: options::BackendType,
admin_secret: &str,
id: u64,
@@ -272,7 +273,7 @@ pub fn set_enc_key(
// Set database public flag
pub fn set_database_public(
base_dir: &str,
base_dir: &Path,
backend: options::BackendType,
admin_secret: &str,
id: u64,
@@ -286,7 +287,7 @@ pub fn set_database_public(
// Persist per-db backend type in admin metadata (module-scope)
pub fn set_database_backend(
base_dir: &str,
base_dir: &Path,
backend: options::BackendType,
admin_secret: &str,
id: u64,
@@ -304,7 +305,7 @@ pub fn set_database_backend(
}
pub fn get_database_backend(
base_dir: &str,
base_dir: &Path,
backend: options::BackendType,
admin_secret: &str,
id: u64,
@@ -321,7 +322,7 @@ pub fn get_database_backend(
// Set database name
pub fn set_database_name(
base_dir: &str,
base_dir: &Path,
backend: options::BackendType,
admin_secret: &str,
id: u64,
@@ -335,7 +336,7 @@ pub fn set_database_name(
// Get database name
pub fn get_database_name(
base_dir: &str,
base_dir: &Path,
backend: options::BackendType,
admin_secret: &str,
id: u64,
@@ -359,7 +360,7 @@ fn load_public(
// Add access key for db (value format: "Read:ts" or "ReadWrite:ts")
pub fn add_access_key(
base_dir: &str,
base_dir: &Path,
backend: options::BackendType,
admin_secret: &str,
id: u64,
@@ -378,7 +379,7 @@ pub fn add_access_key(
// Delete access key by hash
pub fn delete_access_key(
base_dir: &str,
base_dir: &Path,
backend: options::BackendType,
admin_secret: &str,
id: u64,
@@ -391,7 +392,7 @@ pub fn delete_access_key(
// List access keys, returning (hash, perms, created_at_secs)
pub fn list_access_keys(
base_dir: &str,
base_dir: &Path,
backend: options::BackendType,
admin_secret: &str,
id: u64,
@@ -411,7 +412,7 @@ pub fn list_access_keys(
// - Ok(Some(Permissions)) when access is allowed
// - Ok(None) when not allowed or db missing (caller can distinguish by calling db_exists)
pub fn verify_access(
base_dir: &str,
base_dir: &Path,
backend: options::BackendType,
admin_secret: &str,
id: u64,
@@ -456,7 +457,7 @@ pub fn verify_access(
// Enumerate all db ids
pub fn list_dbs(
base_dir: &str,
base_dir: &Path,
backend: options::BackendType,
admin_secret: &str,
) -> Result<Vec<u64>, DBError> {