itsi 0.2.21 → 0.2.23

data/gems/scheduler/vendor/rb-sys-build/src/utils.rs

@@ -0,0 +1,53 @@
+use crate::debug_log;
+
+/// Check if current platform is mswin.
+pub fn is_msvc() -> bool {
+    if let Ok(target) = std::env::var("TARGET") {
+        target.contains("msvc")
+    } else {
+        false
+    }
+}
+
+/// Check if current platform is mswin or mingw.
+pub fn is_mswin_or_mingw() -> bool {
+    if let Ok(target) = std::env::var("TARGET") {
+        target.contains("msvc") || target.contains("pc-windows-gnu")
+    } else {
+        false
+    }
+}
+
+/// Splits shell words.
+pub fn shellsplit<S: AsRef<str>>(s: S) -> Vec<String> {
+    let s = s.as_ref();
+    match shell_words::split(s) {
+        Ok(v) => v,
+        Err(e) => {
+            debug_log!("WARN: shellsplit failed: {}", e);
+            s.split_whitespace().map(Into::into).collect()
+        }
+    }
+}
+
+#[macro_export]
+macro_rules! memoize {
+    ($type:ty: $val:expr) => {{
+        static INIT: std::sync::Once = std::sync::Once::new();
+        static mut VALUE: Option<$type> = None;
+        #[allow(static_mut_refs)]
+        unsafe {
+            INIT.call_once(|| {
+                VALUE = Some($val);
+            });
+            VALUE.as_ref().unwrap()
+        }
+    }};
+}
+
+#[macro_export]
+macro_rules! debug_log {
+    ($($arg:tt)*) => {
+        eprintln!($($arg)*);
+    };
+}

data/gems/server/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]]
@@ -1642,27 +1660,9 @@ version = "1.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
 
-[[package]]
-name = "itsi-scheduler"
-version = "0.2.21"
-dependencies = [
- "bytes",
- "derive_more",
- "itsi_error",
- "itsi_instrument_entry",
- "itsi_rb_helpers",
- "itsi_tracing",
- "magnus",
- "mio",
- "nix",
- "parking_lot",
- "rb-sys",
- "tracing",
-]
-
 [[package]]
 name = "itsi-server"
