github/dbx
4
0 Fork 0
mirror of https://github.com/t8y2/dbx.git synced 2026-11-14 14:49:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(core): gate default secret key path resolution out of test builds

Browse Source
This commit is contained in:
t8y2 committed 2026-09-24 22:19:23 +08:00
1 parent 007c23b4e7
commit 97eef1e725
1 file changed
+12 -9
Download Patch File Download Diff File Expand all files Collapse all files
crates/dbx-core/src/persistence/secret_codec.rs
+12 -9
View File
@@ -493,16 +493,19 @@ fn default_key_path() -> Option<std::path::PathBuf> {
{
return Some(std::env::temp_dir().join("dbx-test-secret.key"));
}
#[cfg(target_os = "macos")]
if let Ok(home) = std::env::var("HOME") {
return Some(std::path::PathBuf::from(home).join("Library/Application Support/dbx/secret.key"));
#[cfg(not(test))]
{
#[cfg(target_os = "macos")]
if let Ok(home) = std::env::var("HOME") {
return Some(std::path::PathBuf::from(home).join("Library/Application Support/dbx/secret.key"));
}
if let Ok(config) = std::env::var("XDG_CONFIG_HOME") {
return Some(std::path::PathBuf::from(config).join("dbx/secret.key"));
}
std::env::var_os("APPDATA").map(std::path::PathBuf::from).map(|path| path.join("dbx/secret.key")).or_else(
|| std::env::var_os("HOME").map(std::path::PathBuf::from).map(|path| path.join(".config/dbx/secret.key")),
)
}
if let Ok(config) = std::env::var("XDG_CONFIG_HOME") {
return Some(std::path::PathBuf::from(config).join("dbx/secret.key"));
}
std::env::var_os("APPDATA").map(std::path::PathBuf::from).map(|path| path.join("dbx/secret.key")).or_else(|| {
std::env::var_os("HOME").map(std::path::PathBuf::from).map(|path| path.join(".config/dbx/secret.key"))
})
}
fn aad(namespace: &str, key: &str) -> String {