itsi 0.1.11 → 0.1.12

data/crates/itsi_server/src/server/middleware_stack/mod.rs

@@ -0,0 +1,315 @@
+mod middleware;
+mod middlewares;
+use super::types::HttpRequest;
+use http::header::{ACCEPT, CONTENT_TYPE, HOST};
+use itsi_rb_helpers::HeapVal;
+use magnus::{error::Result, value::ReprValue, RArray, RHash, Ruby, TryConvert, Value};
+pub use middleware::Middleware;
+pub use middlewares::*;
+use regex::{Regex, RegexSet};
+use std::{collections::HashMap, sync::Arc};
+use tracing::info;
+
+#[derive(Debug)]
+pub struct MiddlewareSet {
+    pub route_set: RegexSet,
+    pub patterns: Vec<Arc<Regex>>,
+    pub stacks: HashMap<usize, MiddlewareStack>,
+    pub default_stack: Vec<Middleware>,
+}
+
+#[derive(Debug)]
+pub struct MiddlewareStack {
+    layers: Vec<Middleware>,
+    methods: Option<Vec<StringMatch>>,
+    protocols: Option<Vec<StringMatch>>,
+    hosts: Option<Vec<StringMatch>>,
+    extensions: Option<Vec<StringMatch>>,
+    ports: Option<Vec<StringMatch>>,
+    content_types: Option<Vec<StringMatch>>,
+    accepts: Option<Vec<StringMatch>>,
+}
+
+#[derive(Debug)]
+enum StringMatch {
+    Exact(String),
+    Wildcard(Regex),
+}
+
+impl StringMatch {
+    fn from_value(value: Value) -> Result<Self> {
+        let ruby = Ruby::get().unwrap();
+        if value.is_kind_of(ruby.class_regexp()) {
+            let src_str = value.funcall::<_, _, String>("source", ())?;
+            let regex = Regex::new(&src_str).map_err(|e| {
+                magnus::Error::new(
+                    magnus::exception::exception(),
+                    format!("Invalid regexp: {}", e),
+                )
+            })?;
+            Ok(StringMatch::Wildcard(regex))
+        } else {
+            Ok(StringMatch::Exact(value.to_string()))
+        }
+    }
+
+    fn matches(&self, value: &str) -> bool {
+        match self {
+            StringMatch::Exact(s) => s.eq_ignore_ascii_case(value),
+            StringMatch::Wildcard(re) => re.is_match(value),
+        }
+    }
+}
+
+impl MiddlewareStack {
+    pub fn matches(&self, request: &HttpRequest) -> bool {
+        if let Some(methods) = &self.methods {
+            let method = request.method().as_str();
+            if !methods.iter().any(|m| m.matches(method)) {
+                return false;
+            }
+        }
+
+        if let (Some(protocols), Some(protocol)) = (&self.protocols, request.uri().scheme()) {
+            if !protocols.iter().any(|p| p.matches(protocol.as_str())) {
+                return false;
+            }
+        }
+
+        if let (Some(hosts), Some(host)) = (&self.hosts, request.headers().get(HOST)) {
+            if let Ok(host) = host.to_str() {
+                if !hosts.iter().any(|d| d.matches(host)) {
+                    return false;
+                }
+            }
+        }
+
+        if let (Some(ports), Some(port)) = (&self.ports, request.uri().port()) {
+            if !ports.iter().any(|d| d.matches(port.as_str())) {
+                info!("No match between port {} and {:?}", port, ports);
+                return false;
+            }
+        }
+
+        if let Some(extensions) = &self.extensions {
+            let extension = request.uri().path().split('.').next_back().unwrap_or("");
+            if !extensions.iter().any(|e| e.matches(extension)) {
+                return false;
+            }
+        }
+
+        if let Some(content_types) = &self.content_types {
+            if let Some(content_type) = request.headers().get(CONTENT_TYPE) {
+                if !content_types
+                    .iter()
+                    .any(|ct| ct.matches(content_type.to_str().unwrap_or("")))
+                {
+                    return false;
+                }
+            }
+        }
+
+        if let Some(accepts) = &self.accepts {
+            if let Some(accept) = request.headers().get(ACCEPT) {
+                if !accepts
+                    .iter()
+                    .any(|a| a.matches(accept.to_str().unwrap_or("")))
+                {
+                    return false;
+                }
+            }
+        }
+
+        true
+    }
+}
+
+impl MiddlewareSet {
+    pub fn new(routes_raw: Option<HeapVal>, default_app: HeapVal) -> Result<Self> {
+        if let Some(routes_raw) = routes_raw {
+            let mut stacks = HashMap::new();
+            let mut routes = vec![];
+            for (index, route) in RArray::from_value(*routes_raw)
+                .ok_or(magnus::Error::new(
+                    magnus::exception::exception(),
+                    format!("Routes must be an array. Got {:?}", routes_raw),
+                ))?
+                .into_iter()
+                .enumerate()
+            {
+                let route_hash: RHash = RHash::try_convert(route)?;
+                let route_raw = route_hash
+                    .get("route")
+                    .ok_or(magnus::Error::new(
+                        magnus::exception::exception(),
+                        "Route is missing :route key",
+                    ))?
+                    .funcall::<_, _, String>("source", ())?;
+                let middleware =
+                    RArray::from_value(route_hash.get("middleware").ok_or(magnus::Error::new(
+                        magnus::exception::exception(),
+                        "Route is missing middleware key",
+                    ))?)
+                    .ok_or(magnus::Error::new(
+                        magnus::exception::exception(),
+                        format!("middleware must be an array. Got {:?}", routes_raw),
+                    ))?;
+
+                let mut layers = middleware
+                    .into_iter()
+                    .map(MiddlewareSet::parse_middleware)
+                    .collect::<Result<Vec<_>>>()?;
+                layers.push(Middleware::RubyApp(RubyApp::from_value(
+                    default_app.clone(),
+                )?));
+                routes.push(route_raw);
+                layers.sort();
+                stacks.insert(
+                    index,
+                    MiddlewareStack {
+                        layers,
+                        methods: extract_optional_match_array(route_hash, "methods")?,
+                        protocols: extract_optional_match_array(route_hash, "protocols")?,
+                        hosts: extract_optional_match_array(route_hash, "hosts")?,
+                        extensions: extract_optional_match_array(route_hash, "extensions")?,
+                        ports: extract_optional_match_array(route_hash, "ports")?,
+                        content_types: extract_optional_match_array(route_hash, "content_types")?,
+                        accepts: extract_optional_match_array(route_hash, "accepts")?,
+                    },
+                );
+            }
+            info!("Routes are {:?}", routes);
+            Ok(Self {
+                route_set: RegexSet::new(&routes).map_err(|e| {
+                    magnus::Error::new(
+                        magnus::exception::exception(),
+                        format!("Failed to create route set: {}", e),
+                    )
+                })?,
+                patterns: routes
+                    .into_iter()
+                    .map(|r| Regex::new(&r))
+                    .collect::<std::result::Result<Vec<Regex>, regex::Error>>()
+                    .map_err(|e| {
+                        magnus::Error::new(
+                            magnus::exception::exception(),
+                            format!("Failed to create route set: {}", e),
+                        )
+                    })?
+                    .into_iter()
+                    .map(Arc::new)
+                    .collect(),
+                stacks,
+                default_stack: vec![Middleware::RubyApp(RubyApp::from_value(default_app)?)],
+            })
+        } else {
+            Ok(Self {
+                route_set: RegexSet::empty(),
+                patterns: Vec::new(),
+                stacks: HashMap::new(),
+                default_stack: vec![Middleware::RubyApp(RubyApp::from_value(default_app)?)],
+            })
+        }
+    }
+
+    pub fn stack_for(&self, request: &HttpRequest) -> (&Vec<Middleware>, Option<Arc<Regex>>) {
+        let binding = self.route_set.matches(request.uri().path());
+        let matches = binding.iter();
+        for index in matches {
+            let matching_pattern = self.patterns.get(index).cloned();
+            if let Some(stack) = self.stacks.get(&index) {
+                if stack.matches(request) {
+                    return (&stack.layers, matching_pattern);
+                }
+            }
+        }
+        (self.default_stack(), None)
+    }
+
+    pub fn parse_middleware(middleware: Value) -> Result<Middleware> {
+        let middleware_hash = RHash::from_value(middleware).ok_or(magnus::Error::new(
+            magnus::exception::exception(),
+            format!("Filter must be a hash. Got {:?}", middleware),
+        ))?;
+        let middleware_type: String = middleware_hash
+            .get("type")
+            .ok_or(magnus::Error::new(
+                magnus::exception::exception(),
+                format!("Filter must have a :type key. Got {:?}", middleware_hash),
+            ))?
+            .to_string();
+
+        let parameters: Value = middleware_hash.get("parameters").ok_or(magnus::Error::new(
+            magnus::exception::exception(),
+            format!(
+                "Filter must have a :parameters key. Got {:?}",
+                middleware_hash
+            ),
+        ))?;
+
+        let result = match middleware_type.as_str() {
+            "allow_list" => Middleware::AllowList(AllowList::from_value(parameters)?),
+            "auth_basic" => Middleware::AuthBasic(AuthBasic::from_value(parameters)?),
+            "auth_jwt" => Middleware::AuthJwt(Box::new(AuthJwt::from_value(parameters)?)),
+            "auth_api_key" => Middleware::AuthAPIKey(AuthAPIKey::from_value(parameters)?),
+            "cache_control" => Middleware::CacheControl(CacheControl::from_value(parameters)?),
+            "deny_list" => Middleware::DenyList(DenyList::from_value(parameters)?),
+            "etag" => Middleware::ETag(ETag::from_value(parameters)?),
+            "intrusion_protection" => {
+                Middleware::IntrusionProtection(IntrusionProtection::from_value(parameters)?)
+            }
+            "rate_limit" => Middleware::RateLimit(RateLimit::from_value(parameters)?),
+            "cors" => Middleware::Cors(Box::new(Cors::from_value(parameters)?)),
+            "request_headers" => {
+                Middleware::RequestHeaders(RequestHeaders::from_value(parameters)?)
+            }
+            "response_headers" => {
+                Middleware::ResponseHeaders(ResponseHeaders::from_value(parameters)?)
+            }
+            "static_assets" => Middleware::StaticAssets(StaticAssets::from_value(parameters)?),
+            "compression" => Middleware::Compression(Compression::from_value(parameters)?),
+            "log_requests" => Middleware::LogRequests(LogRequests::from_value(parameters)?),
+            "redirect" => Middleware::Redirect(Redirect::from_value(parameters)?),
+            "app" => Middleware::RubyApp(RubyApp::from_value(parameters.into())?),
+            "proxy" => Middleware::Proxy(Proxy::from_value(parameters)?),
+            _ => {
+                return Err(magnus::Error::new(
+                    magnus::exception::exception(),
+                    format!("Unknown filter type: {}", middleware_type),
+                ))
+            }
+        };
+
+        Ok(result)
+    }
+
+    fn default_stack(&self) -> &Vec<Middleware> {
+        &self.default_stack
+    }
+
+    pub async fn initialize_layers(&self) -> Result<()> {
+        for middleware in &self.default_stack {
+            middleware.initialize().await?;
+        }
+        for stack in self.stacks.values() {
+            for middleware in &stack.layers {
+                middleware.initialize().await?;
+            }
+        }
+        Ok(())
+    }
+}
+
+fn extract_optional_match_array(route_hash: RHash, arg: &str) -> Result<Option<Vec<StringMatch>>> {
+    let rarray = route_hash.aref::<_, Option<RArray>>(arg)?;
+    if let Some(array) = rarray {
+        Ok(Some(
+            array
+                .into_iter()
+                .map(StringMatch::from_value)
+                .collect::<Result<Vec<StringMatch>>>()?,
+        ))
+    } else {
+        Ok(None)
+    }
+}

