Start to serve config

Cargo.lock

@@ -181,6 +181,21 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "actix-web-httpauth"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6dda62cf04bc3a9ad2ea8f314f721951cfdb4cdacec4e984d20e77c7bb170991"
+dependencies = [
+ "actix-utils",
+ "actix-web",
+ "base64",
+ "futures-core",
+ "futures-util",
+ "log",
+ "pin-project-lite",
+]
+
 [[package]]
 name = "adler"
 version = "1.0.2"
@@ -507,6 +522,7 @@ dependencies = [
  "futures-task",
  "pin-project-lite",
  "pin-utils",
+ "slab",
 ]
 
 [[package]]
@@ -1046,6 +1062,8 @@ name = "tcp_relay_server"
 version = "0.1.0"
 dependencies = [
  "actix-web",
+ "actix-web-httpauth",
+ "base",
  "clap",
  "env_logger",
  "log",

base/src/lib.rs

@@ -1,5 +1,7 @@
 #[derive(serde::Serialize, serde::Deserialize)]
 pub struct RelayedPort {
-    pub id: u64,
+    pub id: usize,
     pub port: u16,
-}
+}
+
+pub type RemoteConfig = Vec<RelayedPort>;

tcp_relay_server/Cargo.toml

@@ -4,7 +4,9 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
+base = { path = "../base" }
 clap = { version = "3.2.18", features = ["derive", "env"] }
 log = "0.4.17"
 env_logger = "0.9.0"
-actix-web = "4"
+actix-web = "4"
+actix-web-httpauth = "0.8.0"

tcp_relay_server/src/args.rs

@@ -0,0 +1,23 @@
+use clap::Parser;
+
+/// TCP relay server
+#[derive(Parser, Debug, Clone)]
+#[clap(author, version, about, long_about = None)]
+pub struct Args {
+    /// Access tokens
+    #[clap(short, long)]
+    pub tokens: Vec<String>,
+
+    /// Forwarded ports
+    #[clap(short, long)]
+    pub ports: Vec<u16>,
+
+    /// HTTP server listen address
+    #[clap(short, long, default_value = "0.0.0.0:8000")]
+    pub listen_address: String,
+
+    /// Increment ports on client. Useful for debugging and running both client and server
+    /// on the same machine
+    #[clap(short, long, default_value_t = 0)]
+    pub increment_ports: u16,
+}

tcp_relay_server/src/lib.rs

@@ -1 +1 @@
-pub mod server;
+pub mod args;

tcp_relay_server/src/main.rs

@@ -1,30 +1,39 @@
 use std::sync::Arc;
 
-use actix_web::{App, HttpServer, web};
+use actix_web::{App, Error, HttpResponse, HttpServer, middleware, Responder, web};
+use actix_web::dev::ServiceRequest;
+use actix_web::error::ErrorUnauthorized;
+use actix_web::web::Data;
+use actix_web_httpauth::extractors::bearer::BearerAuth;
+use actix_web_httpauth::middleware::HttpAuthentication;
 use clap::Parser;
 
-use tcp_relay_server::server::*;
+use base::RelayedPort;
+use tcp_relay_server::args::Args;
 
-/// TCP relay server
-#[derive(Parser, Debug, Clone)]
-#[clap(author, version, about, long_about = None)]
-struct Args {
-    /// Access tokens
-    #[clap(short, long)]
-    tokens: Vec<String>,
+async fn auth_validator(
+    req: ServiceRequest,
+    creds: BearerAuth,
+) -> Result<ServiceRequest, (Error, ServiceRequest)> {
+    let args: &Data<Arc<Args>> = req.app_data().unwrap();
+    if args.tokens.iter().any(|t| t == creds.token()) {
+        Ok(req)
+    } else {
+        Err((ErrorUnauthorized("invalid token"), req))
+    }
+}
 
-    /// Forwarded ports
-    #[clap(short, long)]
-    ports: Vec<usize>,
+pub async fn hello_route() -> &'static str {
+    "TCP relay. Hello world!"
+}
 
-    /// HTTP server listen address
-    #[clap(short, long, default_value = "0.0.0.0:8000")]
-    listen_address: String,
-
-    /// Increment ports on client. Useful for debugging and running both client and server
-    /// on the same machine
-    #[clap(short, long, default_value_t = 0)]
-    increment_ports: usize,
+pub async fn config_route(data: Data<Arc<Args>>) -> impl Responder {
+    HttpResponse::Ok().json(
+        data.ports.iter()
+            .enumerate()
+            .map(|(id, port)| RelayedPort { id, port: port + data.increment_ports })
+            .collect::<Vec<_>>()
+    )
 }
 
 #[actix_web::main]
@@ -46,9 +55,14 @@ async fn main() -> std::io::Result<()> {
 
     log::info!("Starting relay on http://{}", args.listen_address);
 
-    HttpServer::new(|| {
+    let args_clone = args.clone();
+    HttpServer::new(move || {
         App::new()
+            .wrap(middleware::Logger::default())
+            .wrap(HttpAuthentication::bearer(auth_validator))
+            .app_data(Data::new(args_clone.clone()))
             .route("/", web::get().to(hello_route))
+            .route("/config", web::get().to(config_route))
     })
         .bind(&args.listen_address)?
         .run()

tcp_relay_server/src/server.rs

@@ -1,3 +0,0 @@
-pub async fn hello_route() -> &'static str {
-    "TCP relay. Hello world!"
-}