6 files changed, 179 insertions, 71 deletions

diff --git a/src/auth.rs b/src/auth.rs
new file mode 100644
index 0000000..74008b5
--- /dev/null
+++ b/src/auth.rs
@@ -0,0 +1,37 @@
+use crate::AppState;
+use axum::{
+    extract::{Request, State},
+    http::{HeaderMap, StatusCode},
+    middleware::Next,
+    response::Response,
+};
+use serde::Deserialize;
+
+#[derive(Debug, Clone, Deserialize)]
+pub enum Methods {
+    Key,
+    None,
+}
+
+pub async fn auth(
+    State(state): State<AppState>,
+    headers: HeaderMap,
+    request: Request,
+    next: Next,
+) -> Result<Response, StatusCode> {
+    let auth = state.config.auth;
+    match auth.method {
+        Methods::Key => {
+            if let Some(secret) = headers.get("authorization") {
+                if auth.secret.as_str() != secret {
+                    return Err(StatusCode::UNAUTHORIZED);
+                };
+                let response = next.run(request).await;
+                Ok(response)
+            } else {
+                Err(StatusCode::UNAUTHORIZED)
+            }
+        }
+        Methods::None => Ok(next.run(request).await),
+    }
+}
diff --git a/src/config.rs b/src/config.rs
index 9605361..9636af4 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -1,14 +1,22 @@
 use config::File;
 use serde::Deserialize;
 
+use crate::auth;
+
 #[derive(Debug, Clone, Deserialize)]
 pub struct Config {
     pub database_url: String,
-    pub apikey: String,
     pub serveraddr: String,
     pub pingtimeout: i64,
     pub pingthreshold: i64,
     pub timeoffset: i8,
+    pub auth: Auth,
+}
+
+#[derive(Debug, Clone, Deserialize)]
+pub struct Auth {
+    pub method: auth::Methods,
+    pub secret: String,
 }
 
 impl Config {
diff --git a/src/extractors.rs b/src/extractors.rs
deleted file mode 100644
index 4d441e9..0000000
--- a/src/extractors.rs
+++ /dev/null
@@ -1,24 +0,0 @@
-use axum::{
-    extract::{Request, State},
-    http::{HeaderMap, StatusCode},
-    middleware::Next,
-    response::Response,
-};
-
-use crate::AppState;
-
-pub async fn auth(
-    State(state): State<AppState>,
-    headers: HeaderMap,
-    request: Request,
-    next: Next,
-) -> Result<Response, StatusCode> {
-    let secret = headers.get("authorization");
-    match secret {
-        Some(token) if token == state.config.apikey.as_str() => {
-            let response = next.run(request).await;
-            Ok(response)
-        }
-        _ => Err(StatusCode::UNAUTHORIZED),
-    }
-}
diff --git a/src/main.rs b/src/main.rs
index 00fc6ce..70c67cf 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -11,8 +11,8 @@ use axum::{
 };
 use dashmap::DashMap;
 use sqlx::PgPool;
-use time::UtcOffset;
 use std::{env, sync::Arc};
+use time::UtcOffset;
 use tokio::sync::broadcast::{channel, Sender};
 use tracing::{info, level_filters::LevelFilter};
 use tracing_subscriber::{
@@ -29,7 +29,7 @@ use utoipa_swagger_ui::SwaggerUi;
 mod config;
 mod db;
 mod error;
-mod extractors;
+mod auth;
 mod routes;
 mod services;
 mod wol;
@@ -37,19 +37,21 @@ mod wol;
 #[derive(OpenApi)]
 #[openapi(
     paths(
-        start::start,
+        start::post,
+        start::get,
+        start::start_payload,
         device::get,
-        device::get_path,
+        device::get_payload,
         device::post,
         device::put,
     ),
     components(
         schemas(
+            start::PayloadOld,
             start::Payload,
             start::Response,
-            device::PutDevicePayload,
+            device::DevicePayload,
             device::GetDevicePayload,
-            device::PostDevicePayload,
             db::DeviceSchema,
         )
     ),
@@ -116,14 +118,16 @@ async fn main() -> color_eyre::eyre::Result<()> {
     };
 
     let app = Router::new()
-        .route("/start", post(start::start))
+        .route("/start", post(start::start_payload))
+        .route("/start/:id", post(start::post).get(start::get))
         .route(
             "/device",
-            post(device::post).get(device::get).put(device::put),
+            post(device::post).get(device::get_payload).put(device::put),
         )
-        .route("/device/:id", get(device::get_path))
+        .route("/device/:id", get(device::get))
         .route("/status", get(status::status))
-        .route_layer(from_fn_with_state(shared_state.clone(), extractors::auth))
+        // TODO: Don't load on `None` Auth
+        .route_layer(from_fn_with_state(shared_state.clone(), auth::auth))
         .merge(SwaggerUi::new("/swagger-ui").url("/api-docs/openapi.json", ApiDoc::openapi()))
         .with_state(Arc::new(shared_state));
 
diff --git a/src/routes/device.rs b/src/routes/device.rs
index d01d9f0..40b5cd8 100644
--- a/src/routes/device.rs
+++ b/src/routes/device.rs
@@ -20,7 +20,7 @@ use utoipa::ToSchema;
     security(("api_key" = []))
 )]
 #[deprecated]
