itsi 0.2.23 → 0.2.25

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

@@ -80,7 +80,14 @@ module Itsi
       env["rack.input"] = build_input_io
       env["rack.hijack"] = self
       each_header do |k, v|
-        env[SPECIAL_RACK_HEADER_MAP[k] || RACK_HEADER_MAP[k]] = v
+        rack_header = SPECIAL_RACK_HEADER_MAP[k] || RACK_HEADER_MAP[k]
+        if k == "cookie" && env.key?(rack_header)
+          # RFC 9113 allows HTTP/2 clients to split Cookie across fields. Rack
+          # expects one HTTP_COOKIE value, joined with "; " rather than comma.
+          env[rack_header] = "#{env[rack_header]}; #{v}"
+        else
+          env[rack_header] = v
+        end
       end
       env
     end

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

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

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

@@ -8,6 +8,7 @@ require "itsi/server"
 require "itsi/scheduler"
 require "socket"
 require "net/http"
+require "openssl"
 require "minitest/autorun"
 
 Minitest::Reporters.use! Minitest::Reporters::SpecReporter.new
@@ -157,6 +158,7 @@ class RequestContext
         @uri.host,
         @uri.port,
         use_ssl: @uri.scheme == "https",
+        verify_mode: OpenSSL::SSL::VERIFY_NONE,
         **opts
       )
     end

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

@@ -0,0 +1,19 @@
+require_relative "../helpers/test_helper"
+
+class TestTlsHandshakeTimeout < Minitest::Test
+  def test_incomplete_tls_handshake_does_not_block_listener_indefinitely
+    server(
+      protocol: "https",
+      itsi_rb: lambda do
+        header_read_timeout 5.0
+        get("/ok") { |r| r.ok "ok" }
+      end
+    ) do
+      socket = TCPSocket.new("127.0.0.1", @uri.port)
+
+      assert_equal "ok", get("/ok")
+    ensure
+      socket&.close
+    end
+  end
+end

data/gems/server/test/rack/test_rack_server.rb

@@ -201,6 +201,22 @@ class TestRackServer < Minitest::Test
     end
   end
 
+  def test_duplicate_cookie_request_headers_are_joined_for_rack
+    server(app_with_lint: lambda do |env|
+      [200, { "content-type" => "text/plain" }, [env["HTTP_COOKIE"].to_s]]
+    end) do |uri|
+      response = raw_http(
+        "GET / HTTP/1.1\r\n" \
+        "Host: #{uri.host}:#{uri.port}\r\n" \
+        "Cookie: _session_id=abc\r\n" \
+        "Cookie: _gat=1\r\n" \
+        "Connection: close\r\n\r\n"
+      )
+
+      assert_includes response, "\r\n\r\n_session_id=abc; _gat=1"
+    end
+  end
+
   def test_multiple_headers
     server(app_with_lint: lambda do |env|
       [200, { "content-type" => "text/plain", "x-example" => "one, two, three" }, ["Multiple Headers"]]

data/lib/itsi/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: itsi
 version: !ruby/object:Gem::Version
-  version: 0.2.23
+  version: 0.2.25
 platform: ruby
 authors:
 - Wouter Coppieters
@@ -15,28 +15,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.23
+        version: 0.2.25
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.23
+        version: 0.2.25
 - !ruby/object:Gem::Dependency
   name: itsi-server
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.23
+        version: 0.2.25
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.23
+        version: 0.2.25
 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/tls_handshake_timeout.rb
 - gems/server/test/options/unmatched_request.rb
 - gems/server/test/rack/test_rack_server.rb
 - gems/server/vendor/rb-sys-build/.cargo-ok