data/crates/itsi_server/src/server/mod.rs

@@ -1,11 +1,18 @@
 pub mod bind;
 pub mod bind_protocol;
+pub mod byte_frame;
+pub mod cache_store;
 pub mod io_stream;
-pub mod itsi_server;
+pub mod itsi_service;
 pub mod lifecycle_event;
 pub mod listener;
+pub mod middleware_stack;
 pub mod process_worker;
+pub mod rate_limiter;
+pub mod request_job;
 pub mod serve_strategy;
 pub mod signal;
+pub mod static_file_server;
 pub mod thread_worker;
 pub mod tls;
+pub mod types;

data/crates/itsi_server/src/server/process_worker.rs

@@ -7,7 +7,7 @@ use nix::{
     sys::{
         signal::{
             kill,
-            Signal::{SIGKILL, SIGTERM},
+            Signal::{SIGINFO, SIGKILL, SIGTERM},
         },
         wait::{waitpid, WaitPidFlag, WaitStatus},
     },
@@ -53,8 +53,18 @@ impl ProcessWorker {
             }
             *self.child_pid.lock() = None;
         }
-        match call_with_gvl(|_ruby| fork(cluster_template.server.hooks.get("after_fork").cloned()))
-        {
+
+        match call_with_gvl(|_ruby| {
+            fork(
+                cluster_template
+                    .server_config
+                    .server_params
+                    .read()
+                    .hooks
+                    .get("after_fork")
+                    .cloned(),
+            )
+        }) {
             Some(pid) => {
                 *self.child_pid.lock() = Some(Pid::from_raw(pid));
             }
@@ -65,11 +75,7 @@ impl ProcessWorker {
                 ) {
                     error!("Failed to set process group ID: {}", e);
                 }
-                match SingleMode::new(
-                    cluster_template.server.clone(),
-                    cluster_template.listeners.lock().drain(..).collect(),
-                    cluster_template.lifecycle_channel.clone(),
-                ) {
+                match SingleMode::new(cluster_template.server_config.clone()) {
                     Ok(single_mode) => {
                         Arc::new(single_mode).run().ok();
                     }
@@ -129,8 +135,14 @@ impl ProcessWorker {
     pub(crate) async fn graceful_shutdown(&self, cluster_template: Arc<ClusterMode>) {
         let self_clone = self.clone();
         self_clone.request_shutdown();
-        let force_kill_time =
-            Instant::now() + Duration::from_secs_f64(cluster_template.server.shutdown_timeout);
+        let force_kill_time = Instant::now()
+            + Duration::from_secs_f64(
+                cluster_template
+                    .server_config
+                    .server_params
+                    .read()
+                    .shutdown_timeout,
+            );
         while self_clone.is_alive() && force_kill_time > Instant::now() {
             tokio::time::sleep(Duration::from_millis(100)).await;
         }
@@ -171,10 +183,24 @@ impl ProcessWorker {
     pub(crate) fn force_kill(&self) {
         let child_pid = *self.child_pid.lock();
         if let Some(pid) = child_pid {
-            if let Err(e) = kill(pid, SIGKILL) {
-                error!("Failed to force kill process {}: {}", pid, e);
+            if self.is_alive() {
+                if let Err(e) = kill(pid, SIGKILL) {
+                    error!("Failed to force kill process {}: {}", pid, e);
+                }
+            }
+        }
+    }
+
+    pub fn print_info(&self) -> Result<()> {
+        let child_pid = *self.child_pid.lock();
+        if let Some(pid) = child_pid {
+            println!("Worker {:?}, PID: {:?}", self.worker_id, pid);
+            if let Err(e) = kill(pid, SIGINFO) {
+                error!("Failed to send SIGINFO to process {}: {}", pid, e);
             }
         }
+
+        Ok(())
     }
 
     pub(crate) fn just_started(&self) -> bool {