1 files changed, 74 insertions, 63 deletions

diff --git a/src/routes/device.rs b/src/routes/device.rs
index c85df1b..d39d98e 100644
--- a/src/routes/device.rs
+++ b/src/routes/device.rs
@@ -1,34 +1,34 @@
-use std::sync::Arc;
+use crate::db::Device;
+use crate::error::Error;
 use axum::extract::State;
 use axum::Json;
-use axum::http::HeaderMap;
+use mac_address::MacAddress;
 use serde::{Deserialize, Serialize};
 use serde_json::{json, Value};
+use sqlx::types::ipnetwork::IpNetwork;
+use std::{sync::Arc, str::FromStr};
 use tracing::{debug, info};
-use crate::auth::auth;
-use crate::db::Device;
-use crate::error::Error;
 
-pub async fn get(State(state): State<Arc<crate::AppState>>, headers: HeaderMap, Json(payload): Json<GetDevicePayload>) -> Result<Json<Value>, Error> {
-    info!("add device {}", payload.id);
-    let secret = headers.get("authorization");
-    if auth(&state.config, secret).map_err(Error::Auth)? {
-        let device = sqlx::query_as!(
-            Device,
-            r#"
-            SELECT id, mac, broadcast_addr, ip, times
-            FROM devices
-            WHERE id = $1;
-            "#,
-            payload.id
-        ).fetch_one(&state.db).await.map_err(Error::DB)?;
+pub async fn get(
+    State(state): State<Arc<crate::AppState>>,
+    Json(payload): Json<GetDevicePayload>,
+) -> Result<Json<Value>, Error> {
+    info!("get device {}", payload.id);
+    let device = sqlx::query_as!(
+        Device,
+        r#"
+        SELECT id, mac, broadcast_addr, ip, times
+        FROM devices
+        WHERE id = $1;
+        "#,
+        payload.id
+    )
+    .fetch_one(&state.db)
+    .await?;
 
-        debug!("got device {:?}", device);
+    debug!("got device {:?}", device);
 
-        Ok(Json(json!(device)))
-    } else {
-        Err(Error::Generic)
-    }
+    Ok(Json(json!(device)))
 }
 
 #[derive(Deserialize)]
@@ -36,25 +36,31 @@ pub struct GetDevicePayload {
     id: String,
 }
 
-pub async fn put(State(state): State<Arc<crate::AppState>>, headers: HeaderMap, Json(payload): Json<PutDevicePayload>) -> Result<Json<Value>, Error> {
-    info!("add device {} ({}, {}, {})", payload.id, payload.mac, payload.broadcast_addr, payload.ip);
-    let secret = headers.get("authorization");
-    if auth(&state.config, secret).map_err(Error::Auth)? {
-        sqlx::query!(
-            r#"
-            INSERT INTO devices (id, mac, broadcast_addr, ip)
-            VALUES ($1, $2, $3, $4);
-            "#,
-            payload.id,
-            payload.mac,
-            payload.broadcast_addr,
-            payload.ip
-        ).execute(&state.db).await.map_err(Error::DB)?;
+pub async fn put(
+    State(state): State<Arc<crate::AppState>>,
+    Json(payload): Json<PutDevicePayload>,
+) -> Result<Json<Value>, Error> {
+    info!(
+        "add device {} ({}, {}, {})",
+        payload.id, payload.mac, payload.broadcast_addr, payload.ip
+    );
+    
+    let ip = IpNetwork::from_str(&payload.ip)?;
+    let mac = MacAddress::from_str(&payload.mac)?;
+    sqlx::query!(
+        r#"
+        INSERT INTO devices (id, mac, broadcast_addr, ip)
+        VALUES ($1, $2, $3, $4);
+        "#,
+        payload.id,
+        mac,
+        payload.broadcast_addr,
+        ip
+    )
+    .execute(&state.db)
+    .await?;
 
-        Ok(Json(json!(PutDeviceResponse { success: true })))
-    } else {
-        Err(Error::Generic)
-    }
+    Ok(Json(json!(PutDeviceResponse { success: true })))
 }
 
 #[derive(Deserialize)]
@@ -62,35 +68,40 @@ pub struct PutDevicePayload {
     id: String,
     mac: String,
     broadcast_addr: String,
-    ip: String
+    ip: String,
 }
 
 #[derive(Serialize)]
 pub struct PutDeviceResponse {
-    success: bool
+    success: bool,
 }
 
-pub async fn post(State(state): State<Arc<crate::AppState>>, headers: HeaderMap, Json(payload): Json<PostDevicePayload>) -> Result<Json<Value>, Error> {
-    info!("edit device {} ({}, {}, {})", payload.id, payload.mac, payload.broadcast_addr, payload.ip);
-    let secret = headers.get("authorization");
-    if auth(&state.config, secret).map_err(Error::Auth)? {
-        let device = sqlx::query_as!(
-            Device,
-            r#"
-            UPDATE devices
-            SET mac = $1, broadcast_addr = $2, ip = $3 WHERE id = $4
-            RETURNING id, mac, broadcast_addr, ip, times;
-            "#,
-            payload.mac,
-            payload.broadcast_addr,
-            payload.ip,
-            payload.id
-        ).fetch_one(&state.db).await.map_err(Error::DB)?;
+pub async fn post(
+    State(state): State<Arc<crate::AppState>>,
+    Json(payload): Json<PostDevicePayload>,
+) -> Result<Json<Value>, Error> {
+    info!(
+        "edit device {} ({}, {}, {})",
+        payload.id, payload.mac, payload.broadcast_addr, payload.ip
+    );
+    let ip = IpNetwork::from_str(&payload.ip)?;
+    let mac = MacAddress::from_str(&payload.mac)?;
+    let device = sqlx::query_as!(
+        Device,
+        r#"
+        UPDATE devices
+        SET mac = $1, broadcast_addr = $2, ip = $3 WHERE id = $4
+        RETURNING id, mac, broadcast_addr, ip, times;
+        "#,
+        mac,
+        payload.broadcast_addr,
+        ip,
+        payload.id
+    )
+    .fetch_one(&state.db)
+    .await?;
 
-        Ok(Json(json!(device)))
-    } else {
-        Err(Error::Generic)
-    }
+    Ok(Json(json!(device)))
 }
 
 #[derive(Deserialize)]