-pub async fn get(
+pub async fn get_payload(
     State(state): State<Arc<crate::AppState>>,
     Json(payload): Json<GetDevicePayload>,
 ) -> Result<Json<Value>, Error> {
@@ -49,11 +49,11 @@ pub async fn get(
         (status = 200, description = "Get `Device` information", body = [Device])
     ),
     params(
-        ("id" = String, Path, description = "Device id")
+        ("id" = String, Path, description = "device id")
     ),
-    security(("api_key" = []))
+    security((), ("api_key" = []))
 )]
-pub async fn get_path(
+pub async fn get(
     State(state): State<Arc<crate::AppState>>,
     Path(path): Path<String>,
 ) -> Result<Json<Value>, Error> {
@@ -76,22 +76,31 @@ pub async fn get_path(
 }
 
 #[derive(Deserialize, ToSchema)]
+#[deprecated]
 pub struct GetDevicePayload {
     id: String,
 }
 
+#[derive(Deserialize, ToSchema)]
+pub struct DevicePayload {
+    id: String,
+    mac: String,
+    broadcast_addr: String,
+    ip: String,
+}
+
 #[utoipa::path(
     put,
     path = "/device",
-    request_body = PutDevicePayload,
+    request_body = DevicePayload,
     responses(
-        (status = 200, description = "List matching todos by query", body = [DeviceSchema])
+        (status = 200, description = "add device to storage", body = [DeviceSchema])
     ),
-    security(("api_key" = []))
+    security((), ("api_key" = []))
 )]
 pub async fn put(
     State(state): State<Arc<crate::AppState>>,
-    Json(payload): Json<PutDevicePayload>,
+    Json(payload): Json<DevicePayload>,
 ) -> Result<Json<Value>, Error> {
     info!(
         "add device {} ({}, {}, {})",
@@ -118,26 +127,18 @@ pub async fn put(
     Ok(Json(json!(device)))
 }
 
-#[derive(Deserialize, ToSchema)]
-pub struct PutDevicePayload {
-    id: String,
-    mac: String,
-    broadcast_addr: String,
-    ip: String,
-}
-
 #[utoipa::path(
     post,
     path = "/device",
-    request_body = PostDevicePayload,
+    request_body = DevicePayload,
     responses(
-        (status = 200, description = "List matching todos by query", body = [DeviceSchema])
+        (status = 200, description = "update device in storage", body = [DeviceSchema])
     ),
-    security(("api_key" = []))
+    security((), ("api_key" = []))
 )]
 pub async fn post(
     State(state): State<Arc<crate::AppState>>,
-    Json(payload): Json<PostDevicePayload>,
+    Json(payload): Json<DevicePayload>,
 ) -> Result<Json<Value>, Error> {
     info!(
         "edit device {} ({}, {}, {})",
@@ -162,11 +163,3 @@ pub async fn post(
 
     Ok(Json(json!(device)))
 }
-
-#[derive(Deserialize, ToSchema)]
-pub struct PostDevicePayload {
-    id: String,
-    mac: String,
-    broadcast_addr: String,
-    ip: String,
-}
diff --git a/src/routes/start.rs b/src/routes/start.rs
index ef6e8f2..ff3d1be 100644
--- a/src/routes/start.rs
+++ b/src/routes/start.rs
@@ -2,27 +2,28 @@ use crate::db::Device;
 use crate::error::Error;
 use crate::services::ping::Value as PingValue;
 use crate::wol::{create_buffer, send_packet};
-use axum::extract::State;
+use axum::extract::{Path, State};
 use axum::Json;
 use serde::{Deserialize, Serialize};
 use serde_json::{json, Value};
-use utoipa::ToSchema;
 use std::sync::Arc;
 use tracing::{debug, info};
+use utoipa::ToSchema;
 use uuid::Uuid;
 
 #[utoipa::path(
     post,
     path = "/start",
-    request_body = Payload,
+    request_body = PayloadOld,
     responses(
-        (status = 200, description = "List matching todos by query", body = [Response])
+        (status = 200, description = "DEP", body = [Response])
     ),
-    security(("api_key" = []))
+    security((), ("api_key" = []))
 )]
