Browse Source

add diceware subcommand

main
_ 5 months ago
parent
commit
097c9cf313
  1. 1
      Cargo.lock
  2. 1
      crates/ptth_multi_call_server/Cargo.toml
  3. 23
      crates/ptth_multi_call_server/src/diceware.rs
  4. 0
      crates/ptth_multi_call_server/src/eff_short_wordlist_1.txt
  5. 4
      crates/ptth_multi_call_server/src/main.rs

1
Cargo.lock

@ -1243,6 +1243,7 @@ dependencies = [
"ptth_file_server",
"ptth_server",
"quic_demo",
"rand",
"reqwest",
"rusty_ulid",
"sha2",

1
crates/ptth_multi_call_server/Cargo.toml

@ -19,6 +19,7 @@ hex = "0.4.3"
ptth_file_server = { path = "../ptth_file_server_bin" }
ptth_server = { path = "../ptth_server" }
quic_demo = { path = "../../prototypes/quic_demo" }
rand = "0.8.4"
rusty_ulid = "0.10.1"
sha2 = "0.9.8"
tokio = { version = "1.8.1", features = ["full"] }

23
crates/ptth_multi_call_server/src/diceware.rs

@ -0,0 +1,23 @@
use rand::Rng;
pub fn main () {
let wordlist = include_str! ("eff_short_wordlist_1.txt");
let words: Vec <_> = wordlist.split ('\n').take (1253).collect ();
assert_eq! (words.len (), 1253);
assert_eq! (words [0], "acid");
assert_eq! (words [600], "large");
assert_eq! (words [1252], "zoom");
let mut rng = rand::thread_rng ();
let random_words: Vec <&str> = (0..8)
.map (|_| {
words [rng.gen_range (0..words.len ())]
})
.collect ();
let passphrase = random_words.join (" ");
println! ("{}", passphrase);
}

0
eff_short_wordlist_1.txt → crates/ptth_multi_call_server/src/eff_short_wordlist_1.txt

4
crates/ptth_multi_call_server/src/main.rs

@ -5,11 +5,13 @@ use std::{
use tokio::sync::watch;
mod diceware;
mod download;
mod ulid;
#[derive (Clone, Copy, Debug, PartialEq)]
enum Subcommand {
Diceware,
Download,
PtthServer,
PtthFileServer,
@ -27,6 +29,7 @@ async fn main () -> anyhow::Result <()> {
let (subcommand, args) = parse_args (&args)?;
match subcommand {
Diceware => Ok (diceware::main ()),
Download => download::main (&args).await,
PtthServer => ptth_server::executable::main (&args).await,
PtthFileServer => ptth_file_server::main (&args).await,
@ -50,6 +53,7 @@ fn parse_subcommand (arg: &str) -> Option <Subcommand>
use Subcommand::*;
let map = vec! [
("diceware", Diceware),
("download", Download),
("ptth_server", PtthServer),
("ptth_file_server", PtthFileServer),

Loading…
Cancel
Save