`rad-web` runs HTTP API and connects web app
Instead of `rad-web` just creating a session for an already running HTTP API the command now starts the HTTP API, creates a session and opens the authentication link. Signed-off-by: Thomas Scholtes <geigerzaehler@axiom.fm>
This commit is contained in:
Thomas Scholtes
cloudhead
parent
6f7c2dca91
commit
48dedc6e7e
|
|
@ -872,9 +872,9 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
|
|||
|
||||
[[package]]
|
||||
name = "form_urlencoded"
|
||||
version = "1.2.0"
|
||||
version = "1.2.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652"
|
||||
checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456"
|
||||
dependencies = [
|
||||
"percent-encoding",
|
||||
]
|
||||
|
|
@ -1620,9 +1620,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "idna"
|
||||
version = "0.4.0"
|
||||
version = "0.5.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c"
|
||||
checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6"
|
||||
dependencies = [
|
||||
"unicode-bidi",
|
||||
"unicode-normalization",
|
||||
|
|
@ -2161,9 +2161,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "percent-encoding"
|
||||
version = "2.3.0"
|
||||
version = "2.3.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94"
|
||||
checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
|
||||
|
||||
[[package]]
|
||||
name = "pin-project"
|
||||
|
|
@ -2565,6 +2565,7 @@ dependencies = [
|
|||
"tracing-logfmt",
|
||||
"tracing-subscriber",
|
||||
"ureq",
|
||||
"url",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
|
@ -3734,9 +3735,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "url"
|
||||
version = "2.4.1"
|
||||
version = "2.5.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5"
|
||||
checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633"
|
||||
dependencies = [
|
||||
"form_urlencoded",
|
||||
"idna",
|
||||
|
|
|
|||
|
|
@ -38,6 +38,7 @@ tracing = { version = "0.1.37", default-features = false, features = ["std", "lo
|
|||
tracing-logfmt = { version = "0.2", optional = true }
|
||||
tracing-subscriber = { version = "0.3", default-features = false, features = ["std", "ansi", "fmt"] }
|
||||
ureq = { version = "2.9", default-features = false, features = ["json"] }
|
||||
url = { version = "2.5.0" }
|
||||
|
||||
[dependencies.radicle]
|
||||
path = "../radicle"
|
||||
|
|
|
|||
|
|
@ -1,7 +1,12 @@
|
|||
use std::ffi::OsString;
|
||||
use std::net::{IpAddr, Ipv4Addr, SocketAddr};
|
||||
use std::process::Command;
|
||||
use std::thread::sleep;
|
||||
use std::time::Duration;
|
||||
|
||||
use anyhow::anyhow;
|
||||
use anyhow::{anyhow, Context};
|
||||
use serde::{Deserialize, Serialize};
|
||||
use url::Url;
|
||||
|
||||
use radicle::crypto::{PublicKey, Signature, Signer};
|
||||
|
||||
|
|
@ -10,19 +15,20 @@ use radicle_cli::terminal::args::{Args, Error, Help};
|
|||
|
||||
pub const HELP: Help = Help {
|
||||
name: "web",
|
||||
description: "Connect web with node",
|
||||
description: "Start HTTP API server and connect the web explorer to it",
|
||||
version: env!("CARGO_PKG_VERSION"),
|
||||
usage: r#"
|
||||
Usage
|
||||
|
||||
rad web [<option>...]
|
||||
rad web [<option>...] [<explorer-url>]
|
||||
|
||||
Runs the Radicle HTTP Daemon and opens a Radicle web explorer to authenticate with it.
|
||||
|
||||
Options
|
||||
|
||||
--backend, -b httpd to bind to
|
||||
--frontend, -f Web interface to bind to
|
||||
--verbose, -v Verbose output
|
||||
--json Output as json
|
||||
--listen, -l Address to bind the HTTP daemon to (default: 127.0.0.1:8080)
|
||||
--connect, -c Connect the explorer to an already running daemon
|
||||
--no-open Don't open the authentication URL automatically
|
||||
--help Print help
|
||||
"#,
|
||||
};
|
||||
|
|
@ -36,10 +42,10 @@ pub struct SessionInfo {
|
|||
|
||||
#[derive(Debug)]
|
||||
pub struct Options {
|
||||
pub backend: String,
|
||||
pub frontend: String,
|
||||
pub json: bool,
|
||||
pub verbose: bool,
|
||||
pub app_url: Url,
|
||||
pub listen: SocketAddr,
|
||||
pub connect: bool,
|
||||
pub open: bool,
|
||||
}
|
||||
|
||||
impl Args for Options {
|
||||
|
|
@ -47,24 +53,36 @@ impl Args for Options {
|
|||
use lexopt::prelude::*;
|
||||
|
||||
let mut parser = lexopt::Parser::from_args(args);
|
||||
let mut backend = None;
|
||||
let mut frontend = None;
|
||||
let mut json = false;
|
||||
let mut verbose = false;
|
||||
let mut listen = None;
|
||||
// SAFETY: This is a valid URL.
|
||||
#[allow(clippy::unwrap_used)]
|
||||
let mut app_url = Url::parse("https://app.radicle.xyz").unwrap();
|
||||
let mut connect = false;
|
||||
let mut open = true;
|
||||
|
||||
while let Some(arg) = parser.next()? {
|
||||
match arg {
|
||||
Long("verbose") | Short('v') => verbose = true,
|
||||
Long("backend") | Short('b') => {
|
||||
backend = Some(parser.value()?.to_string_lossy().to_string())
|
||||
Long("listen") | Short('l') => {
|
||||
listen = Some(
|
||||
parser
|
||||
.value()?
|
||||
.to_string_lossy()
|
||||
.as_ref()
|
||||
.parse::<SocketAddr>()
|
||||
.context("argument for '--listen' is not a valid socket address")?,
|
||||
)
|
||||
}
|
||||
Long("frontend") | Short('f') => {
|
||||
frontend = Some(parser.value()?.to_string_lossy().to_string())
|
||||
Long("connect") | Short('c') => {
|
||||
connect = true;
|
||||
}
|
||||
Long("json") => json = true,
|
||||
Long("no-open") => open = false,
|
||||
Long("help") | Short('h') => {
|
||||
return Err(Error::Help.into());
|
||||
}
|
||||
Value(val) => {
|
||||
let val = val.to_string_lossy();
|
||||
app_url = Url::parse(val.as_ref()).context("invalid explorer URL supplied")?;
|
||||
}
|
||||
_ => {
|
||||
return Err(anyhow!(arg.unexpected()));
|
||||
}
|
||||
|
|
@ -73,10 +91,13 @@ impl Args for Options {
|
|||
|
||||
Ok((
|
||||
Options {
|
||||
json,
|
||||
verbose,
|
||||
backend: backend.unwrap_or(String::from("http://0.0.0.0:8080")),
|
||||
frontend: frontend.unwrap_or(String::from("https://app.radicle.xyz")),
|
||||
open,
|
||||
app_url,
|
||||
listen: listen.unwrap_or(SocketAddr::new(
|
||||
IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)),
|
||||
8080,
|
||||
)),
|
||||
connect,
|
||||
},
|
||||
vec![],
|
||||
))
|
||||
|
|
@ -90,33 +111,88 @@ pub fn sign(signer: Box<dyn Signer>, session: &SessionInfo) -> Result<Signature,
|
|||
}
|
||||
|
||||
pub fn run(options: Options, ctx: impl term::Context) -> anyhow::Result<()> {
|
||||
let session: SessionInfo = ureq::post(&format!("{}/api/v1/sessions", options.backend))
|
||||
.call()?
|
||||
.into_json()?;
|
||||
let profile = ctx.profile()?;
|
||||
|
||||
let runtime_and_handle = if !options.connect {
|
||||
tracing_subscriber::fmt::init();
|
||||
|
||||
let runtime = tokio::runtime::Builder::new_multi_thread()
|
||||
.enable_all()
|
||||
.build()
|
||||
.expect("failed to create threaded runtime");
|
||||
let httpd_handle = runtime.spawn(crate::run(crate::Options {
|
||||
aliases: Default::default(),
|
||||
listen: options.listen,
|
||||
cache: None,
|
||||
}));
|
||||
Some((runtime, httpd_handle))
|
||||
} else {
|
||||
None
|
||||
};
|
||||
|
||||
let mut num_retries = 30;
|
||||
let response = loop {
|
||||
num_retries -= 1;
|
||||
sleep(Duration::from_millis(100));
|
||||
match ureq::post(&format!("http://{}/api/v1/sessions", options.listen)).call() {
|
||||
Ok(response) => {
|
||||
break response;
|
||||
}
|
||||
Err(err) => {
|
||||
if err.kind() == ureq::ErrorKind::ConnectionFailed && num_retries > 0 {
|
||||
continue;
|
||||
} else {
|
||||
anyhow::bail!(err);
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
let session = response.into_json::<SessionInfo>()?;
|
||||
let signer = profile.signer()?;
|
||||
let signature = sign(signer, &session)?;
|
||||
|
||||
if options.json {
|
||||
println!(
|
||||
"{}",
|
||||
serde_json::json!({
|
||||
"sessionId": session.session_id,
|
||||
"publicKey": session.public_key,
|
||||
"signature": signature,
|
||||
})
|
||||
)
|
||||
let mut auth_url = options.app_url.clone();
|
||||
auth_url
|
||||
.path_segments_mut()
|
||||
.map_err(|_| anyhow!("URL not supported"))?
|
||||
.push("session")
|
||||
.push(&session.session_id);
|
||||
|
||||
auth_url
|
||||
.query_pairs_mut()
|
||||
.append_pair("pk", &session.public_key.to_string())
|
||||
.append_pair("sig", &signature.to_string())
|
||||
.append_pair("addr", &options.listen.to_string());
|
||||
|
||||
if options.open {
|
||||
#[cfg(target_os = "macos")]
|
||||
let cmd_name = "open";
|
||||
#[cfg(target_os = "linux")]
|
||||
let cmd_name = "xdg-open";
|
||||
|
||||
let mut cmd = Command::new(cmd_name);
|
||||
|
||||
match cmd.arg(auth_url.as_str()).spawn()?.wait() {
|
||||
Ok(exit_status) => {
|
||||
if exit_status.success() {
|
||||
term::success!("Opened {auth_url}");
|
||||
} else {
|
||||
term::info!("Visit {auth_url} to connect");
|
||||
}
|
||||
}
|
||||
Err(_) => {
|
||||
term::info!("Visit {auth_url} to connect");
|
||||
}
|
||||
}
|
||||
} else {
|
||||
term::blank();
|
||||
term::info!("Open the following link to authenticate:");
|
||||
term::info!(
|
||||
" 👉 {}/session/{}?pk={}&sig={}",
|
||||
options.frontend,
|
||||
session.session_id,
|
||||
session.public_key,
|
||||
signature,
|
||||
);
|
||||
term::blank();
|
||||
term::info!("Visit {auth_url} to connect");
|
||||
}
|
||||
|
||||
if let Some((runtime, httpd_handle)) = runtime_and_handle {
|
||||
runtime
|
||||
.block_on(httpd_handle)?
|
||||
.context("httpd server error")?;
|
||||
}
|
||||
|
||||
Ok(())
|
||||
|
|
|
|||
Loading…
Reference in New Issue