-version = "0.2.21"
+version = "0.2.23"
 dependencies = [
  "argon2",
  "async-channel",
@@ -1772,15 +1772,6 @@ dependencies = [
  "thiserror 2.0.12",
 ]
 
-[[package]]
-name = "itsi_instrument_entry"
-version = "0.1.0"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "itsi_rb_helpers"
 version = "0.1.0"
@@ -1934,8 +1925,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 +1937,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 +2580,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 +3909,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/gems/server/Cargo.toml

@@ -5,3 +5,7 @@
 [workspace]
 members = ["./ext/itsi_server"]
 resolver = "2"
+
+[patch.crates-io]
+magnus = { git = "https://github.com/matsadler/magnus.git", rev = "1ed232edb2b75a2eed9b1def34ad57e55c411a5c" }
+rb-sys-build = { path = "vendor/rb-sys-build" }

data/gems/server/Gemfile

@@ -0,0 +1,23 @@
+source "https://rubygems.org"
+
+gemspec
+
+group :development, :test do
+  gem "bundler"
+  gem "minitest", "~> 5.16"
+  gem "rack"
+  gem "rackup"
+  gem "rake", "~> 13.0"
+  gem "rake-compiler"
+  gem "rb_sys", "~> 0.9.91"
+end
+
+group :server_test do
+  gem "grpc"
+end
+
+group :server_test_support do
+  gem "jwt"
+  gem "net_http_unix"
+  gem "redis"
+end

data/gems/server/Rakefile

@@ -3,15 +3,47 @@
 require "bundler/gem_tasks"
 require "minitest/test_task"
 
-
-Minitest::TestTask.create(:test) do |t|
-  t.libs << 'test'
-  t.libs << 'lib'
-  t.warning = false
-  t.test_globs = ['test/**/*.rb']
-  t.test_prelude = 'require "helpers/test_helper.rb"'
+SMOKE_TEST_GLOBS = %w[
+  test/options/bind.rb
+  test/options/header_read_timeout.rb
+  test/options/test_request_timeout.rb
+  test/options/test_threads.rb
+  test/rack/test_rack_server.rb
+  test/middleware/allow_list.rb
+  test/middleware/auth_api_key.rb
+  test/middleware/auth_basic.rb
+  test/middleware/cache_control.rb
+  test/middleware/cidr_to_regex.rb
+  test/middleware/compression.rb
+  test/middleware/cors.rb
+  test/middleware/csp.rb
+  test/middleware/deny_list.rb
+  test/middleware/etag.rb
+  test/middleware/header_interpolation.rb
+  test/middleware/location.rb
+  test/middleware/max_body.rb
+  test/middleware/request_headers.rb
+  test/middleware/response_headers.rb
+  test/middleware/static_assets.rb
+  test/middleware/static_response.rb
+  test/middleware/string_rewrite.rb
+].freeze
+
+def configure_test_task(task_name, test_globs)
+  Minitest::TestTask.create(task_name) do |t|
+    t.libs << "test"
+    t.libs << "lib"
+    t.warning = false
+    t.test_globs = test_globs
+    t.test_prelude = 'require "helpers/test_helper.rb"'
+  end
 end
 
+configure_test_task(:test, ["test/**/*.rb"])
+configure_test_task("test:smoke", SMOKE_TEST_GLOBS)
+
+task "test:full" => :test
+
 require "rb_sys/extensiontask"
 
 task build: :compile

data/gems/server/itsi-server.gemspec

@@ -29,7 +29,11 @@ Gem::Specification.new do |spec|
     end
   end + Dir["../../crates/**/*.{toml,rs,lock,html,json}"].map do |ext_file|
     "ext/#{ext_file[%r{.*crates/(.*?)$}, 1]}"
-  end.compact
+  end.compact +
+    Dir["vendor/rb-sys-build/**/*.{toml,rs,h,lock}"] +
+    Dir["vendor/rb-sys-build/LICENSE-*"] +
+    Dir.glob("lib/**/*.{rb,bundle,so,dylib,dll}")
+  spec.files.uniq!
 
   spec.bindir = "exe"
   spec.executables = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }

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

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+require "rbconfig"
+
+module Itsi
+  class Server
+    module NativeExtension
+      module_function
+
+      def require!
+        ruby_abi = RUBY_VERSION[/\A\d+\.\d+/]
+
+        if ruby_abi && versioned_binary_present?(ruby_abi)
+          begin
+            require_relative "#{ruby_abi}/itsi_server"
+            return
+          rescue LoadError
+            # Fall back to the source-built extension when a packaged binary
+            # exists but cannot be loaded on this machine.
+          end
+        end
+
+        require_relative "itsi_server"
+      end
+
+      def versioned_binary_present?(ruby_abi)
+        binary_path = File.join(__dir__, ruby_abi, "itsi_server.#{RbConfig::CONFIG.fetch("DLEXT")}")
+        File.exist?(binary_path)
+      end
+    end
+  end
+end
+
+Itsi::Server::NativeExtension.require!

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

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

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require_relative "server/version"
-require_relative "server/itsi_server"
+require_relative "server/native_extension"
 require_relative "server/rack_interface"
 require_relative "server/grpc/grpc_interface"
 require_relative "server/grpc/grpc_call"
@@ -87,7 +87,15 @@ module Itsi
 
       def stop_background_threads
         @running && @running.each(&:stop)
-        @background_threads&.each(&:join)
+        @background_threads&.each do |thread|
+          next unless thread
+
+          thread.join(5)
+          next unless thread.alive?
+
+          thread.kill
+          thread.join(1)
+        end
         @background_threads = []
         @running = []
       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/gems/server/test/rack/test_rack_server.rb

@@ -302,8 +302,20 @@ class TestRackServer < Minitest::Test
       )
     end
 
-    sleep 0.25
-    assert_equal Net::HTTP.get(URI("http://#{host}:#{port}")), "Hello, Rackup!"
+    response = nil
+
+    Timeout.timeout(2) do
+      loop do
+        begin
+          response = Net::HTTP.get(URI("http://#{host}:#{port}"))
+          break
+        rescue Errno::ECONNREFUSED, Net::OpenTimeout
+          sleep 0.05
+        end
+      end
+    end
+
+    assert_equal "Hello, Rackup!", response
     Process.kill(:SIGINT, Process.pid)
   end
 

data/gems/server/vendor/rb-sys-build/.cargo-ok

@@ -0,0 +1 @@
+{"v":1}

data/gems/server/vendor/rb-sys-build/.cargo_vcs_info.json

@@ -0,0 +1,6 @@
+{
+  "git": {
+    "sha1": "8b8369748af0e3fa80d20e11b38b423cb2009bdf"
+  },
+  "path_in_vcs": "crates/rb-sys-build"
+}