-pub async fn start(
+#[deprecated]
+pub async fn start_payload(
     State(state): State<Arc<crate::AppState>>,
-    Json(payload): Json<Payload>,
+    Json(payload): Json<PayloadOld>,
 ) -> Result<Json<Value>, Error> {
     info!("POST request");
     let device = sqlx::query_as!(
@@ -59,6 +60,89 @@ pub async fn start(
     })))
 }
 
+#[utoipa::path(
+    post,
+    path = "/start/{id}",
+    request_body = Option<Payload>,
+    responses(
+        (status = 200, description = "start the device with the given id", body = [Response])
+    ),
+    params(
+        ("id" = String, Path, description = "device id")
+    ),
+    security((), ("api_key" = []))
+)]
+pub async fn post(
+    State(state): State<Arc<crate::AppState>>,
+    Path(id): Path<String>,
+    payload: Option<Json<Payload>>,
+) -> Result<Json<Value>, Error> {
+    send_wol(state, &id, payload).await
+}
+
+#[utoipa::path(
+    get,
+    path = "/start/{id}",
+    responses(
+        (status = 200, description = "start the device with the given id", body = [Response])
+    ),
+    params(
+        ("id" = String, Path, description = "device id")
+    ),
+    security((), ("api_key" = []))
+)]
+pub async fn get(
+    State(state): State<Arc<crate::AppState>>,
+    Path(id): Path<String>,
+) -> Result<Json<Value>, Error> {
+    send_wol(state, &id, None).await
+}
+
+async fn send_wol(
+    state: Arc<crate::AppState>,
+    id: &str,
+    payload: Option<Json<Payload>>,
+) -> Result<Json<Value>, Error> {
+    info!("Start request for {id}");
+    let device = sqlx::query_as!(
+        Device,
+        r#"
+        SELECT id, mac, broadcast_addr, ip, times
+        FROM devices
+        WHERE id = $1;
+        "#,
+        id
+    )
+    .fetch_one(&state.db)
+    .await?;
+
+    info!("starting {}", device.id);
+
+    let bind_addr = "0.0.0.0:0";
+
+    let _ = send_packet(
+        bind_addr,
+        &device.broadcast_addr,
+        &create_buffer(&device.mac.to_string())?,
+    )?;
+    let dev_id = device.id.clone();
+    let uuid = if let Some(pl) = payload {
+        if pl.ping.is_some_and(|ping| ping) {
+            Some(setup_ping(state, device))
+        } else {
+            None
+        }
+    } else {
+        None
+    };
+
+    Ok(Json(json!(Response {
+        id: dev_id,
+        boot: true,
+        uuid
+    })))
+}
+
 fn setup_ping(state: Arc<crate::AppState>, device: Device) -> String {
     let mut uuid: Option<String> = None;
     for (key, value) in state.ping_map.clone() {
@@ -99,11 +183,17 @@ fn setup_ping(state: Arc<crate::AppState>, device: Device) -> String {
 }
 
 #[derive(Deserialize, ToSchema)]
-pub struct Payload {
+#[deprecated]
+pub struct PayloadOld {
     id: String,
     ping: Option<bool>,
 }
 
+#[derive(Deserialize, ToSchema)]
+pub struct Payload {
+    ping: Option<bool>,
+}
+
 #[derive(Serialize, ToSchema)]
 pub struct Response {
     id: String,