itsi 0.1.20 → 0.2.3

data/gems/scheduler/README.md

@@ -9,13 +9,12 @@ sidebar:
 
 `Itsi Scheduler` is an implementation of a Ruby [Fiber Scheduler](https://docs.ruby-lang.org/en/3.2/Fiber/Scheduler.html).
 
-When combined with Itsi Server, you can write endpoints that look and feel exactly like regular synchronous Ruby code,
-but behind the scenes, the scheduler will transparently yield and resume concurrent request fibers, to prevent threads from blocking and greatly increase throughput for IO heavy workloads.
+When combined with Itsi Server, you can write endpoints that look just like regular synchronous Ruby code. Behind the scenes, the scheduler will transparently pause and resume fibers to prevent threads from blocking, greatly increasing throughput for I/O-heavy workloads
 
-If you're purely after a light-weight, yet efficient Ruby scheduler,
+If you're purely after a lightweight, yet efficient Ruby scheduler,
 you can use Itsi Scheduler as a standalone scheduler for any Ruby application.
 
-Just use `Fiber.set_scheduler` to set an instance `Itsi::Scheduler` as a scheduler to opt in to this IO weaving behaviour
+Just use `Fiber.set_scheduler` to set an instance `Itsi::Scheduler` as a scheduler to opt in to this IO weaving behavior
 *automatically* for all blocking IO.
 
 ### Primer on Fiber Schedulers
@@ -29,7 +28,7 @@ This behind the scenes magic allows Ruby to provide async IO (just like we find
 that synchronous and asynchronous code is identical! (I.e. Ruby's functions are [colorless](https://journal.stuffwithstuff.com/2015/02/01/what-color-is-your-function/))
 
 ## Getting Started
-To install and use Itsi Scheduler follow the below instructions:
+To install and use Itsi Scheduler follow the instructions below:
 
 
 ### 1 - Install Itsi Scheduler

data/gems/scheduler/Rakefile

@@ -11,10 +11,6 @@ Minitest::TestTask.create(:test) do |t|
   t.test_prelude = 'require "helpers/test_helper.rb"'
 end
 
-require "rubocop/rake_task"
-
-RuboCop::RakeTask.new
-
 require "rb_sys/extensiontask"
 
 task build: :compile

data/gems/scheduler/itsi-scheduler.gemspec

@@ -16,8 +16,8 @@ Gem::Specification.new do |spec|
   spec.required_rubygems_version = ">= 3.1.11"
 
   spec.metadata["homepage_uri"] = spec.homepage
-  spec.metadata["source_code_uri"] = "https://github.com/wouterken/itsi/scheduler"
-  spec.metadata["changelog_uri"] = "https://github.com/wouterken/itsi/scheduler/blob/main/CHANGELOG.md"
+  spec.metadata["source_code_uri"] = "https://github.com/wouterken/itsi"
+  spec.metadata["changelog_uri"] = "https://github.com/wouterken/itsi/blob/main/CHANGELOG.md"
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.

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

@@ -2,6 +2,6 @@
 
 module Itsi
   class Scheduler
-    VERSION = "0.1.20"
+    VERSION = "0.2.3"
   end
 end

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

@@ -44,7 +44,9 @@ module Itsi
       fiber = Fiber.current
       token = Scheduler.resume_token
       readiness = register_io_wait(io.fileno, events, duration, token)
-      readiness || block(nil, duration, fiber, token)
+      readiness ||= block(nil, duration, fiber, token)
+      clear_timer(token)
+      readiness
     end
 
     def unblock(_blocker, fiber)
@@ -130,9 +132,12 @@ module Itsi
     # Need to defer to Process::Status rather than our extension
     # as we don't have a means of creating our own Process::Status.
     def process_wait(pid, flags)
-      Thread.new do
-        Process::Status.wait(pid, flags)
-      end.value
+      result = nil
+      thread = Thread.new do
+        result = Process::Status.wait(pid, flags)
+      end
+      thread.join
+      result
     end
 
     def closed?

data/gems/scheduler/test/test_active_record.rb

@@ -10,9 +10,12 @@ class TestActiveRecordFiberScheduler < Minitest::Test
   def setup
     ActiveSupport::IsolatedExecutionState.isolation_level = :fiber
     ActiveRecord::Base.establish_connection(
-      adapter: "postgresql",
-      database: "fiber_scheduler_test",
-      pool: 2, # use a small pool to test contention scenarios
+      adapter:  "postgresql",
+      host:     ENV.fetch("PGHOST", "localhost"),
+      database: ENV.fetch("PGDATABASE", "fiber_scheduler_test"),
+      **(ENV.fetch("PGUSER", nil).yield_self{|username| username ? {username: username} : {}}),
+      **(ENV.fetch("PGPASSWORD", nil).yield_self{|password| password ? {password: password} : {}}),
+      pool:     2,
       checkout_timeout: 5
     )
   end
@@ -77,10 +80,12 @@ class TestActiveRecordFiberScheduler < Minitest::Test
     # Re-establish connection with a pool size of 1.
     ActiveSupport::IsolatedExecutionState.isolation_level = :fiber
     ActiveRecord::Base.establish_connection(
-      adapter: "postgresql",
-      host: "localhost",
-      database: "fiber_scheduler_test",
-      pool: 1,
+      adapter:  "postgresql",
+      host:     ENV.fetch("PGHOST", "localhost"),
+      database: ENV.fetch("PGDATABASE", "fiber_scheduler_test"),
+      **(ENV.fetch("PGUSER", nil).yield_self{|username| username ? {username: username} : {}}),
+      **(ENV.fetch("PGPASSWORD", nil).yield_self{|password| password ? {password: password} : {}}),
+      pool:     1,
       checkout_timeout: 0.25
     )
     # ActiveRecord::Base.connection_pool.disconnect!

data/gems/server/Cargo.lock

@@ -117,9 +117,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.97"
+version = "1.0.98"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcfed56ad506cb2c684a14971b8861fdc3baaaae314b9e5f9bb532cbe3ba7a4f"
+checksum = "e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487"
 
 [[package]]
 name = "arc-swap"
@@ -253,9 +253,9 @@ dependencies = [
 
 [[package]]
 name = "aws-lc-sys"
-version = "0.28.0"
+version = "0.28.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9f7720b74ed28ca77f90769a71fd8c637a0137f6fae4ae947e1050229cff57f"
+checksum = "bfa9b6986f250236c27e5a204062434a773a13243d2ffc2955f37bdba4c5c6a1"
 dependencies = [
  "bindgen",
  "cc",
@@ -467,9 +467,9 @@ dependencies = [
 
 [[package]]
 name = "brotli-decompressor"
-version = "4.0.2"
+version = "4.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74fa05ad7d803d413eb8380983b092cbbaf9a85f151b871360e7b00cd7060b37"
+checksum = "a334ef7c9e23abf0ce748e8cd309037da93e606ad52eb372e4ce327a0dcfbdfd"
 dependencies = [
  "alloc-no-stdlib",
  "alloc-stdlib",
@@ -587,9 +587,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.36"
+version = "4.5.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2df961d8c8a0d08aa9945718ccf584145eee3f3aa06cddbeac12933781102e04"
+checksum = "eccb054f56cbd38340b380d4a8e69ef1f02f1af43db2f0cc817a4774d80ae071"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -597,9 +597,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.36"
+version = "4.5.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "132dbda40fb6753878316a489d5a1242a8ef2f0d9e47ba01c951ea8aa7d013a5"
+checksum = "efd9466fac8543255d3b1fcad4762c5e116ffe808c8a3043d4263cd4fd4862a2"
 dependencies = [
  "anstream",
  "anstyle",
@@ -764,9 +764,9 @@ dependencies = [
 
 [[package]]
 name = "data-encoding"
-version = "2.8.0"
+version = "2.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "575f75dfd25738df5b91b8e43e14d44bda14637a58fae779fd2b064f8bf3e010"
+checksum = "2a2330da5de22e8a3cb63252ce2abb30116bf5265e89c0e01bc17015ce30a476"
 
 [[package]]
 name = "der-parser"
@@ -1176,9 +1176,9 @@ dependencies = [
 
 [[package]]
 name = "h2"
-version = "0.4.8"
+version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5017294ff4bb30944501348f6f8e42e6ad28f42c8bbef7a74029aff064a4e3c2"
+checksum = "75249d144030531f8dee69fe9cea04d3edf809a017ae445e2abdff6629e86633"
 dependencies = [
  "atomic-waker",
  "bytes",
@@ -1363,7 +1363,7 @@ dependencies = [
  "bytes",
  "futures-channel",
  "futures-util",
- "h2 0.4.8",
+ "h2 0.4.9",
  "http 1.3.1",
  "http-body 1.0.1",
  "httparse",
@@ -1644,7 +1644,7 @@ checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
 
 [[package]]
 name = "itsi-server"
-version = "0.1.20"
+version = "0.2.3"
 dependencies = [
  "argon2",
  "async-channel",
@@ -1681,7 +1681,7 @@ dependencies = [
  "parking_lot",
  "percent-encoding",
  "pin-project",
- "rand 0.9.0",
+ "rand 0.9.1",
  "rcgen",
  "redis",
  "regex",
@@ -1713,7 +1713,7 @@ dependencies = [
  "axum-server",
  "base64 0.22.1",
  "chrono",
- "clap 4.5.36",
+ "clap 4.5.37",
  "futures",
  "log",
  "num-bigint",
@@ -1841,9 +1841,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
 
 [[package]]
 name = "libc"
-version = "0.2.171"
+version = "0.2.172"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c19937216e9d3aa9956d9bb8dfc0b0c8beb6058fc4f7a4dc4d850edf86a237d6"
+checksum = "d750af042f7ef4f724306de029d18836c26c1765a54a6a3f094cbd23a7267ffa"
 
 [[package]]
 name = "libloading"
@@ -1852,7 +1852,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fc2f4eb4bc735547cfed7c0a4922cbd04a4655978c09b54f1f7b228750664c34"
 dependencies = [
  "cfg-if",
- "windows-targets 0.52.6",
+ "windows-targets 0.48.5",
 ]
 
 [[package]]
@@ -2366,9 +2366,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.94"
+version = "1.0.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a31971752e70b8b2686d7e46ec17fb38dad4051d94024c88df49b667caea9c84"
+checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778"
 dependencies = [
  "unicode-ident",
 ]
@@ -2401,7 +2401,7 @@ checksum = "b820744eb4dc9b57a3398183639c511b5a26d2ed702cedd3febaa1393caa22cc"
 dependencies = [
  "bytes",
  "getrandom 0.3.2",
- "rand 0.9.0",
+ "rand 0.9.1",
  "ring",
  "rustc-hash 2.1.1",
  "rustls",
@@ -2466,13 +2466,12 @@ dependencies = [
 
 [[package]]
 name = "rand"
-version = "0.9.0"
+version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3779b94aeb87e8bd4e834cee3650289ee9e0d5677f976ecdb6d219e5f4f6cd94"
+checksum = "9fbfd9d094a40bf3ae768db9361049ace4c0e04a4fd6b359518bd7b73a73dd97"
 dependencies = [
  "rand_chacha 0.9.0",
  "rand_core 0.9.3",
- "zerocopy",
 ]
 
 [[package]]
@@ -3062,9 +3061,9 @@ checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
 
 [[package]]
 name = "signal-hook-registry"
-version = "1.4.2"
+version = "1.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1"
+checksum = "9203b8055f63a2a00e2f593bb0510367fe707d7ff1e5c872de2f537b339e5410"
 dependencies = [
  "libc",
 ]

data/gems/server/Rakefile

@@ -12,10 +12,6 @@ Minitest::TestTask.create(:test) do |t|
   t.test_prelude = 'require "helpers/test_helper.rb"'
 end
 
-require "rubocop/rake_task"
-
-RuboCop::RakeTask.new
-
 require "rb_sys/extensiontask"
 
 task build: :compile

data/gems/server/exe/itsi

@@ -7,17 +7,18 @@ require "optparse"
 
 COMMANDS = {
   "init" => "Initialize a new Itsi.rb server configuration file",
-  "test" => "Test config file validity",
   "status" => "Show the status of the server",
   "start" => "Start the Itsi server",
   "serve" => "Start the Itsi server",
   "stop" => "Stop the server",
   "reload" => "Reload the server",
   "restart" => "Restart the server",
+  "test" => "Test config file validity",
   "add_worker" => "Add a new worker to the server cluster",
   "remove_worker" => "Remove a worker from the server cluster",
   "routes" => "Print the routes of the server",
-  "passfile" => "Manage hashed users and passwords in a passfile (like .htpasswd). [add, remove, list]",
+  "passfile" => "Manage hashed users and passwords in a passfile (like .htpasswd). [add, echo, remove, list]",
+  "secret" => "Generate a new secret for use in a JWT verifier",
   "test_route" => "Test which route a request will be routed to",
   "static" => "Serve static assets in the given directory"
 }
@@ -147,6 +148,15 @@ parser = OptionParser.new do |opts|
   opts.on("--algorithm ALGORITHM", String, "Algorithm for password hashing") do |algorithm|
     options[:algorithm] = algorithm
   end
+
+  opts.on("-dDIR", "--dir=DIR", "(For use with secret) Save keys/secret to DIR instead of printing") do |d|
+    options[:save_dir] = d
+  end
+
+  opts.on("-v", "--version", "Show version") do
+    puts "Itsi version #{Itsi::Server::VERSION}"
+    exit(0)
+  end
 end
 
 if ENV['COMP_LINE'] || ARGV.include?('--completion')
@@ -155,6 +165,7 @@ if ENV['COMP_LINE'] || ARGV.include?('--completion')
 end
 
 parser.parse!
+
 case (command = ARGV.shift)
 when *COMMANDS.keys
   required_arity = Itsi::Server.method(command).parameters&.select{|c| c.first == :req }&.length&.succ || 2

data/gems/server/itsi-server.gemspec

@@ -16,8 +16,8 @@ Gem::Specification.new do |spec|
   spec.required_rubygems_version = ">= 3.1"
 
   spec.metadata["homepage_uri"] = spec.homepage
-  spec.metadata["source_code_uri"] = "https://github.com/wouterken/itsi/server"
-  spec.metadata["changelog_uri"] = "https://github.com/wouterken/itsi/server/blob/main/CHANGELOG.md"
+  spec.metadata["source_code_uri"] = "https://github.com/wouterken/itsi"
+  spec.metadata["changelog_uri"] = "https://github.com/wouterken/itsi/blob/main/CHANGELOG.md"
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.

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

@@ -66,6 +66,8 @@ module Itsi
         511 => :network_authentication_required
       }.freeze
 
+      HTTP_STATUS_NAME_TO_CODE_MAP = HTTP_STATUS_CODES.invert.freeze
+
       HTTP_STATUS_CODES.each do |code, name|
         define_method(name) {|*args, **kwargs| respond(*args, **kwargs, status: code) }
       end

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

@@ -3,7 +3,7 @@
 require "stringio"
 require "socket"
 require "uri"
-require_relative 'http_request/response_status_shortcodes'
+require_relative "http_request/response_status_shortcodes"
 
 module Itsi
   class HttpRequest
@@ -22,7 +22,7 @@ module Itsi
                   end
       [header, rack_form]
     end.to_h.tap do |hm|
-      hm.default_proc = proc { |hsh, key| "HTTP_#{key.upcase.gsub(/-/, "_")}" }
+      hm.default_proc = proc { |_, key| "HTTP_#{key.upcase.gsub(/-/, "_")}" }
     end
 
     def to_rack_env
@@ -78,7 +78,7 @@ module Itsi
     end
 
     def respond(
-      _body = nil, _status = 200, _headers = nil,
+      _body = nil, _status = 200, _headers = nil, # rubocop:disable Lint/UnderscorePrefixedVariableName
       json: nil,
       html: nil,
       text: nil,
@@ -90,9 +90,15 @@ module Itsi
       body: _body,
       &blk
     )
-
       if json
-        validate!(json, as: as) if as
+        if as
+          begin
+            validate!(json, as: as)
+          rescue ValidationError => e
+            json = { type: "error", message: "Validation Error: #{e.message}" }
+            status = 400
+          end
+        end
         body = json.to_json
         headers ||= {}
         headers["Content-Type"] ||= "application/json"
@@ -117,19 +123,23 @@ module Itsi
       self.hijacked = true
       UNIXSocket.pair.yield_self do |(server_sock, app_sock)|
         server_sock.autoclose = false
-        self.response.hijack(server_sock.fileno)
+        response.hijack(server_sock.fileno)
         server_sock.sync = true
         app_sock.sync = true
         app_sock
       end
     end
 
+    def body
+      @body ||= build_input_io
+    end
+
     def build_input_io
-      case body
+      case body_parts
       when nil then EMPTY_IO
-      when String then StringIO.new(body)
-      when Array then File.open(body.first, "rb")
-      else body
+      when String then StringIO.new(body_parts)
+      when Array then File.open(body_parts.first, "rb")
+      else body_parts
       end
     end
 
@@ -137,33 +147,51 @@ module Itsi
       as ? apply_schema!(params, as) : params
     end
 
-    def params(schema=nil)
-      params = case
-      when url_encoded? then URI.decode_www_form(build_input_io.read).to_h
-      when json? then JSON.parse(build_input_io.read)
-      when multipart?
-        Rack::Multipart::Parser.parse(
-          build_input_io,
-          content_length,
-          content_type,
-          Rack::Multipart::Parser::TEMPFILE_FACTORY,
-          Rack::Multipart::Parser::BUFSIZE,
-          Rack::Utils.default_query_parser
-        ).params
-      else
-        {}
-      end
+    def params(schema = nil)
+      params = if url_encoded?
+                 URI.decode_www_form(build_input_io.read).to_h
+               elsif json?
+                 JSON.parse(build_input_io.read)
+               elsif multipart?
+                 Rack::Multipart::Parser.parse(
+                   build_input_io,
+                   content_length,
+                   content_type,
+                   Rack::Multipart::Parser::TEMPFILE_FACTORY,
+                   Rack::Multipart::Parser::BUFSIZE,
+                   Rack::Utils.default_query_parser
+                 ).params
+               else
+                 {}
+               end
 
       params.merge!(query_params).merge!(url_params)
+      validated = schema ? apply_schema!(params, schema) : params
+      if block_given?
+        yield validated
+      else
+        raise "#params must take a block for multipart requests" if multipart?
 
-      yield schema ? apply_schema!(params, schema) : params
+        validated
 
-    rescue StandardError => e
+      end
+    rescue ValidationError => e
       if response.json?
-        respond(json: {error: e.message}, status: 400)
+        respond(json: { error: e.message }, status: 400)
       else
         respond(e.message, 400)
       end
+    rescue StandardError => e
+      Itsi.log_error e.message
+      puts e.backtrace
+
+      # Unexpected error.
+      # Don't reveal potential sensitive information to client.
+      if response.json?
+        respond(json: { error: "Internal Server Error" }, status: 500)
+      else
+        respond("Internal Server Error", 500)
+      end
     ensure
       clean_temp_files(params)
     end
@@ -174,7 +202,7 @@ module Itsi
         if params.key?(:tempfile)
           params[:tempfile].unlink
         else
-        params.each_value { |v| clean_temp_files(v) }
+          params.each_value { |v| clean_temp_files(v) }
         end
       when Array then params.each { |v| clean_temp_files(v) }
       end

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

@@ -1,14 +1,17 @@
 # frozen_string_literal: true
-require 'forwardable'
+
+require "forwardable"
 require "stringio"
 require "socket"
 
 module Itsi
-
   class HttpResponse
-
-    def respond _body=nil, _status=200, _header=nil, status: _status, headers: _header, body: _body, hijack: false, &blk
-      self.status = status
+    def respond(
+      _body = nil, _status = 200, _header = nil, # rubocop:disable Lint/UnderscorePrefixedVariableName
+      status: _status, headers: _header, body: _body,
+      hijack: false
+    )
+      self.status = status.is_a?(Symbol) ? HTTP_STATUS_NAME_TO_CODE_MAP.fetch(status) : status.to_i
 
       body = body.to_s unless body.is_a?(String)
 
@@ -32,9 +35,9 @@ module Itsi
 
         # If you hijack the connection, you are responsible for closing it.
         # Otherwise, the response will be closed automatically.
-        self.close unless hijack
+        close unless hijack
       else
-        self.close
+        close
       end
     end
   end

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

@@ -1,8 +1,7 @@
 module Itsi
   class Server
-
     module Passfile
-      require 'io/console'
+      require "io/console"
 
       module_function
 
@@ -18,7 +17,7 @@ module Itsi
             line.chomp!
             next if line.empty?
 
-            user, pass = line.split(':', 2)
+            user, pass = line.split(":", 2)
             creds[user] = pass
           end
         end
@@ -26,15 +25,14 @@ module Itsi
       end
 
       def save(creds, filename)
-        File.open(filename, 'w', 0o600) do |f|
+        File.open(filename, "w", 0o600) do |f|
           creds.each do |u, p|
             f.puts "#{u}:#{p}"
           end
         end
       end
 
-      def echo(filename, algorithm)
-        return unless (creds = load(filename))
+      def echo(_, algorithm)
         print "Enter username: "
         username = $stdin.gets.chomp
 
@@ -57,6 +55,7 @@ module Itsi
 
       def add(filename, algorithm)
         return unless (creds = load(filename))
+
         print "Enter username: "
         username = $stdin.gets.chomp
 
@@ -99,11 +98,11 @@ module Itsi
       def list(filename)
         puts "Current credentials in '#{filename}':"
         return unless (creds = load(filename))
+
         creds.each do |u, p|
           puts "#{u}:#{p}"
         end
       end
-
     end
   end
 end