itsi 0.2.21 → 0.2.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: edac434aa9724351fa9fe5220e3451534473303c08d5b6ad34d56bbd5fb1aec6
-  data.tar.gz: 88efe1b953ed1a418666d32730450eb7c14c232d25ea94dcc4b1f169f649367e
+  metadata.gz: 6f500a7fdc96a95bb73c92215cef369ad5a208c0ef60f260c36257f74a592448
+  data.tar.gz: 42ccd29b510e972f40b291a0f058b618e4605f2c9379412c853542d7e5e4e8a8
 SHA512:
-  metadata.gz: 675fe7f09ec66c9583f3c69963127f3ec01e46bf613657bc7d8778919dfccf2a38d420348af3ed51fd5f4df6d05291fec816eab78daa67325196d589eb7dae82
-  data.tar.gz: e6d3276f2b3e59f5dd6cda1f3bcb44e54a59260ca0bf265092bd26069f6ecb3a2c56ad804792a2304062f3e6f3e0e355cf668b89a9a8a93a18168ca4f90ed811
+  metadata.gz: 3e1e1c6426657562728948fbfab3ca19a727e62ba144ef0c1d0c4ab46d6fa4a7152305ea47d4b23cfdb795a906b60e7bea6e8891c6af704ff9486210a7f05a1e
+  data.tar.gz: 499ba6cd3408cf9e780092e025cb3791af23460cc581dbf774f2774a573b45ddded6c8153358ca3ef6744d6bacc998ac829505c37f329e22dc1e856a7e65891d

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## [0.2.23] - 2026-04-18
+- Return a normal 404 for unmatched proxy-style requests such as CONNECT instead of panicking the HTTP listener.
+
 ## [0.2.21] - 2026-02-16
 - Fix Ruby 2.7 startup NameError in static_assets redirect schema load path
 

data/Cargo.lock

