itsi 0.1.14 → 0.1.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9aead803dcb108b9dff6ccd4c8e260a9307c5a65dc11e6e2c35c8b368c6eeac0
-  data.tar.gz: 5bdc928dbb64b12ee24b0e595eafa742418fd3f7feeb74fa12a0c8fe26f89ce6
+  metadata.gz: 8678869a775c7a2519f4da6901b7d8a768cf42fb2ad4535dea194061a11af3a3
+  data.tar.gz: 7a7ecf58fc503a973c5b0ad215458cb81bf736bb4dfb348319e265626676ce42
 SHA512:
-  metadata.gz: 75ee4139e4e5beb6c4dd5d4c34f1c4e94368f1a1d2c01d3139efdb1f484df6e4f98a25b7b5643d090ffda81b63d8b0df84706fb0e975e34ebe39743ce550cba8
-  data.tar.gz: 81ebc869bd9299531f1e3429b167d06b7d455a1c8e7ca42c2427051c255a7d04e7cde0b24cbc470985aa2734cb91e14c9c38b5e23bbdb00debe4d2efeb82a1ef
+  metadata.gz: 793ab013b0ad9fd28c11122789ad63c2c7d5fc873f46af91bf85ce9fe5049fa5b61abd9d56c49a6fd27333da62cb1c18622af8b3361a530e51cae65ad4ad8907
+  data.tar.gz: 575f044fe2790b0428ef033b1c4b3b335860c8d025f70448f31a6d3e43c2ed60d0e9e228bcc613e12a69f1f04983cd3d38d849d9ef60c906fed257f78199d4f3

data/Cargo.lock

