PeachCloud
/
kuska-ssb
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request 'Add support for custom keyfile paths' (#1) from keypath into main 

Reviewed-on: #1
This commit is contained in:
notplants 2022-05-25 11:49:11 +00:00
parent fb7062de60 48adac914f
commit 24cfea2dbd
4 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.toml
View File

@ -1,6 +1,6 @@
[package]
name = "kuska-ssb"
version = "0.4.0"
version = "0.4.1"
authors = ["Dhole <dhole@riseup.net>", "Adria Massanet <adria@codecontext.io>", "Andrew Reid <glyph@mycelial.technology>"]
edition = "2021"
description = "Secure Scuttlebutt library"

11
src/keystore/gosbot.rs
View File

@ -13,12 +13,17 @@ use super::{
};
use crate::crypto::{ToSodiumObject, ToSsbId};
/// Return an `OwnedIdentity` from the local go-sbot secret file.
/// Return an `OwnedIdentity` from the local go-sbot secret file with a custom path
pub async fn from_custom_gosbot_keypath(local_key_file: String) -> Result<OwnedIdentity> {
let mut file = async_std::fs::File::open(local_key_file).await?;
read_gosbot_config(&mut file).await
}
/// Return an `OwnedIdentity` from the local go-sbot secret file in the default location.
pub async fn from_gosbot_local() -> Result<OwnedIdentity> {
let home_dir = dirs::home_dir().ok_or(Error::HomeNotFound)?;
let local_key_file = format!("{}/.ssb-go/secret", home_dir.to_string_lossy());
let mut file = async_std::fs::File::open(local_key_file).await?;
read_gosbot_config(&mut file).await
from_custom_gosbot_keypath(local_key_file).await
}
/// Read the contents of the go-sbot secret file, deserialize into a

4
src/keystore/mod.rs
View File

@ -4,6 +4,6 @@ mod identity;
pub mod patchwork;
mod util;
pub use gosbot::{from_gosbot_local, read_gosbot_config, write_gosbot_config};
pub use gosbot::{from_gosbot_local, read_gosbot_config, write_gosbot_config, from_custom_gosbot_keypath};
pub use identity::{JsonSSBSecret, OwnedIdentity, CURVE_ED25519};
pub use patchwork::{from_patchwork_local, read_patchwork_config, write_patchwork_config};
pub use patchwork::{from_patchwork_local, read_patchwork_config, write_patchwork_config, from_custom_patchwork_keypath};

8
src/keystore/patchwork.rs
View File

@ -10,11 +10,15 @@ use super::{
use crate::crypto::{ToSodiumObject, ToSsbId};
use serde_json::to_vec_pretty;
pub async fn from_custom_patchwork_keypath(local_key_file: String) -> Result<OwnedIdentity> {
let mut file = async_std::fs::File::open(local_key_file).await?;
read_patchwork_config(&mut file).await
}
pub async fn from_patchwork_local() -> Result<OwnedIdentity> {
let home_dir = dirs::home_dir().ok_or(Error::HomeNotFound)?;
let local_key_file = format!("{}/.ssb/secret", home_dir.to_string_lossy());
let mut file = async_std::fs::File::open(local_key_file).await?;
read_patchwork_config(&mut file).await
from_custom_patchwork_keypath(local_key_file).await
}
pub async fn read_patchwork_config<R: Read + Unpin>(reader: &mut R) -> Result<OwnedIdentity> {