@@ -270,7 +270,7 @@ version = "0.28.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bfa9b6986f250236c27e5a204062434a773a13243d2ffc2955f37bdba4c5c6a1"
 dependencies = [
- "bindgen",
+ "bindgen 0.69.5",
  "cc",
  "cmake",
  "dunce",
@@ -427,6 +427,24 @@ dependencies = [
  "which",
 ]
 
+[[package]]
+name = "bindgen"
+version = "0.72.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "993776b509cfb49c750f11b8f07a46fa23e0a1386ffc01fb1e7d343efc387895"
+dependencies = [
+ "bitflags 2.9.0",
+ "cexpr",
+ "clang-sys",
+ "itertools",
+ "proc-macro2",
+ "quote",
+ "regex",
+ "rustc-hash 2.1.1",
+ "shlex",
+ "syn 2.0.101",
+]
+
 [[package]]
 name = "bitflags"
 version = "1.3.2"
@@ -660,7 +678,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "117725a109d387c937a1533ce01b450cbde6b88abceea8473c4d7a85853cda3c"
 dependencies = [
  "lazy_static",
- "windows-sys 0.59.0",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
@@ -1644,7 +1662,7 @@ checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
 
 [[package]]
 name = "itsi-scheduler"
-version = "0.2.21"
+version = "0.2.23"
 dependencies = [
  "bytes",
  "derive_more",
@@ -1662,7 +1680,7 @@ dependencies = [
 
 [[package]]
 name = "itsi-server"
-version = "0.2.21"
+version = "0.2.23"
 dependencies = [
  "argon2",
  "async-channel",
@@ -1934,8 +1952,7 @@ checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94"
 [[package]]
 name = "magnus"
 version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b36a5b126bbe97eb0d02d07acfeb327036c6319fd816139a49824a83b7f9012"
+source = "git+https://github.com/matsadler/magnus.git?rev=1ed232edb2b75a2eed9b1def34ad57e55c411a5c#1ed232edb2b75a2eed9b1def34ad57e55c411a5c"
 dependencies = [
  "bytes",
  "magnus-macros",
@@ -1947,8 +1964,7 @@ dependencies = [
 [[package]]
 name = "magnus-macros"
 version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "47607461fd8e1513cb4f2076c197d8092d921a1ea75bd08af97398f593751892"
+source = "git+https://github.com/matsadler/magnus.git?rev=1ed232edb2b75a2eed9b1def34ad57e55c411a5c#1ed232edb2b75a2eed9b1def34ad57e55c411a5c"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2591,10 +2607,8 @@ dependencies = [
 [[package]]
 name = "rb-sys-build"
 version = "0.9.124"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "568068db4102230882e6d4ae8de6632e224ca75fe5970f6e026a04e91ed635d3"
 dependencies = [
- "bindgen",
+ "bindgen 0.72.1",
  "lazy_static",
  "proc-macro2",
  "quote",
@@ -3922,7 +3936,7 @@ version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
 dependencies = [
- "windows-sys 0.59.0",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]

data/Cargo.toml

@@ -12,6 +12,10 @@ members = [
 ]
 resolver = "2"
 
+[patch.crates-io]
+magnus = { git = "https://github.com/matsadler/magnus.git", rev = "1ed232edb2b75a2eed9b1def34ad57e55c411a5c" }
+rb-sys-build = { path = "vendor/rb-sys-build" }
+
 
 [profile.release]
 opt-level = 3

data/Dockerfile

@@ -3,7 +3,7 @@ FROM ruby:3.4
 RUN apt-get update && apt-get install build-essential libclang-dev -y && apt-get clean && rm -rf /var/lib/apt/lists/*
 RUN curl https://sh.rustup.rs -sSf | sh -s -- -y
 
-COPY pkg/itsi-server-0.2.21.gem .
-RUN gem install itsi-server-0.2.21.gem
+COPY pkg/itsi-server-0.2.23.gem .
+RUN gem install itsi-server-0.2.23.gem
 
 CMD ["itsi", "serve"]

data/Rakefile

@@ -57,7 +57,9 @@ task :sync_crates do
   require 'fileutils'
   GEMS.each do |gem_info|
     ext_dir = File.join(gem_info[:dir], 'ext')
+    vendor_dir = File.join(gem_info[:dir], 'vendor')
     FileUtils.mkdir_p(ext_dir)
+    FileUtils.mkdir_p(vendor_dir)
 
     Dir.chdir('crates') do
       Dir['*'].each do |to_sync|
@@ -68,6 +70,8 @@ task :sync_crates do
         system("cp ../Cargo.lock ../#{gem_info[:dir]}/Cargo.lock")
       end
     end
+
+    system("rsync -q -av vendor/rb-sys-build/ #{vendor_dir}/rb-sys-build --delete")
   end
 end
 

data/crates/itsi_scheduler/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "itsi-scheduler"
-version = "0.2.21"
+version = "0.2.23"
 edition = "2021"
 authors = ["Wouter Coppieters <wc@pico.net.nz>"]
 license = "MIT"

data/crates/itsi_server/Cargo.lock

@@ -984,7 +984,7 @@ checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674"
 
 [[package]]
 name = "itsi-scheduler"
-version = "0.1.0"
+version = "0.2.23"
 dependencies = [
  "bytes",
  "derive_more",
@@ -1002,7 +1002,7 @@ dependencies = [
 
 [[package]]
 name = "itsi-server"
-version = "0.1.0"
+version = "0.2.23"
 dependencies = [
  "async-channel",
  "async-trait",

data/crates/itsi_server/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "itsi-server"
-version = "0.2.21"
+version = "0.2.23"
 edition = "2021"
 authors = ["Wouter Coppieters <wc@pico.net.nz>"]
 license = "MIT"

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

@@ -263,7 +263,7 @@ impl MiddlewareSet {
     pub fn stack_for(
         &self,
         request: &HttpRequest,
-    ) -> Result<(&Vec<Middleware>, Option<Arc<Regex>>)> {
+    ) -> Option<(&Vec<Middleware>, Option<Arc<Regex>>)> {
         let binding = self.route_set.matches(request.uri().path());
         let matches = binding.iter();
 
@@ -276,7 +276,7 @@ impl MiddlewareSet {
             let matching_pattern = self.patterns.get(index).cloned();
             if let Some(stack) = self.stacks.get(&index) {
                 if stack.matches(request) {
-                    return Ok((&stack.layers, matching_pattern));
+                    return Some((&stack.layers, matching_pattern));
                 }
             }
         }
@@ -285,13 +285,7 @@ impl MiddlewareSet {
             request.uri().path(),
             self.route_set
         );
-        Err(magnus::Error::new(
-            magnus::Ruby::get().unwrap().exception_standard_error(),
-            format!(
-                "No matching middleware stack found for request: {:?}",
-                request
-            ),
-        ))
+        None
     }
 
     pub fn parse_middleware(middleware_type: String, parameters: Value) -> Result<Middleware> {

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

@@ -45,15 +45,17 @@ pub fn unsubscribe_runtime() {
 pub fn send_lifecycle_event(event: LifecycleEvent) {
     if let Some(sender) = SIGNAL_HANDLER_CHANNEL.lock().as_ref() {
         if let Err(e) = sender.send(event) {
-            // Channel full or receivers dropped - this is a critical error for shutdown signals
-            eprintln!("Critical: Failed to send lifecycle event {:?}", e);
-            // For shutdown events, try to force exit if channel delivery fails
             if matches!(
                 e.0,
                 LifecycleEvent::Shutdown | LifecycleEvent::ForceShutdown
             ) {
-                eprintln!("Emergency shutdown due to signal delivery failure");
-                std::process::exit(1);
+                SHUTDOWN_REQUESTED.store(true, Ordering::SeqCst);
+                warn!(
+                    "Dropping shutdown lifecycle event after receiver closed: {:?}",
+                    e
+                );
+            } else {
+                eprintln!("Warning: Failed to send lifecycle event {:?}", e);
             }
         }
     } else {

data/crates/itsi_server/src/services/itsi_http_service.rs

@@ -188,14 +188,11 @@ impl ItsiHttpService {
         let token_preference = self.server_params.itsi_server_token_preference;
 
         let service_future = async move {
-            let middleware_stack = self
-                .server_params
-                .middleware
-                .get()
-                .unwrap()
-                .stack_for(&req)
-                .unwrap();
-            let (stack, matching_pattern) = middleware_stack;
+            let Some((stack, matching_pattern)) =
+                self.server_params.middleware.get().unwrap().stack_for(&req)
+            else {
+                return Ok(NOT_FOUND_RESPONSE.to_http_response(accept).await);
+            };
             let mut resp: Option<HttpResponse> = None;
 
             let mut context =