@@ -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"
@@ -1356,30 +1373,28 @@ dependencies = [
 
 [[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",
@@ -1392,20 +1407,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",
@@ -1417,13 +1431,13 @@ dependencies = [
  "tokio-util",
  "tracing",
  "url",
- "uuid",
 ]
 
 [[package]]
 name = "itsi_error"
 version = "0.1.0"
 dependencies = [
+ "anyhow",
  "httparse",
  "magnus",
  "nix",
@@ -1662,16 +1676,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"
@@ -1955,6 +1959,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"
@@ -2408,12 +2423,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"
@@ -2688,6 +2697,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"
@@ -3219,12 +3240,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/Cargo.toml

@@ -11,3 +11,9 @@ members = [
   "./crates/itsi_rb_helpers",
 ]
 resolver = "2"
+
+
+[profile.release]
+opt-level = 3
+codegen-units = 1
+lto = "fat"

data/crates/itsi_error/Cargo.toml

@@ -9,3 +9,4 @@ magnus = { version = "0.7.1" }
 rcgen = "0.13.2"
 nix = "0.29.0"
 httparse = "1.10.1"
+anyhow = "1.0.97"

data/crates/itsi_error/src/lib.rs

@@ -1,31 +1,121 @@
-pub mod from;
+pub use anyhow::Context;
+use magnus::Error as MagnusError;
+use magnus::{
+    error::ErrorType,
+    exception::{self, arg_error, standard_error},
+};
 use thiserror::Error;
 
+pub static CLIENT_CONNECTION_CLOSED: &str = "Client disconnected";
 pub type Result<T> = std::result::Result<T, ItsiError>;
 
-#[derive(Error, Debug, Clone)]
+#[derive(Error, Debug)]
 pub enum ItsiError {
-    #[error("Invalid input {0}")]
+    #[error("Invalid input: {0}")]
     InvalidInput(String),
-    #[error("Internal server error {0}")]
+
+    #[error("Internal server error: {0}")]
     InternalServerError(String),
-    #[error("Unsupported protocol {0}")]
+
+    #[error("Unsupported protocol: {0}")]
     UnsupportedProtocol(String),
+
     #[error("Argument error: {0}")]
     ArgumentError(String),
+
     #[error("Client Connection Closed")]
     ClientConnectionClosed,
-    #[error("Jump")]
+
+    #[error("Internal Error")]
+    InternalError(String),
+
+    #[error(transparent)]
+    Io(#[from] std::io::Error),
+
+    #[error(transparent)]
+    Rcgen(#[from] rcgen::Error),
+
+    #[error(transparent)]
+    HttpParse(#[from] httparse::Error),
+
+    #[error(transparent)]
+    NixErrno(#[from] nix::errno::Errno),
+
+    #[error(transparent)]
+    Nul(#[from] std::ffi::NulError),
+
+    #[error("Jump: {0}")]
     Jump(String),
+
     #[error("Break")]
-    Break(),
+    Break,
+
     #[error("Pass")]
-    Pass(),
+    Pass,
+
+    #[error(transparent)]
+    Anyhow(#[from] anyhow::Error),
+}
+
+impl From<magnus::Error> for ItsiError {
+    fn from(err: magnus::Error) -> Self {
+        match err.error_type() {
+            ErrorType::Jump(tag) => ItsiError::Jump(tag.to_string()),
+            ErrorType::Error(_exception_class, cow) => ItsiError::ArgumentError(cow.to_string()),
+            ErrorType::Exception(exception) => ItsiError::ArgumentError(exception.to_string()),
+        }
+    }
+}
+
+pub trait IntoMagnusError {
+    fn into_magnus_error(self) -> MagnusError;
+}
+
+impl<T: std::error::Error> IntoMagnusError for T {
+    fn into_magnus_error(self) -> MagnusError {
+        MagnusError::new(standard_error(), self.to_string())
+    }
+}
+
+impl From<&str> for ItsiError {
+    fn from(s: &str) -> Self {
+        ItsiError::InternalError(s.to_owned())
+    }
+}
+
+impl From<String> for ItsiError {
+    fn from(s: String) -> Self {
+        ItsiError::InternalError(s)
+    }
+}
+
+impl From<ItsiError> for magnus::Error {
+    fn from(err: ItsiError) -> Self {
+        match err {
+            ItsiError::InvalidInput(msg) => magnus::Error::new(arg_error(), msg),
+            ItsiError::InternalServerError(msg) => magnus::Error::new(standard_error(), msg),
+            ItsiError::InternalError(msg) => magnus::Error::new(standard_error(), msg),
+            ItsiError::UnsupportedProtocol(msg) => magnus::Error::new(arg_error(), msg),
+            ItsiError::ArgumentError(msg) => magnus::Error::new(arg_error(), msg),
+            ItsiError::Jump(msg) => magnus::Error::new(exception::local_jump_error(), msg),
+            ItsiError::ClientConnectionClosed => {
+                magnus::Error::new(exception::eof_error(), CLIENT_CONNECTION_CLOSED)
+            }
+            ItsiError::Break => magnus::Error::new(exception::interrupt(), "Break"),
+            ItsiError::Pass => magnus::Error::new(exception::interrupt(), "Pass"),
+            ItsiError::Io(err) => err.into_magnus_error(),
+            ItsiError::Rcgen(err) => err.into_magnus_error(),
+            ItsiError::HttpParse(err) => err.into_magnus_error(),
+            ItsiError::NixErrno(err) => err.into_magnus_error(),
+            ItsiError::Nul(err) => err.into_magnus_error(),
+            ItsiError::Anyhow(err) => err.into_magnus_error(),
+        }
+    }
 }
 
 impl ItsiError {
-    pub fn default(error: impl Send + Sync + 'static + std::fmt::Display) -> Self {
-        ItsiError::InvalidInput(format!("{}", error))
+    pub fn new(error: impl Send + Sync + 'static + std::fmt::Display) -> Self {
+        ItsiError::InternalError(format!("{}", error))
     }
 }
 

data/crates/itsi_scheduler/src/itsi_scheduler.rs

@@ -65,7 +65,7 @@ impl ItsiScheduler {
     pub fn wake(&self) -> MagnusResult<()> {
         self.waker.lock().wake().map_err(|_| {
             magnus::Error::new(
-                magnus::exception::exception(),
+                magnus::exception::standard_error(),
                 "Failed to wake the scheduler",
             )
         })?;

data/crates/itsi_server/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "itsi-server"
-version = "0.1.0"
+version = "0.1.18"
 edition = "2021"
 authors = ["Wouter Coppieters <wc@pico.net.nz>"]
 license = "MIT"
@@ -11,33 +11,31 @@ crate-type = ["cdylib"]
 
 [dependencies]
 async-compression = { version = "0.4.21", features = [
+  "futures-io",
   "tokio",
   "zstd",
   "brotli",
   "deflate",
   "gzip",
+  "zlib",
 ] }
 async-channel = "2.3.1"
 async-trait = "0.1.87"
+bcrypt = "0.17.0"
 base64 = "0.22.1"
 bytes = "1.3"
 chrono = "0.4.35"
-crossbeam = "0.8.4"
-dashmap = "6.1.0"
 derive_more = { version = "2.0.1", features = ["debug"] }
 dirs = "6.0.0"
 either = "1.15.0"
-fnv = "1.0.7"
 fs2 = "0.4.3"
 futures = "0.3.31"
 globset = "0.4.16"
-hmac = "0.12.1"
 http = "1.3.1"
 http-body-util = "0.1.2"
 httpdate = "1.0.3"
 httparse = "1.10.1"
 hyper = { version = "1.5.0", features = ["full", "server", "http1", "http2"] }
-hyper-staticfile = "0.10.1"
 hyper-util = { version = "0.1.10", features = ["full"] }
 itsi_error = { path = "../itsi_error" }
 itsi_rb_helpers = { path = "../itsi_rb_helpers" }
@@ -57,12 +55,9 @@ num_cpus = "1.16.0"
 parking_lot = "0.12.3"
 pin-project = "1.1.9"
 rand = "0.9.0"
-rb-sys = "0.9.111"
 rcgen = { version = "0.13.2", features = ["x509-parser", "pem"] }
 regex = "1.11.1"
 reqwest = { version = "0.12.15", features = ["stream"] }
-ring = "0.17.14"
-route-recognizer = "0.3.1"
 redis = { version = "0.29.2", features = [
   "tokio-comp",
   "r2d2",
@@ -85,5 +80,8 @@ tokio-stream = "0.1.17"
 tokio-util = "0.7.13"
 tracing = "0.1.41"
 url = "2.5.4"
-uuid = "1.16.0"
 md5 = "0.7.0"
+percent-encoding = "2.3.1"
+sha-crypt = "0.5.0"
+argon2 = "0.5.3"
+core_affinity = "0.8.3"