itsi-server 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 945215c55c27ed88c72156d88ab5606ec321dbb609406a2fa301d620a2dfdb8d
-  data.tar.gz: 74682a5850c9c2d1a2c449550bbeedd932e153dc8e753e5224fcc98999d51353
+  metadata.gz: 28ba76ce129635022bb442e61f18dac9c6d29d7552b7b2e006ec16b8c5ef975a
+  data.tar.gz: 944d5bfee24014c8aab5bffede13f73d6316023dcda9df7cbaf7e6fb442f8d9d
 SHA512:
-  metadata.gz: 2239fac3020f7b9887765b41ab42ea9ffabe08b338875608857b96e93f307637bcf872f5d855feb8906a5cbffd057ea2b0d6a3e9148d3ce9d706b531cd41a897
-  data.tar.gz: 23aab8255a3d5e7bb731c32f65ce340a632363b482dba3f1674c99b4bbb5d22728197523d515205ef18a91b19ea8307fc27144b14d22d186ead5de746d6deb21
+  metadata.gz: 658829fb38833abdd60bbb175f552faddfa26692598626a25a546845bcbe4f1b6478f268b2917c6ef08b5ebf86e93c3bace063ba0594e2a774dca3810d616ce4
+  data.tar.gz: 9089b2a6067e148a8893f8e12e07e9e7fa1e3625b6a8940d3bf4fbae3aa81d3b10ab538250c8a15bdca084d0a603480554bb1663b73deccfc68c6deaba560205

data/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.2.2"
+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/ext/itsi_scheduler/Cargo.toml

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

data/ext/itsi_server/Cargo.toml

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

data/ext/itsi_server/src/ruby_types/itsi_server/itsi_server_config.rs

