itsi 0.2.22 → 0.2.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 431fc2c382fd32204fb84de948bfa584a7ad420aff7bd38df80823aef47e6a6e
-  data.tar.gz: 2f65a4465d5dfe4230d47409426713632eed82de3269a0f54678c558523cf27c
+  metadata.gz: 6f500a7fdc96a95bb73c92215cef369ad5a208c0ef60f260c36257f74a592448
+  data.tar.gz: 42ccd29b510e972f40b291a0f058b618e4605f2c9379412c853542d7e5e4e8a8
 SHA512:
-  metadata.gz: e9e4b8395a97b8b81180aa83fb19c5bb1f0a15abb80846f29aa933051ac1ff1ac8e20a55244ab60f10eeb35e78ab3703c90073b5bc28da9c4b82b1c3e609224d
-  data.tar.gz: 9f5a32484e1e861e348dcfd3728479a0b8ea0ed11821f13256ffc64d6af1c8a17d5b2c53545e5b4b29eb5774421098f3d7a41d03b3094937230b8f4f37573f83
+  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

@@ -1662,7 +1662,7 @@ checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
 
 [[package]]
 name = "itsi-scheduler"
-version = "0.2.21"
+version = "0.2.23"
 dependencies = [
  "bytes",
  "derive_more",
@@ -1680,7 +1680,7 @@ dependencies = [
 
 [[package]]
 name = "itsi-server"
-version = "0.2.21"
+version = "0.2.23"
 dependencies = [
  "argon2",
  "async-channel",

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/crates/itsi_scheduler/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "itsi-scheduler"
-version = "0.2.22"
+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.22"
+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/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 =

data/gems/scheduler/Cargo.lock

@@ -211,7 +211,7 @@ checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
 
 [[package]]
 name = "itsi-scheduler"
-version = "0.2.21"
+version = "0.2.23"
 dependencies = [
  "bytes",
  "derive_more",

data/gems/scheduler/lib/itsi/scheduler/version.rb

@@ -2,6 +2,6 @@
 
 module Itsi
   class Scheduler
-    VERSION = "0.2.22"
+    VERSION = "0.2.23"
   end
 end

data/gems/server/Cargo.lock

@@ -1662,7 +1662,7 @@ checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
 
 [[package]]
 name = "itsi-server"
-version = "0.2.21"
+version = "0.2.23"
 dependencies = [
  "argon2",
  "async-channel",

data/gems/server/lib/itsi/server/version.rb

@@ -2,6 +2,6 @@
 
 module Itsi
   class Server
-    VERSION = "0.2.22"
+    VERSION = "0.2.23"
   end
 end

data/gems/server/test/helpers/test_helper.rb

@@ -90,6 +90,25 @@ class RequestContext
     client.request(request)
   end
 
+  def raw_http(request)
+    socket = TCPSocket.new(@uri.host, @uri.port)
+    socket.write(request)
+    socket.flush
+
+    response = +""
+    loop do
+      ready = IO.select([socket], nil, nil, 1)
+      break unless ready
+
+      response << socket.readpartial(16 * 1024)
+    rescue EOFError
+      break
+    end
+    response
+  ensure
+    socket&.close
+  end
+
   def head(path)
     request = Net::HTTP::Head.new(uri_for(path))
     client.request(request)

data/gems/server/test/options/unmatched_request.rb

@@ -0,0 +1,29 @@
+require_relative "../helpers/test_helper"
+
+class TestUnmatchedRequest < Minitest::Test
+  def test_connect_request_without_matching_stack_does_not_stop_listener
+    server(
+      itsi_rb: lambda do
+        get("/ok") { |r| r.respond("ok") }
+      end
+    ) do
+      response = raw_http("CONNECT google.com:443 HTTP/1.1\r\nHost: google.com:443\r\n\r\n")
+
+      assert_match(/\AHTTP\/\d(?:\.\d)? 404\b/, response)
+      assert_equal "ok", get("/ok")
+    end
+  end
+
+  def test_origin_form_request_without_leading_slash_does_not_stop_listener
+    server(
+      itsi_rb: lambda do
+        get("/ok") { |r| r.respond("ok") }
+      end
+    ) do
+      response = raw_http("GET default.asp HTTP/1.1\r\nHost: example.com\r\n\r\n")
+
+      assert_match(/\AHTTP\/\d(?:\.\d)? 404\b/, response)
+      assert_equal "ok", get("/ok")
+    end
+  end
+end

data/lib/itsi/version.rb

@@ -1,3 +1,3 @@
 module Itsi
-  VERSION = "0.2.22"
+  VERSION = "0.2.23"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: itsi
 version: !ruby/object:Gem::Version
-  version: 0.2.22
+  version: 0.2.23
 platform: ruby
 authors:
 - Wouter Coppieters
@@ -15,28 +15,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.22
+        version: 0.2.23
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.22
+        version: 0.2.23
 - !ruby/object:Gem::Dependency
   name: itsi-server
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.22
+        version: 0.2.23
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.22
+        version: 0.2.23
 description: Wrapper Gem for both the Itsi server and the Itsi Fiber scheduler
 email:
 - wc@pico.net.nz
@@ -1139,6 +1139,7 @@ files:
 - gems/server/test/options/test_request_timeout.rb
 - gems/server/test/options/test_threads.rb
 - gems/server/test/options/test_workers.rb
+- gems/server/test/options/unmatched_request.rb
 - gems/server/test/rack/test_rack_server.rb
 - gems/server/vendor/rb-sys-build/.cargo-ok
 - gems/server/vendor/rb-sys-build/.cargo_vcs_info.json