16a01a4 node: Delegate passphrase prompt to CLI — heartwood

Radicle Heartwood Protocol & Stack

node: Delegate passphrase prompt to CLI

Alexis Sellier committed 2 years ago

commit 16a01a42bfad7328ac84cffd5c2707f774c9f3ff
parent 4634913b66bfc5bc82f354ced8ac059808d45615

3 files changed +4 -8

modified Cargo.lock

@@ -2113,7 +2113,6 @@ dependencies = [

  "radicle",
  "radicle-crypto",
  "radicle-git-ext",
  "radicle-term",
  "scrypt",
  "serde",
  "serde_json",

modified radicle-node/Cargo.toml

@@ -42,10 +42,6 @@ thiserror = { version = "1" }

 path = "../radicle"
 version = "0.2.0"
 [dependencies.radicle-term]
 path = "../radicle-term"
 version = "0"
 [dev-dependencies]
 radicle = { path = "../radicle", version = "*", features = ["test"] }
 radicle-crypto = { path = "../radicle-crypto", version = "*", features = ["test", "cyphernet"] }

modified radicle-node/src/main.rs

@@ -1,10 +1,11 @@

 use std::{fs, net, process};
 use std::{env, fs, net, process};
 use anyhow::{anyhow, Context as _};
 use crossbeam_channel as chan;
 use cyphernet::addr::PeerAddr;
 use localtime::LocalDuration;
 use radicle::crypto;
 use radicle::node;
 use radicle::prelude::Signer;
 use radicle::profile;

@@ -12,7 +13,6 @@ use radicle_node::crypto::ssh::keystore::{Keystore, MemorySigner};

 use radicle_node::prelude::{Address, NodeId};
 use radicle_node::Runtime;
 use radicle_node::{logger, service, signals};
 use radicle_term as term;
 pub const HELP_MSG: &str = r#"
 Usage

@@ -126,7 +126,8 @@ fn execute() -> anyhow::Result<()> {

     log::info!(target: "node", "Unlocking node keystore..");
     let passphrase = term::io::passphrase(profile::env::RAD_PASSPHRASE)
     let passphrase = env::var(profile::env::RAD_PASSPHRASE)
         .map(crypto::ssh::Passphrase::from)
         .context(format!("`{}` must be set", profile::env::RAD_PASSPHRASE))?;
     let keystore = Keystore::new(&home.keys());
     let signer = MemorySigner::load(&keystore, passphrase)?;