RubyGems - itsi - Versions diffs - 0.1.14 → 0.1.18 - Mend

itsi 0.1.14 → 0.1.18

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (169) hide show

data/gems/server/Cargo.lock CHANGED Viewed

@@ -56,12 +56,30 @@ dependencies = [
  "libc",
 ]
+[[package]]
+name = "anyhow"
+version = "1.0.97"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dcfed56ad506cb2c684a14971b8861fdc3baaaae314b9e5f9bb532cbe3ba7a4f"
 [[package]]
 name = "arc-swap"
 version = "1.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457"
+[[package]]
+name = "argon2"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c3610892ee6e0cbce8ae2700349fcf8f98adb0dbfbee85aec3c9179d29cc072"
+dependencies = [
+ "base64ct",
+ "blake2",
+ "cpufeatures",
+ "password-hash",
+]
 [[package]]
 name = "asn1-rs"
 version = "0.6.2"
@@ -122,6 +140,7 @@ dependencies = [
  "brotli",
  "flate2",
  "futures-core",
+ "futures-io",
  "memchr",
  "pin-project-lite",
  "tokio",
@@ -218,6 +237,25 @@ version = "0.22.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
+[[package]]
+name = "base64ct"
+version = "1.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "89e25b6adfb930f02d1981565a6e5d9c547ac15a96606256d3b59040e5cd4ca3"
+[[package]]
+name = "bcrypt"
+version = "0.17.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "92758ad6077e4c76a6cadbce5005f666df70d4f13b19976b1a8062eef880040f"
+dependencies = [
+ "base64",
+ "blowfish",
+ "getrandom 0.3.1",
+ "subtle",
+ "zeroize",
+]
 [[package]]
 name = "bindgen"
 version = "0.69.5"
@@ -253,6 +291,15 @@ version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8f68f53c83ab957f72c32642f3868eec03eb974d1fb82e453128456482613d36"
+[[package]]
+name = "blake2"
+version = "0.10.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "46502ad458c9a52b69d4d4d32775c788b7a1b85e8bc9d482d92250fc0e3f8efe"
+dependencies = [
+ "digest",
+]
 [[package]]
 name = "block-buffer"
 version = "0.10.4"
@@ -262,6 +309,16 @@ dependencies = [
  "generic-array",
 ]
+[[package]]
+name = "blowfish"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e412e2cd0f2b2d93e02543ceae7917b3c70331573df19ee046bcbc35e45e87d7"
+dependencies = [
+ "byteorder",
+ "cipher",
+]
 [[package]]
 name = "brotli"
 version = "7.0.0"
@@ -299,6 +356,12 @@ version = "3.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1628fb46dfa0b37568d12e5edd512553eccf6a22a78e8bde00bb4aed84d5bdbf"
+[[package]]
+name = "byteorder"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 [[package]]
 name = "bytes"
 version = "1.10.1"
@@ -351,6 +414,16 @@ dependencies = [
  "windows-link",
 ]
+[[package]]
+name = "cipher"
+version = "0.4.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad"
+dependencies = [
+ "crypto-common",
+ "inout",
+]
 [[package]]
 name = "clang-sys"
 version = "1.8.1"
@@ -420,6 +493,17 @@ version = "0.8.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
+[[package]]
+name = "core_affinity"
+version = "0.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a034b3a7b624016c6e13f5df875747cc25f884156aad2abd12b6c46797971342"
+dependencies = [
+ "libc",
+ "num_cpus",
+ "winapi",
+]
 [[package]]
 name = "cpufeatures"
 version = "0.2.17"
@@ -438,19 +522,6 @@ dependencies = [
  "cfg-if",
 ]
-[[package]]
-name = "crossbeam"
-version = "0.8.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1137cd7e7fc0fb5d3c5a8678be38ec56e819125d8d7907411fe24ccb943faca8"
-dependencies = [
- "crossbeam-channel",
- "crossbeam-deque",
- "crossbeam-epoch",
- "crossbeam-queue",
- "crossbeam-utils",
-]
 [[package]]
 name = "crossbeam-channel"
 version = "0.5.14"
@@ -479,15 +550,6 @@ dependencies = [
  "crossbeam-utils",
 ]
-[[package]]
-name = "crossbeam-queue"
-version = "0.3.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f58bbc28f91df819d0aa2a2c00cd19754769c2fad90579b3592b1c9ba7a3115"
-dependencies = [
- "crossbeam-utils",
-]
 [[package]]
 name = "crossbeam-utils"
 version = "0.8.21"
@@ -504,20 +566,6 @@ dependencies = [
  "typenum",
 ]
-[[package]]
-name = "dashmap"
-version = "6.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5041cc499144891f3790297212f32a74fb938e5136a14943f338ef9e0ae276cf"
-dependencies = [
- "cfg-if",
- "crossbeam-utils",
- "hashbrown 0.14.5",
- "lock_api",
- "once_cell",
- "parking_lot_core",
-]
 [[package]]
 name = "data-encoding"
 version = "2.8.0"
@@ -933,12 +981,6 @@ dependencies = [
  "tracing",
 ]
-[[package]]
-name = "hashbrown"
-version = "0.14.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
 [[package]]
 name = "hashbrown"
 version = "0.15.2"
@@ -960,15 +1002,6 @@ version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
-[[package]]
-name = "hmac"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e"
-dependencies = [
- "digest",
-]
 [[package]]
 name = "home"
 version = "0.5.11"
@@ -1012,12 +1045,6 @@ dependencies = [
  "pin-project-lite",
 ]
-[[package]]
-name = "http-range"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21dec9db110f5f872ed9699c3ecf50cf16f423502706ba5c72462e28d3157573"
 [[package]]
 name = "httparse"
 version = "1.10.1"
@@ -1069,25 +1096,6 @@ dependencies = [
  "webpki-roots",
 ]
-[[package]]
-name = "hyper-staticfile"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc4bce64c32578957926e75f832032f81ebb30bcee74f86c5848b13a69e547eb"
-dependencies = [
- "futures-util",
- "http",
- "http-range",
- "httpdate",
- "hyper",
- "mime_guess",
- "percent-encoding",
- "rand 0.8.5",
- "tokio",
- "url",
- "winapi",
-]
 [[package]]
 name = "hyper-tls"
 version = "0.6.0"
@@ -1292,7 +1300,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8c9c992b02b5b4c94ea26e32fe5bccb7aa7d9f390ab5c1221ff895bc7ea8b652"
 dependencies = [
  "equivalent",
- "hashbrown 0.15.2",
+ "hashbrown",
 ]
 [[package]]
@@ -1315,6 +1323,15 @@ dependencies = [
  "libc",
 ]
+[[package]]
+name = "inout"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "879f10e63c20629ecabbb64a8010319738c66a5cd0c29b02d63d272b03751d01"
+dependencies = [
+ "generic-array",
+]
 [[package]]
 name = "ipnet"
 version = "2.11.0"
@@ -1338,30 +1355,28 @@ checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674"
 [[package]]
 name = "itsi-server"
-version = "0.1.0"
+version = "0.1.18"
 dependencies = [
+ "argon2",
  "async-channel",
  "async-compression",
  "async-trait",
  "base64",
+ "bcrypt",
  "bytes",
  "chrono",
- "crossbeam",
- "dashmap",
+ "core_affinity",
  "derive_more",
  "dirs",
  "either",
- "fnv",
  "fs2",
  "futures",
  "globset",
- "hmac",
  "http",
  "http-body-util",
  "httparse",
  "httpdate",
  "hyper",
- "hyper-staticfile",
  "hyper-util",
  "itsi_error",
  "itsi_rb_helpers",
@@ -1374,20 +1389,19 @@ dependencies = [
  "notify",
  "num_cpus",
  "parking_lot",
+ "percent-encoding",
  "pin-project",
  "rand 0.9.0",
- "rb-sys",
  "rcgen",
  "redis",
  "regex",
  "reqwest",
- "ring",
- "route-recognizer",
  "rustls",
  "rustls-pemfile",
  "serde",
  "serde_json",
  "serde_magnus",
+ "sha-crypt",
  "sha2",
  "socket2",
  "sysinfo",
@@ -1399,13 +1413,13 @@ dependencies = [
  "tokio-util",
  "tracing",
  "url",
- "uuid",
 ]
 [[package]]
 name = "itsi_error"
 version = "0.1.0"
 dependencies = [
+ "anyhow",
  "httparse",
  "magnus",
  "nix",
@@ -1635,16 +1649,6 @@ version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
-[[package]]
-name = "mime_guess"
-version = "2.0.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e"
-dependencies = [
- "mime",
- "unicase",
-]
 [[package]]
 name = "minimal-lexical"
 version = "0.2.1"
@@ -1928,6 +1932,17 @@ dependencies = [
  "windows-targets 0.52.6",
 ]
+[[package]]
+name = "password-hash"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "346f04948ba92c43e8469c1ee6736c7563d71012b17d40745260fe106aac2166"
+dependencies = [
+ "base64ct",
+ "rand_core 0.6.4",
+ "subtle",
+]
 [[package]]
 name = "paste"
 version = "1.0.15"
@@ -2381,12 +2396,6 @@ dependencies = [
  "windows-sys 0.52.0",
 ]
-[[package]]
-name = "route-recognizer"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "afab94fb28594581f62d981211a9a4d53cc8130bbcbbb89a0440d9b8e81a7746"
 [[package]]
 name = "rustc-demangle"
 version = "0.1.24"
@@ -2661,6 +2670,18 @@ dependencies = [
  "serde",
 ]
+[[package]]
+name = "sha-crypt"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "88e79009728d8311d42d754f2f319a975f9e38f156fd5e422d2451486c78b286"
+dependencies = [
+ "base64ct",
+ "rand 0.8.5",
+ "sha2",
+ "subtle",
+]
 [[package]]
 name = "sha1_smol"
 version = "1.0.1"
@@ -3181,12 +3202,6 @@ version = "1.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1dccffe3ce07af9386bfd29e80c0ab1a8205a2fc34e4bcd40364df902cfa8f3f"
-[[package]]
-name = "unicase"
-version = "2.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75b844d17643ee918803943289730bec8aac480150456169e647ed0b576ba539"
 [[package]]
 name = "unicode-ident"
 version = "1.0.17"

data/gems/server/exe/itsi CHANGED Viewed

@@ -4,28 +4,48 @@
 require "itsi/server"
 require "optparse"
-Itsi::Server::Config.save_argv!
+COMMANDS = {
+  "init" => "Initialize a new Itsi.rb server configuration file",
+  "status" => "Show the status of the server",
+  "start" => "Start the Isti server",
+  "serve" => "Start the Isti server",
+  "stop" => "Stop the server",
+  "reload" => "Reload the server",
+  "restart" => "Restart the server",
+  "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]",
+  "test_route" => "Test which route a request will be routed to",
+  "static" => "Serve static assets in the given directory"
+}
+Itsi::Server::Config.prep_reexec!
 options = {}
-OptionParser.new do |opts|
-  opts.banner = "Usage: itsi [options]"
+parser = OptionParser.new do |opts|
+  opts.banner = "Usage: itsi [COMMAND] [options]"
   opts.on("-C", "--config CONFIG_FILE", String, "Itsi Configuration file to use (default: Itsi.rb)") do |config_file|
     options[:config_file] = config_file
   end
-  opts.on("-w", "--workers WORKERS", Integer, "Number of workers (default: #{Etc.nprocessors})") do |w|
+  opts.on("-w", "--workers WORKERS", Integer, "Number of workers") do |w|
     options[:workers] = w
   end
+  opts.on("-d", "--daemonize", "Run the process as a daemon") do
+    Process.daemon(true)
+  end
   opts.on("-t", "--threads THREADS", Integer, "Number of threads (default: 1)") do |t|
     options[:threads] = t
   end
-  opts.on("-mtr", "--multithreaded-reactor true/false", String,
-          "Use a multithreaded reactor (default: true)") do |mtr|
-    options[:multithreaded_reactor] = mtr.to_s == "true"
+  opts.on("--[no-]multithreaded-reactor", "Use a multithreaded reactor") do |mtr|
+    options[:multithreaded_reactor] = mtr
   end
   opts.on("-r", "--rackup_file FILE", String, "Rackup file to use (default: config.ru)") do |rf|
@@ -97,9 +117,6 @@ OptionParser.new do |opts|
     options[:shutdown_timeout] = shutdown_timeout
   end
-  opts.on("--script_name SCRIPT_NAME", String, "Script name to inject into Rack ENV") do |script_name|
-    options[:script_name] = script_name
-  end
   opts.on("--stream-body", TrueClass, "Stream body frames (default: false for best compatibility)") do |stream_body|
     options[:stream_body] = stream_body
@@ -107,6 +124,10 @@ OptionParser.new do |opts|
   opts.on("-h", "--help", "Show this help message") do
     puts opts
+    puts "COMMAND: "
+    COMMANDS.each do |command, description|
+      puts "    #{command} - #{description}"
+    end
     exit
   end
@@ -117,17 +138,42 @@ OptionParser.new do |opts|
   opts.on("--listeners LISTENERS", String, "Listeners for reexec") do |listeners|
     options[:listeners] = listeners
   end
-end.parse!
+  opts.on("--passfile PASSFILE", String, "Passfile") do |passfile|
+    options[:passfile] = passfile
+  end
+  opts.on("--algorithm ALGORITHM", String, "Algorithm for password hashing") do |algorithm|
+    options[:algorithm] = algorithm
+  end
+end
+if ENV['COMP_LINE'] || ARGV.include?('--completion')
+  puts COMMANDS.keys
+  exit
+end
-case (command = ARGV.pop)
-when "init"
-  Itsi::Server::Config.write_default
-  exit(0)
-when "reload", "restart", "down", "up", "add_worker", "remove_worker", "status"
-  Itsi::Server.send(command)
-when nil, "start", "serve"
+parser.parse!
+case (command = ARGV.shift)
+when *COMMANDS.keys
+  required_arity = Itsi::Server.method(command).parameters&.select{|c| c.first == :req }&.length&.succ || 2
+  case required_arity
+  when 1 then Itsi::Server.send(command)
+  when 2 then Itsi::Server.send(command, options)
+  else
+    if ARGV.length != required_arity - 2
+      puts "Command #{command} requires #{required_arity - 2} subcommands. "
+      exit(0)
+    end
+    Itsi::Server.send(command, options, *ARGV)
+  end
+when nil
   Itsi::Server.start(options)
 else
-  puts "Invalid command #{command}"
+  puts "Invalid command #{command}.\n"
+  puts "COMMAND: "
+  COMMANDS.each do |command, description|
+    puts "    #{command} - #{description}"
+  end
 end

data/gems/server/itsi-server.gemspec CHANGED Viewed

@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
       (f == gemspec) ||
         f.start_with?(*%w[bin/ test/ spec/ features/ .git appveyor Gemfile])
     end
-  end + Dir["../../crates/**/*.{toml,rs,lock}"].map do |ext_file|
+  end + Dir["../../crates/**/*.{toml,rs,lock,html,json}"].map do |ext_file|
     "ext/#{ext_file[%r{.*crates/(.*?)$}, 1]}"
   end.compact
@@ -36,10 +36,11 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.extensions = ["ext/itsi_server/extconf.rb"]
-  # Uncomment to register a new dependency of your gem
-  # spec.add_dependency "example-gem", "~> 1.0"
   spec.add_dependency "rack", ">= 1.6"
+  spec.add_dependency "json", '~> 2'
   spec.add_dependency "rb_sys", "~> 0.9.91"
+  spec.add_development_dependency "ruby-lsp"
   # For more information and examples about making a new gem, check out our
   # guide at: https://bundler.io/guides/creating_gem.html
 end

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

@@ -0,0 +1,74 @@
+module Itsi
+  class HttpRequest
+    module ResponseStatusShortcodes
+      HTTP_STATUS_CODES = {
+        100 => :continue,
+        101 => :switching_protocols,
+        102 => :processing,
+        200 => :ok,
+        201 => :created,
+        202 => :accepted,
+        203 => :non_authoritative_information,
+        204 => :no_content,
+        205 => :reset_content,
+        206 => :partial_content,
+        207 => :multi_status,
+        208 => :already_reported,
+        226 => :im_used,
+        300 => :multiple_choices,
+        301 => :moved_permanently,
+        302 => :found,
+        303 => :see_other,
+        304 => :not_modified,
+        305 => :use_proxy,
+        307 => :temporary_redirect,
+        308 => :permanent_redirect,
+        400 => :bad_request,
+        401 => :unauthorized,
+        402 => :payment_required,
+        403 => :forbidden,
+        404 => :not_found,
+        405 => :method_not_allowed,
+        406 => :not_acceptable,
+        407 => :proxy_authentication_required,
+        408 => :request_timeout,
+        409 => :conflict,
+        410 => :gone,
+        411 => :length_required,
+        412 => :precondition_failed,
+        413 => :payload_too_large,
+        414 => :uri_too_long,
+        415 => :unsupported_media_type,
+        416 => :range_not_satisfiable,
+        417 => :expectation_failed,
+        418 => :im_a_teapot,
+        421 => :misdirected_request,
+        422 => :unprocessable_entity,
+        423 => :locked,
+        424 => :failed_dependency,
+        425 => :too_early,
+        426 => :upgrade_required,
+        428 => :precondition_required,
+        429 => :too_many_requests,
+        431 => :request_header_fields_too_large,
+        451 => :unavailable_for_legal_reasons,
+        500 => :internal_server_error,
+        501 => :not_implemented,
+        502 => :bad_gateway,
+        503 => :service_unavailable,
+        504 => :gateway_timeout,
+        505 => :http_version_not_supported,
+        506 => :variant_also_negotiates,
+        507 => :insufficient_storage,
+        508 => :loop_detected,
+        510 => :not_extended,
+        511 => :network_authentication_required
+      }.freeze
+      HTTP_STATUS_CODES.each do |code, name|
+        define_method(name) {|*args, **kwargs| respond(*args, **kwargs, status: code) }
+      end
+    end
+  end
+end