fix: breaking on unsupported methods (#1241)

* fix: breaking on unsupported methods

* update

* fix formatting

Author: sansyrox

src/server.rs

@@ -466,6 +466,11 @@ async fn index(
     excluded_response_headers_paths: web::Data<Option<Vec<String>>>,
     req: HttpRequest,
 ) -> ResponseType {
+    // Check if the HTTP method is supported
+    if !HttpMethod::is_supported(req.method()) {
+        return ResponseType::Standard(Response::method_not_allowed(None));
+    }
+
     let mut request = Request::from_actix_request(&req, payload, &global_request_headers).await;
 
     let route = format!("{}{}", req.method(), req.uri().path());
@@ -500,15 +505,15 @@ async fn index(
     }
 
     // Route execution
-    let mut response = if let Some(res) = const_router.get_route(
-        &HttpMethod::from_actix_method(req.method()),
-        req.uri().path(),
-    ) {
+    let http_method = match HttpMethod::from_actix_method(req.method()) {
+        Ok(method) => method,
+        Err(_) => return ResponseType::Standard(Response::method_not_allowed(None)),
+    };
+
+    let mut response = if let Some(res) = const_router.get_route(&http_method, req.uri().path()) {
         ResponseType::Standard(res)
-    } else if let Some((function, route_params)) = router.get_route(
-        &HttpMethod::from_actix_method(req.method()),
-        req.uri().path(),
-    ) {
+    } else if let Some((function, route_params)) = router.get_route(&http_method, req.uri().path())
+    {
         request.path_params = route_params;
         match execute_http_function(&request, &function).await {
             Ok(r) => r,

src/types/mod.rs

@@ -34,18 +34,33 @@ pub enum HttpMethod {
 }
 
 impl HttpMethod {
-    pub fn from_actix_method(method: &actix_web::http::Method) -> Self {
+    pub fn is_supported(method: &actix_web::http::Method) -> bool {
+        matches!(
+            *method,
+            actix_web::http::Method::GET
+                | actix_web::http::Method::POST
+                | actix_web::http::Method::PUT
+                | actix_web::http::Method::DELETE
+                | actix_web::http::Method::PATCH
+                | actix_web::http::Method::HEAD
+                | actix_web::http::Method::OPTIONS
+                | actix_web::http::Method::CONNECT
+                | actix_web::http::Method::TRACE
+        )
+    }
+
+    pub fn from_actix_method(method: &actix_web::http::Method) -> Result<Self, &'static str> {
         match *method {
-            actix_web::http::Method::GET => Self::GET,
-            actix_web::http::Method::POST => Self::POST,
-            actix_web::http::Method::PUT => Self::PUT,
-            actix_web::http::Method::DELETE => Self::DELETE,
-            actix_web::http::Method::PATCH => Self::PATCH,
-            actix_web::http::Method::HEAD => Self::HEAD,
-            actix_web::http::Method::OPTIONS => Self::OPTIONS,
-            actix_web::http::Method::CONNECT => Self::CONNECT,
-            actix_web::http::Method::TRACE => Self::TRACE,
-            _ => panic!("Unsupported HTTP method"),
+            actix_web::http::Method::GET => Ok(Self::GET),
+            actix_web::http::Method::POST => Ok(Self::POST),
+            actix_web::http::Method::PUT => Ok(Self::PUT),
+            actix_web::http::Method::DELETE => Ok(Self::DELETE),
+            actix_web::http::Method::PATCH => Ok(Self::PATCH),
+            actix_web::http::Method::HEAD => Ok(Self::HEAD),
+            actix_web::http::Method::OPTIONS => Ok(Self::OPTIONS),
+            actix_web::http::Method::CONNECT => Ok(Self::CONNECT),
+            actix_web::http::Method::TRACE => Ok(Self::TRACE),
+            _ => Err("Method Not Allowed"),
         }
     }
 }

src/types/response.rs

@@ -193,6 +193,18 @@ impl Response {
             file_path: None,
         }
     }
+
+    pub fn method_not_allowed(headers: Option<&Headers>) -> Self {
+        const METHOD_NOT_ALLOWED_BYTES: &[u8] = b"Method not allowed";
+
+        Self {
+            status_code: 405,
+            response_type: "text".to_string(),
+            headers: headers.cloned().unwrap_or_else(|| Headers::new(None)),
+            description: METHOD_NOT_ALLOWED_BYTES.to_vec(),
+            file_path: None,
+        }
+    }
 }
 
 impl<'py> IntoPyObject<'py> for Response {