refactor: separe errors into a module

Author: SergioRibera

src/errors.rs

@@ -0,0 +1,33 @@
+use axum::http::StatusCode;
+use axum::response::{IntoResponse, Response};
+
+#[derive(Debug)]
+pub enum HeaderValidationError {
+    MissingHeader(&'static str),
+    InvalidSignature,
+    InvalidUserAgent,
+    WebhookNotFound,
+    AxumError(axum::Error),
+}
+
+impl IntoResponse for HeaderValidationError {
+    fn into_response(self) -> Response {
+        let (status, message) = match self {
+            HeaderValidationError::MissingHeader(header) => (
+                StatusCode::BAD_REQUEST,
+                format!("Missing required header: {header}"),
+            ),
+            HeaderValidationError::InvalidSignature => {
+                (StatusCode::UNAUTHORIZED, "Invalid signature".to_string())
+            }
+            HeaderValidationError::InvalidUserAgent => {
+                (StatusCode::BAD_REQUEST, "Invalid User-Agent".to_string())
+            }
+            HeaderValidationError::WebhookNotFound => {
+                (StatusCode::NOT_FOUND, "Webhook not configured".to_string())
+            }
+            HeaderValidationError::AxumError(error) => (StatusCode::BAD_REQUEST, error.to_string()),
+        };
+        (status, message).into_response()
+    }
+}

src/main.rs

@@ -8,6 +8,7 @@ use notify::{EventHandler, EventKind, Watcher};
 use tokio::sync::RwLock;
 use tracing::level_filters::LevelFilter;
 
+mod errors;
 mod handlers;
 mod validator;
 

src/validator.rs

@@ -1,45 +1,14 @@
 use std::usize;
 
-use crate::GlobalConfig;
+use crate::{GlobalConfig, errors::HeaderValidationError};
 use axum::{
     extract::{Path, Request, State},
-    http::{HeaderMap, StatusCode, header},
+    http::{HeaderMap, header},
     middleware::Next,
-    response::{IntoResponse, Response},
+    response::Response,
 };
 use hmac::{Hmac, Mac};
 
-#[derive(Debug)]
-pub enum HeaderValidationError {
-    MissingHeader(&'static str),
-    InvalidSignature,
-    InvalidUserAgent,
-    WebhookNotFound,
-    AxumError(axum::Error),
-}
-
-impl IntoResponse for HeaderValidationError {
-    fn into_response(self) -> Response {
-        let (status, message) = match self {
-            HeaderValidationError::MissingHeader(header) => (
-                StatusCode::BAD_REQUEST,
-                format!("Missing required header: {header}"),
-            ),
-            HeaderValidationError::InvalidSignature => {
-                (StatusCode::UNAUTHORIZED, "Invalid signature".to_string())
-            }
-            HeaderValidationError::InvalidUserAgent => {
-                (StatusCode::BAD_REQUEST, "Invalid User-Agent".to_string())
-            }
-            HeaderValidationError::WebhookNotFound => {
-                (StatusCode::NOT_FOUND, "Webhook not configured".to_string())
-            }
-            HeaderValidationError::AxumError(error) => (StatusCode::BAD_REQUEST, error.to_string()),
-        };
-        (status, message).into_response()
-    }
-}
-
 pub async fn validate_headers(
     request: Request,
     next: Next,
@@ -132,7 +101,7 @@ fn validate_signature(
             let expected_signature = hex::encode(mac.finalize().into_bytes());
             (expected_signature, signature)
         }
-        None => {
+        _ => {
             let signature = headers
                 .get("X-Hub-Signature")
                 .and_then(|v| v.to_str().ok())