diff --git a/radicle-httpd/Cargo.toml b/radicle-httpd/Cargo.toml index 5aac62681..82b2583d3 100644 --- a/radicle-httpd/Cargo.toml +++ b/radicle-httpd/Cargo.toml @@ -20,10 +20,6 @@ logfmt = [ name = "radicle-httpd" path = "src/main.rs" -[[bin]] -name = "rad-web" -path = "src/bin/rad-web.rs" - [dependencies] anyhow = { version = "1" } axum = { version = "0.7.2", default-features = false, features = ["json", "query", "tokio", "http1"] } diff --git a/radicle-httpd/build/Dockerfile b/radicle-httpd/build/Dockerfile index a4c9c2d7f..6c9df56e0 100644 --- a/radicle-httpd/build/Dockerfile +++ b/radicle-httpd/build/Dockerfile @@ -60,19 +60,15 @@ ARG RADICLE_VERSION ARG SOURCE_DATE_EPOCH COPY --from=builder \ - /src/target/x86_64-unknown-linux-musl/release/rad-web \ /src/target/x86_64-unknown-linux-musl/release/radicle-httpd \ /builds/x86_64-unknown-linux-musl/bin/ COPY --from=builder \ - /src/target/aarch64-unknown-linux-musl/release/rad-web \ /src/target/aarch64-unknown-linux-musl/release/radicle-httpd \ /builds/aarch64-unknown-linux-musl/bin/ COPY --from=builder \ - /src/target/aarch64-apple-darwin/release/rad-web \ /src/target/aarch64-apple-darwin/release/radicle-httpd \ /builds/aarch64-apple-darwin/bin/ COPY --from=builder \ - /src/target/x86_64-apple-darwin/release/rad-web \ /src/target/x86_64-apple-darwin/release/radicle-httpd \ /builds/x86_64-apple-darwin/bin/ COPY --from=builder /src/*.1 /builds/x86_64-unknown-linux-musl/man/man1/ diff --git a/radicle-httpd/src/api/v1/sessions.rs b/radicle-httpd/src/api/v1/sessions.rs index 5d794cb1b..999904795 100644 --- a/radicle-httpd/src/api/v1/sessions.rs +++ b/radicle-httpd/src/api/v1/sessions.rs @@ -122,13 +122,31 @@ async fn session_delete_handler( #[cfg(test)] mod routes { - use crate::commands::web::{sign, SessionInfo}; use axum::body::Body; use axum::http::StatusCode; + use serde::{Deserialize, Serialize}; + + use radicle::crypto::{PublicKey, Signature, Signer}; use crate::api::auth::{AuthState, Session}; use crate::test::{self, get, post, put}; + #[derive(Debug, Clone, Deserialize, Serialize)] + #[serde(rename_all = "camelCase")] + pub struct SessionInfo { + pub session_id: String, + pub public_key: PublicKey, + } + + pub fn sign( + signer: Box, + session: &SessionInfo, + ) -> Result { + signer + .try_sign(format!("{}:{}", session.session_id, session.public_key).as_bytes()) + .map_err(anyhow::Error::from) + } + #[tokio::test] async fn test_session() { let tmp = tempfile::tempdir().unwrap(); diff --git a/radicle-httpd/src/bin/rad-web.rs b/radicle-httpd/src/bin/rad-web.rs deleted file mode 100644 index 49b01ef56..000000000 --- a/radicle-httpd/src/bin/rad-web.rs +++ /dev/null @@ -1,10 +0,0 @@ -use radicle_cli::terminal as term; -use radicle_httpd::commands::web as rad_web; - -fn main() { - term::run_command_args::( - rad_web::HELP, - rad_web::run, - std::env::args_os().skip(1).collect(), - ) -} diff --git a/radicle-httpd/src/commands.rs b/radicle-httpd/src/commands.rs deleted file mode 100644 index 112ad9c25..000000000 --- a/radicle-httpd/src/commands.rs +++ /dev/null @@ -1,2 +0,0 @@ -//! Extra CLI commands relating to HTTPd. -pub mod web; diff --git a/radicle-httpd/src/commands/web.rs b/radicle-httpd/src/commands/web.rs deleted file mode 100644 index 866f9d653..000000000 --- a/radicle-httpd/src/commands/web.rs +++ /dev/null @@ -1,233 +0,0 @@ -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, Context}; -use serde::{Deserialize, Serialize}; -use url::{Position, Url}; - -use radicle::crypto::{PublicKey, Signature, Signer}; - -use radicle_cli::terminal as term; -use radicle_cli::terminal::args::{Args, Error, Help}; - -pub const HELP: Help = Help { - name: "web", - description: "Run the HTTP daemon and connect the web explorer to it", - version: env!("RADICLE_VERSION"), - usage: r#" -Usage - - rad web [