Merge pull request #111 from spiralover/refactor/regex

feat(http): expose allowed methods

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "medullah-web"
-version = "0.28.0"
+version = "0.29.0"
 edition = "2021"
 license = "MIT"
 description = "Micro-Framework Based on Ntex"
@@ -26,7 +26,7 @@ multipart = ["medullah-multipart"]
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-anyhow = "1.0.94"
+anyhow = "1.0.95"
 
 deadpool = { version = "0.12.1", features = ["managed"] }
 
@@ -40,7 +40,7 @@ redis = { version = "0.27.6", default-features = false, optional = true, feature
 ] }
 deadpool-redis = { version = "0.18.0", features = ["rt_tokio_1"], optional = true }
 
-uuid = { version = "1.12.0", features = ["v4", "serde"] }
+uuid = { version = "1.12.1", features = ["v4", "serde"] }
 log = { version = "0.4.25" }
 serde = { version = "1.0.217", features = ["derive"] }
 tokio = { version = "1.43.0", features = ["rt-multi-thread", "macros", "time"] }

src/app_setup.rs

@@ -32,13 +32,15 @@ use diesel::PgConnection;
 use log::info;
 #[cfg(feature = "templating")]
 use tera::Tera;
+use crate::http::Method;
 
 pub struct MedullahSetup {
     pub env_prefix: String,
     pub private_key: String,
     pub public_key: String,
     pub auth_iss_public_key: String,
     pub allowed_origins: Vec<String>,
+    pub allowed_methods: Vec<Method>,
 }
 
 pub async fn make_app_state(setup: MedullahSetup) -> MedullahState {
@@ -124,6 +126,7 @@ async fn create_app_state(setup: MedullahSetup) -> MedullahState {
             .unwrap(),
 
         allowed_origins: setup.allowed_origins,
+        allowed_methods: setup.allowed_methods,
 
         #[cfg(feature = "mailer")]
         mailer_config: make_mailer_config(&env_prefix),

src/app_state.rs

@@ -16,6 +16,7 @@ use crate::services::cache_service::CacheService;
 use redis::Client as RedisClient;
 #[cfg(feature = "templating")]
 use tera::{Context, Tera};
+use crate::http::Method;
 
 #[derive(Clone)]
 pub struct MedullahState {
@@ -59,9 +60,12 @@ pub struct MedullahState {
     #[cfg(feature = "jwt")]
     pub auth_iss_public_key: String,
 
-    /// list of comma-separated allowed origins
+    /// list of allowed origins
     pub allowed_origins: Vec<String>,
 
+    /// list of allowed methods
+    pub allowed_methods: Vec<Method>,
+
     #[cfg(feature = "mailer")]
     pub mailer_config: AppMailerConfig,
 

src/http/kernel.rs

@@ -1,6 +1,7 @@
 use crate::enums::ResponseCode;
 use crate::helpers::responder::Responder;
 use crate::http::middlewares::Middleware;
+use crate::http::Method;
 use log::info;
 use ntex::http::header;
 use ntex::web::middleware::Logger;
@@ -69,8 +70,8 @@ pub fn setup_logger() -> Logger {
         .exclude("/system/docker-health-check")
 }
 
-pub fn setup_cors(origins: Vec<String>) -> Cors {
-    let mut cors = Cors::new();
+pub fn setup_cors(origins: Vec<String>, methods: Vec<Method>) -> Cors {
+    let mut cors = Cors::new().send_wildcard();
 
     for origin in origins {
         info!("registering cors origin: {origin}...");
@@ -84,7 +85,19 @@ pub fn setup_cors(origins: Vec<String>) -> Cors {
         cors = cors.allowed_origin(origin.as_str());
     }
 
-    cors.allowed_methods(vec!["GET", "POST", "PUT", "PATCH", "DELETE"])
+    let allowed_methods = match methods.is_empty() {
+        false => methods,
+        true => vec![
+            Method::GET,
+            Method::POST,
+            Method::PUT,
+            Method::PATCH,
+            Method::DELETE,
+            Method::OPTIONS,
+        ],
+    };
+
+    cors.allowed_methods(allowed_methods)
         .allowed_headers(vec![header::AUTHORIZATION, header::ACCEPT])
         .allowed_header(header::CONTENT_TYPE)
         .max_age(3600)

src/http/mod.rs

@@ -6,4 +6,7 @@ pub mod middlewares;
 pub mod response;
 pub mod server;
 
+pub use ntex_cors::Cors;
+pub use ntex::http::Method;
+
 pub type HttpHandler = fn(cfg: &mut ServiceConfig);

src/http/server.rs

@@ -8,6 +8,7 @@ use crate::app_setup::{
 };
 use crate::env_logger::init_env_logger;
 use crate::http::kernel::{ntex_default_service, register_routes, setup_cors, setup_logger, Route};
+use crate::http::Method;
 use crate::prelude::{AppResult, MedullahState};
 
 pub struct ServerConfig<TB>
@@ -26,9 +27,12 @@ where
     /// whether the app bootstrap has started
     pub has_started_bootstrap: bool,
 
-    /// list of comma-separated allowed origins
+    /// list of allowed CORS origins
     pub allowed_origins: Vec<String>,
 
+    /// list of allowed CORS origins
+    pub allowed_methods: Vec<Method>,
+
     pub boot_thread: TB,
 }
 
@@ -63,6 +67,7 @@ where
         env_prefix: config.env_prefix.clone(),
         auth_iss_public_key: config.auth_iss_public_key,
         allowed_origins: config.allowed_origins,
+        allowed_methods: config.allowed_methods,
     })
     .await;
 
@@ -83,7 +88,13 @@ where
             .state(app_state.clone())
             .configure(|cfg| register_routes(cfg, routes))
             .wrap(setup_logger())
-            .wrap(setup_cors(app_state.allowed_origins.clone()).finish())
+            .wrap(
+                setup_cors(
+                    app_state.allowed_origins.clone(),
+                    app_state.allowed_methods.clone(),
+                )
+                .finish(),
+            )
             .default_service(ntex_default_service());
 
         if cfg!(feature = "static") {