slipenkomk/sequoia-sq
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add a utility function to return the path to the key store.

Browse Source 
- Add `Config::key_store_path` and `Config::key_store_path_or_else`
    to return the path to the configured key store, if any.
This commit is contained in:
Neal H. Walfield 2024-02-18 16:49:27 +01:00
parent 5aceb397a3
commit d6e8e72d24
No known key found for this signature in database
GPG Key ID: 6863C9AD5B4D22D3
1 changed files with 33 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/sq.rs
View File

@ -552,6 +552,38 @@ impl<'store> Config<'store> {
}
/// Returns the key store's path.
///
/// If the key store is disabled, returns `Ok(None)`.
fn key_store_path(&self) -> Result<Option<PathBuf>> {
if self.no_key_store {
Ok(None)
} else if let Some(dir) = self.key_store_path.as_ref() {
Ok(Some(dir.clone()))
} else if let Some(dir) = dirs::data_dir() {
Ok(Some(dir.join("sequoia")))
} else {
Err(anyhow::anyhow!(
"No key store, the XDG data directory is not defined"))
}
}
/// Returns the key store's path.
///
/// If the key store is disabled, returns an error.
fn key_store_path_or_else(&self) -> Result<PathBuf> {
const NO_KEY_STORE_ERROR: &str =
"Operation requires a key store, \
but the key store is disabled";
if self.no_key_store {
Err(anyhow::anyhow!(NO_KEY_STORE_ERROR))
} else {
self.key_store_path()?
.ok_or(anyhow::anyhow!(NO_KEY_STORE_ERROR))
}
}
/// Returns the key store.
///
/// If the key store is disabled, returns `Ok(None)`. If it is not yet
@ -563,19 +595,8 @@ impl<'store> Config<'store> {
self.key_store
.get_or_try_init(|| {
let dir_;
let dir = if let Some(dir) = self.key_store_path.as_ref() {
dir
} else if let Some(dir) = dirs::data_dir() {
dir_ = dir.join("sequoia");
&dir_
} else {
return Err(anyhow::anyhow!(
"No key store, the XDG data directory is not defined"));
};
let c = keystore::Context::configure()
.home(dir)
.home(self.key_store_path_or_else()?)
.build()?;
let ks = keystore::Keystore::connect(&c)
.context("Connecting to key store")?;