itsi 0.1.14 → 0.1.19

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.19"
 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,12 @@ 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"
+reqwest = { version = "0.12.15", features = [
+  "stream",
+  "rustls-tls",
+], default-features = false }
 redis = { version = "0.29.2", features = [
   "tokio-comp",
   "r2d2",
@@ -85,5 +83,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"

data/crates/itsi_server/src/default_responses/html/401.html

@@ -0,0 +1,68 @@
+<!doctype html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <title>401 Unauthorized</title>
+    <style>
+      :root {
+        --bg-color: #f0f2f5;
+        --text-color: #333;
+        --accent-color: #0052cc;
+        --link-color: #0052cc;
+      }
+      body {
+        margin: 0;
+        font-family: "Helvetica Neue", Arial, sans-serif;
+        background: var(--bg-color);
+        color: var(--text-color);
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        min-height: 100vh;
+        padding: 2rem;
+      }
+      .error-container {
+        text-align: center;
+        max-width: 800px;
+        width: 100%;
+      }
+      h1 {
+        font-size: 5rem;
+        font-weight: 300;
+        margin-bottom: 0.5rem;
+      }
+      p {
+        font-size: 1.5rem;
+        line-height: 1.6;
+        margin-bottom: 2rem;
+      }
+      a {
+        font-size: 1rem;
+        text-decoration: none;
+        color: var(--link-color);
+        border-bottom: 1px solid transparent;
+        transition: border-color 0.2s ease-in-out;
+      }
+      a:hover {
+        border-color: var(--link-color);
+      }
+      @media (max-width: 480px) {
+        h1 {
+          font-size: 3.5rem;
+        }
+        p {
+          font-size: 1.2rem;
+        }
+      }
+    </style>
+  </head>
+  <body>
+    <div class="error-container">
+      <h1>401 Unauthorized</h1>
+      <p>You are not authorized to access this page.</p>
+      <p><a href="/">Return Home</a></p>
+      <p><a href="javascript:history.back()">Go Back</a></p>
+    </div>
+  </body>
+</html>

data/crates/itsi_server/src/default_responses/html/403.html

@@ -0,0 +1,68 @@
+<!doctype html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <title>403 Forbidden</title>
+    <style>
+      :root {
+        --bg-color: #f0f2f5;
+        --text-color: #333;
+        --accent-color: #0052cc;
+        --link-color: #0052cc;
+      }
+      body {
+        margin: 0;
+        font-family: "Helvetica Neue", Arial, sans-serif;
+        background: var(--bg-color);
+        color: var(--text-color);
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        min-height: 100vh;
+        padding: 2rem;
+      }
+      .error-container {
+        text-align: center;
+        max-width: 800px;
+        width: 100%;
+      }
+      h1 {
+        font-size: 5rem;
+        font-weight: 300;
+        margin-bottom: 0.5rem;
+      }
+      p {
+        font-size: 1.5rem;
+        line-height: 1.6;
+        margin-bottom: 2rem;
+      }
+      a {
+        font-size: 1rem;
+        text-decoration: none;
+        color: var(--link-color);
+        border-bottom: 1px solid transparent;
+        transition: border-color 0.2s ease-in-out;
+      }
+      a:hover {
+        border-color: var(--link-color);
+      }
+      @media (max-width: 480px) {
+        h1 {
+          font-size: 3.5rem;
+        }
+        p {
+          font-size: 1.2rem;
+        }
+      }
+    </style>
+  </head>
+  <body>
+    <div class="error-container">
+      <h1>403</h1>
+      <p>You are forbidden to access this page.</p>
+      <p><a href="/">Return Home</a></p>
+      <p><a href="javascript:history.back()">Go Back</a></p>
+    </div>
+  </body>
+</html>

data/crates/itsi_server/src/default_responses/html/404.html

@@ -0,0 +1,68 @@
+<!doctype html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <title>Error – Page Not Found</title>
+    <style>
+      :root {
+        --bg-color: #f0f2f5;
+        --text-color: #333;
+        --accent-color: #0052cc;
+        --link-color: #0052cc;
+      }
+      body {
+        margin: 0;
+        font-family: "Helvetica Neue", Arial, sans-serif;
+        background: var(--bg-color);
+        color: var(--text-color);
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        min-height: 100vh;
+        padding: 2rem;
+      }
+      .error-container {
+        text-align: center;
+        max-width: 800px;
+        width: 100%;
+      }
+      h1 {
+        font-size: 5rem;
+        font-weight: 300;
+        margin-bottom: 0.5rem;
+      }
+      p {
+        font-size: 1.5rem;
+        line-height: 1.6;
+        margin-bottom: 2rem;
+      }
+      a {
+        font-size: 1rem;
+        text-decoration: none;
+        color: var(--link-color);
+        border-bottom: 1px solid transparent;
+        transition: border-color 0.2s ease-in-out;
+      }
+      a:hover {
+        border-color: var(--link-color);
+      }
+      @media (max-width: 480px) {
+        h1 {
+          font-size: 3.5rem;
+        }
+        p {
+          font-size: 1.2rem;
+        }
+      }
+    </style>
+  </head>
+  <body>
+    <div class="error-container">
+      <h1>404</h1>
+      <p>We’re sorry, but we couldn’t find the page you were looking for.</p>
+      <p><a href="/">Return Home</a></p>
+      <p><a href="javascript:history.back()">Go Back</a></p>
+    </div>
+  </body>
+</html>

data/crates/itsi_server/src/default_responses/html/413.html

@@ -0,0 +1,71 @@
+<!doctype html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <title>Upload Limit Exceeded</title>
+    <style>
+      :root {
+        --bg-color: #f0f2f5;
+        --text-color: #333;
+        --accent-color: #0052cc;
+        --link-color: #0052cc;
+      }
+      body {
+        margin: 0;
+        font-family: "Helvetica Neue", Arial, sans-serif;
+        background: var(--bg-color);
+        color: var(--text-color);
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        min-height: 100vh;
+        padding: 2rem;
+      }
+      .error-container {
+        text-align: center;
+        max-width: 800px;
+        width: 100%;
+      }
+      h1 {
+        font-size: 5rem;
+        font-weight: 300;
+        margin-bottom: 0.5rem;
+      }
+      p {
+        font-size: 1.5rem;
+        line-height: 1.6;
+        margin-bottom: 2rem;
+      }
+      a {
+        font-size: 1rem;
+        text-decoration: none;
+        color: var(--link-color);
+        border-bottom: 1px solid transparent;
+        transition: border-color 0.2s ease-in-out;
+      }
+      a:hover {
+        border-color: var(--link-color);
+      }
+      @media (max-width: 480px) {
+        h1 {
+          font-size: 3.5rem;
+        }
+        p {
+          font-size: 1.2rem;
+        }
+      }
+    </style>
+  </head>
+  <body>
+    <div class="error-container">
+      <h1>413</h1>
+      <p>
+        The content you are trying too upload is too large. Please try again
+        with a smaller file.
+      </p>
+      <p><a href="/">Return Home</a></p>
+      <p><a href="javascript:history.back()">Go Back</a></p>
+    </div>
+  </body>
+</html>

data/crates/itsi_server/src/default_responses/html/429.html

@@ -0,0 +1,68 @@
+<!doctype html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <title>Rate Limit Exceeded</title>
+    <style>
+      :root {
+        --bg-color: #f0f2f5;
+        --text-color: #333;
+        --accent-color: #0052cc;
+        --link-color: #0052cc;
+      }
+      body {
+        margin: 0;
+        font-family: "Helvetica Neue", Arial, sans-serif;
+        background: var(--bg-color);
+        color: var(--text-color);
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        min-height: 100vh;
+        padding: 2rem;
+      }
+      .error-container {
+        text-align: center;
+        max-width: 800px;
+        width: 100%;
+      }
+      h1 {
+        font-size: 5rem;
+        font-weight: 300;
+        margin-bottom: 0.5rem;
+      }
+      p {
+        font-size: 1.5rem;
+        line-height: 1.6;
+        margin-bottom: 2rem;
+      }
+      a {
+        font-size: 1rem;
+        text-decoration: none;
+        color: var(--link-color);
+        border-bottom: 1px solid transparent;
+        transition: border-color 0.2s ease-in-out;
+      }
+      a:hover {
+        border-color: var(--link-color);
+      }
+      @media (max-width: 480px) {
+        h1 {
+          font-size: 3.5rem;
+        }
+        p {
+          font-size: 1.2rem;
+        }
+      }
+    </style>
+  </head>
+  <body>
+    <div class="error-container">
+      <h1>429</h1>
+      <p>Slow down! You've exceeded your rate limit.</p>
+      <p><a href="/">Return Home</a></p>
+      <p><a href="javascript:history.back()">Go Back</a></p>
+    </div>
+  </body>
+</html>

data/crates/itsi_server/src/default_responses/html/500.html

@@ -0,0 +1,71 @@
+<!doctype html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <title>Internal Server Error</title>
+    <style>
+      :root {
+        --bg-color: #f0f2f5;
+        --text-color: #333;
+        --accent-color: #0052cc;
+        --link-color: #0052cc;
+      }
+      body {
+        margin: 0;
+        font-family: "Helvetica Neue", Arial, sans-serif;
+        background: var(--bg-color);
+        color: var(--text-color);
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        min-height: 100vh;
+        padding: 2rem;
+      }
+      .error-container {
+        text-align: center;
+        max-width: 800px;
+        width: 100%;
+      }
+      h1 {
+        font-size: 5rem;
+        font-weight: 300;
+        margin-bottom: 0.5rem;
+      }
+      p {
+        font-size: 1.5rem;
+        line-height: 1.6;
+        margin-bottom: 2rem;
+      }
+      a {
+        font-size: 1rem;
+        text-decoration: none;
+        color: var(--link-color);
+        border-bottom: 1px solid transparent;
+        transition: border-color 0.2s ease-in-out;
+      }
+      a:hover {
+        border-color: var(--link-color);
+      }
+      @media (max-width: 480px) {
+        h1 {
+          font-size: 3.5rem;
+        }
+        p {
+          font-size: 1.2rem;
+        }
+      }
+    </style>
+  </head>
+  <body>
+    <div class="error-container">
+      <h1>500</h1>
+      <p>
+        The server encountered an unexpected error that prevented it from
+        fulfilling the request.
+      </p>
+      <p><a href="/">Return Home</a></p>
+      <p><a href="javascript:history.back()">Go Back</a></p>
+    </div>
+  </body>
+</html>