feat: bump rustls to 0.23 and mlua to 0.10

jjeffcaii · Nov 28, 2024 · 6abcdec · 6abcdec
1 parent 49e2864
commit 6abcdec
Show file tree

Hide file tree

Showing 15 changed files with 889 additions and 155 deletions.
diff --git a/capybara-core/Cargo.toml b/capybara-core/Cargo.toml
@@ -43,16 +43,11 @@ ahash = "0.8"
 parking_lot = "0.12"
 strum = { version = "0.26", default-features = false, features = ["strum_macros", "derive"] }
 strum_macros = "0.26"
-tokio-rustls = "0.24"
-rustls = "0.21"
-rustls-pemfile = "1.0"
-webpki-roots = "0.25"
-webpki = { package = "rustls-webpki", version = "0.101", features = ["alloc", "std"] }
 nonzero_ext = "0.3"
 glob = "0.3"
 memchr = "2.7"
 small-map = "0.1"
-hashbrown = { version = "0.14", features = ["serde"] }
+hashbrown = { version = "0.15", features = ["serde"] }
 arc-swap = "1.7"
 duration-str = "0.11"
 deadpool = { version = "0.12", features = ["rt_tokio_1"] }
@@ -62,10 +57,13 @@ coarsetime = "0.1"
 hickory-resolver = "0.24"
 rustc-hash = { version = "2.0", default-features = false }
 moka = { version = "0.12", features = ["future", "sync"] }
-mlua = { version = "0.9", features = ["luajit", "vendored", "serialize", "async", "macros", "send", "parking_lot"] }
+mlua = { version = "0.10.1", features = ["luajit", "vendored", "serialize", "async", "macros", "send", "anyhow"] }
 garde = { version = "0.20", features = ["serde", "derive", "pattern", "regex"] }
 bytesize = { version = "1.2", features = ["serde"] }
 liquid = "0.26"
+rustls = "0.23"
+webpki-roots = "0.26"
+tokio-rustls = "0.26"
 
 [[example]]
 name = "httpbin"

diff --git a/capybara-core/src/pipeline/http/mod.rs b/capybara-core/src/pipeline/http/mod.rs
@@ -8,6 +8,7 @@ pub use registry::{register, HttpPipelineFactory};
 
 mod noop;
 mod pipeline;
+mod pipeline_access_log;
 mod pipeline_lua;
 mod pipeline_router;
 mod registry;

diff --git a/capybara-core/src/pipeline/http/pipeline.rs b/capybara-core/src/pipeline/http/pipeline.rs
@@ -252,6 +252,11 @@ impl HttpContext {
         }
     }
 
+    #[cfg(test)]
+    pub(crate) fn fake() -> HttpContext {
+        HttpContext::builder("127.0.0.1:12345".parse().unwrap()).build()
+    }
+
     #[inline]
     pub fn id(&self) -> u64 {
         self.id