mab122
/
radicle-heartwood-lfs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cli: Ask for passphrase upfront in `node start`

This commit is contained in:
Alexis Sellier 2023-06-29 15:02:08 +02:00
parent ba9c5997b7
commit 0d0d354d55
No known key found for this signature in database
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
radicle-cli/src/commands/node/control.rs
View File

@ -4,12 +4,20 @@ use std::io::{BufRead, BufReader, Read, Seek, SeekFrom};
use std::time::Duration; use std::time::Duration;
use std::{process, thread}; use std::{process, thread};
use anyhow::Context as _;
use radicle::node::{Address, Handle as _, NodeId}; use radicle::node::{Address, Handle as _, NodeId};
use radicle::profile;
use radicle::Node; use radicle::Node;
use crate::terminal as term; use crate::terminal as term;
pub fn start(daemon: bool, options: Vec<OsString>) -> anyhow::Result<()> { pub fn start(daemon: bool, options: Vec<OsString>) -> anyhow::Result<()> {
// Ask passphrase here, otherwise it'll be a fatal error when running the daemon
// without `RAD_PASSPHRASE`. To keep things consistent, we also use this in foreground mode.
let passphrase = term::io::passphrase(profile::env::RAD_PASSPHRASE)
.context(format!("`{}` must be set", profile::env::RAD_PASSPHRASE))?;
if daemon { if daemon {
let home = radicle::profile::home()?; let home = radicle::profile::home()?;
let log = OpenOptions::new() let log = OpenOptions::new()
@ -18,6 +26,7 @@ pub fn start(daemon: bool, options: Vec<OsString>) -> anyhow::Result<()> {
.open(home.node().join("node.log"))?; .open(home.node().join("node.log"))?;
process::Command::new("radicle-node") process::Command::new("radicle-node")
.args(options) .args(options)
.env(profile::env::RAD_PASSPHRASE, passphrase)
.stdin(process::Stdio::null()) .stdin(process::Stdio::null())
.stdout(process::Stdio::from(log)) .stdout(process::Stdio::from(log))
.stderr(process::Stdio::null()) .stderr(process::Stdio::null())
@ -25,6 +34,7 @@ pub fn start(daemon: bool, options: Vec<OsString>) -> anyhow::Result<()> {
} else { } else {
let mut child = process::Command::new("radicle-node") let mut child = process::Command::new("radicle-node")
.args(options) .args(options)
.env(profile::env::RAD_PASSPHRASE, passphrase)
.spawn()?; .spawn()?;
child.wait()?; child.wait()?;