♻️ refactor: move gen_key up to ptth_core

main
_ 2021-04-09 19:43:15 -05:00
parent 240cd8dff1
commit 3408feb619
5 changed files with 17 additions and 13 deletions

2
Cargo.lock generated
View File

@ -1445,9 +1445,11 @@ dependencies = [
name = "ptth_core" name = "ptth_core"
version = "1.2.0" version = "1.2.0"
dependencies = [ dependencies = [
"base64",
"ctrlc", "ctrlc",
"futures", "futures",
"hyper", "hyper",
"rand",
"serde", "serde",
"thiserror", "thiserror",
"tokio", "tokio",

View File

@ -1,7 +1,7 @@
[package] [package]
name = "ptth_core" name = "ptth_core"
version = "1.2.0" version = "1.3.0"
authors = ["Trish"] authors = ["Trish"]
edition = "2018" edition = "2018"
license = "AGPL-3.0" license = "AGPL-3.0"
@ -11,9 +11,11 @@ repository = "https://github.com/ReactorScram/ptth"
[dependencies] [dependencies]
base64 = "0.13.0"
ctrlc = { version = "3.1.8", features = [ "termination" ] } ctrlc = { version = "3.1.8", features = [ "termination" ] }
futures = "0.3.7" futures = "0.3.7"
hyper = "0.14.4" hyper = "0.14.4"
rand = "0.8.3"
serde = {version = "1.0.124", features = ["derive"]} serde = {version = "1.0.124", features = ["derive"]}
thiserror = "1.0.24" thiserror = "1.0.24"
tokio = { version = "1.2.0", features = ["full"] } tokio = { version = "1.2.0", features = ["full"] }

View File

@ -20,6 +20,16 @@ pub fn prefix_match <'a> (prefix: &str, hay: &'a str) -> Option <&'a str>
hay.strip_prefix (prefix) hay.strip_prefix (prefix)
} }
/// Generates 64 bytes of entropy and returns it as Base64
pub fn gen_key () -> String {
use rand::RngCore;
let mut buffer = vec! [0_u8; 64];
rand::thread_rng ().fill_bytes (&mut buffer);
base64::encode (&buffer)
}
#[cfg (test)] #[cfg (test)]
mod tests { mod tests {
use super::*; use super::*;

View File

@ -43,7 +43,7 @@ toml = "0.5.7"
uom = "0.30.0" uom = "0.30.0"
always_equal = { path = "../always_equal", version = "1.0.0" } always_equal = { path = "../always_equal", version = "1.0.0" }
ptth_core = { path = "../ptth_core", version = "1.2.0" } ptth_core = { path = "../ptth_core", version = "1.3.0" }
[dev-dependencies] [dev-dependencies]

View File

@ -48,18 +48,8 @@ pub struct ConfigFile {
pub file_server_root: Option <PathBuf>, pub file_server_root: Option <PathBuf>,
} }
/// Generates 64 bytes of entropy and returns it as Base64
fn gen_key () -> String {
use rand::RngCore;
let mut buffer = vec! [0_u8; 64];
rand::thread_rng ().fill_bytes (&mut buffer);
base64::encode (&buffer)
}
fn gen_and_save_key (path: &Path) -> anyhow::Result <()> { fn gen_and_save_key (path: &Path) -> anyhow::Result <()> {
let api_key = gen_key (); let api_key = ptth_core::gen_key ();
{ {
let mut f = File::create (path)?; let mut f = File::create (path)?;