@@ -14,7 +14,7 @@ use magnus::{
     block::Proc,
     error::Result,
     value::{LazyId, ReprValue},
-    RArray, RHash, Ruby, Symbol, Value,
+    RArray, RHash, Ruby, Symbol, TryConvert, Value,
 };
 use nix::{
     fcntl::{fcntl, FcntlArg, FdFlag},
@@ -124,9 +124,17 @@ impl ServerParams {
                 debug!("Loading Itsi Scheduler");
                 ruby.require("itsi/scheduler")?;
             }
-            let routes_raw = self
+            let result_pair = self
                 .middleware_loader
-                .call::<_, Option<Value>>(())
+                .call::<(), RArray>(())
+                .inspect_err(|e| {
+                    eprintln!("Error loading middleware: {:?}", e);
+                    if let Some(err_value) = e.value() {
+                        print_rb_backtrace(err_value);
+                    }
+                })?;
+            let routes_raw = result_pair
+                .entry::<Option<Value>>(0)
                 .inspect_err(|e| {
                     eprintln!("Error loading middleware: {:?}", e);
                     if let Some(err_value) = e.value() {
@@ -134,6 +142,21 @@ impl ServerParams {
                     }
                 })?
                 .map(|mw| mw.into());
+            let error_lines = result_pair.entry::<Option<RArray>>(1).inspect_err(|e| {
+                eprintln!("Error loading middleware: {:?}", e);
+                if let Some(err_value) = e.value() {
+                    print_rb_backtrace(err_value);
+                }
+            })?;
+            if error_lines.is_some_and(|r| !r.is_empty()) {
+                let errors: Vec<String> =
+                    Vec::<String>::try_convert(error_lines.unwrap().as_value())?;
+                ItsiServerConfig::print_config_errors(errors);
+                return Err(magnus::Error::new(
+                    magnus::exception::runtime_error(),
+                    "Failed to set middleware",
+                ));
+            }
             let middleware = MiddlewareSet::new(routes_raw)?;
             self.middleware.set(middleware).map_err(|_| {
                 magnus::Error::new(

data/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,13 +90,12 @@ module Itsi
       body: _body,
       &blk
     )
-
       if json
         if as
           begin
             validate!(json, as: as)
           rescue ValidationError => e
-            json = {type: 'error', message: "Validation Error: #{e.message}"}
+            json = { type: "error", message: "Validation Error: #{e.message}" }
             status = 400
           end
         end
@@ -118,15 +117,13 @@ module Itsi
       end
 
       response.respond(status: status, headers: headers, body: body, hijack: hijack, &blk)
-
-
     end
 
     def hijack
       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
@@ -150,37 +147,37 @@ 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
-      unless block_given?
-        if multipart?
-          raise "#params must take a block for multipart requests"
-        else
-          return validated
-        end
-      else
+      if block_given?
         yield validated
+      else
+        raise "#params must take a block for multipart requests" if multipart?
+
+        validated
+
       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
@@ -191,7 +188,7 @@ module Itsi
       # Unexpected error.
       # Don't reveal potential sensitive information to client.
       if response.json?
-        respond(json: {error: "Internal Server Error"}, status: 500)
+        respond(json: { error: "Internal Server Error" }, status: 500)
       else
         respond("Internal Server Error", 500)
       end
@@ -205,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/lib/itsi/http_response.rb

@@ -1,15 +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.kind_of?(Symbol) ? HTTP_STATUS_NAME_TO_CODE_MAP.fetch(status) : status.to_i
+    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)
 
@@ -33,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/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,14 +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)
+      def echo(_, algorithm)
         print "Enter username: "
         username = $stdin.gets.chomp
 
@@ -56,6 +55,7 @@ module Itsi
 
       def add(filename, algorithm)
         return unless (creds = load(filename))
+
         print "Enter username: "
         username = $stdin.gets.chomp
 
@@ -98,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

data/lib/itsi/server/config/config_helpers.rb

@@ -2,7 +2,6 @@ module Itsi
   class Server
     module Config
       module ConfigHelpers
-
         def self.load_and_register(klass)
           config_type = klass.name.split("::").last.downcase.gsub(/([a-z]()[A-Z])/, '\1_\2')
 
@@ -17,35 +16,35 @@ module Itsi
             following = klass.subclasses
             new_class = (following - current).first
 
-            documentation_file = "#{file[/(.*)\.rb/,1]}.md"
-            if ! File.exist?(documentation_file)
-              documentation_file =  "#{file[/(.*)\/[^\/]+\.rb/,1]}/_index.md"
-            end
-            if File.exist?(documentation_file) && new_class
-              new_class.documentation IO.read(documentation_file)
-                .gsub(/^---.*?\n.*?-+/m,'') # Strip frontmatter
-                .gsub(/^(```.*?)\{.*?\}.*$/, "\\1") # Strip filename from code blocks
-                .gsub(/^\{\{[^\}]+\}\}/, "") # Strip Hugo blocks
-            end
+            documentation_file = "#{file[/(.*)\.rb/, 1]}.md"
+            documentation_file = "#{file[%r{(.*)/[^/]+\.rb}, 1]}/_index.md" unless File.exist?(documentation_file)
+            next unless File.exist?(documentation_file) && new_class
+
+            new_class.documentation IO.read(documentation_file)
+                                      .gsub(/^---.*?\n.*?-+/m, "") # Strip frontmatter
+                                      .gsub(/^(```.*?)\{.*?\}.*$/, "\\1") # Strip filename from code blocks
+                                      .gsub(/^\{\{[^}]+\}\}/, "") # Strip Hugo blocks
           end
         end
 
-        def normalize_keys!(hash, expected=[])
+        def normalize_keys!(hash, expected = [])
           hash.keys.each do |key|
             value = hash.delete(key)
             key = key.to_s.downcase.to_sym
             hash[key] = value
             raise "Unexpected key: #{key}" unless expected.include?(key)
+
             expected -= [key]
           end
-          raise "Missing required keys: #{expected.join(', ')}" unless expected.empty?
+          raise "Missing required keys: #{expected.join(", ")}" unless expected.empty?
+
           hash
         end
 
-        def self.included(cls)
-          def cls.inherited(base)
+        def self.included(cls) # rubocop:disable Metrics/PerceivedComplexity,Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/MethodLength
+          def cls.inherited(base) # rubocop:disable Metrics/MethodLength,Lint/MissingSuper,Metrics/PerceivedComplexity
             %i[detail documentation insert_text schema].each do |attr|
-              base.define_singleton_method(attr) do |value=nil|
+              base.define_singleton_method(attr) do |value = nil|
                 @middleware_class_attrs ||= {}
                 if value
                   @middleware_class_attrs[attr] = value
@@ -54,12 +53,12 @@ module Itsi
                 end
               end
 
-              base.define_method(attr) do |value=nil|
+              base.define_method(attr) do |_value = nil|
                 self.class.send(attr)
               end
             end
 
-            def base.schema(value=nil, &blk)
+            def base.schema(value = nil, &blk)
               @middleware_class_attrs ||= {}
               if blk
                 @middleware_class_attrs[:schema] = TypedStruct.new(&blk)
@@ -75,29 +74,30 @@ module Itsi
 
           config_type = cls.name.split("::").last.downcase
 
-          cls.define_singleton_method("#{config_type}_name") do |name=self.name|
+          cls.define_singleton_method("#{config_type}_name") do |name = self.name|
             @config_name ||= name.split("::").last.gsub(/([a-z])([A-Z])/, '\1_\2').downcase.to_sym
           end
-          cls.define_method(:opt_name){ self.class.send("#{config_type}_name") }
-          cls.define_method(:location){ @location }
+          cls.define_method(:opt_name) { self.class.send("#{config_type}_name") }
+          cls.define_method(:location) { @location }
         end
 
-        def initialize(location, params={})
+        def initialize(location, params = {})
           if !self.class.ancestors.include?(Middleware) && !location.parent.nil?
             raise "#{opt_name} must be set at the top level"
           end
+
           @location = location
-          @params = case self.schema
-          when TypedStruct::Validation
-            self.schema.validate!(params)
-          when Array
-            default, validation = self.schema
-            params ? validation.validate!(params) : default
-          when nil
-            nil
-          else
-            self.schema.new(params).to_h
-          end
+          @params = case schema
+                    when TypedStruct::Validation
+                      schema.validate!(params)
+                    when Array
+                      default, validation = schema
+                      params ? validation.validate!(params) : default
+                    when nil
+                      nil
+                    else
+                      schema.new(params).to_h
+                    end
         end
       end
     end