From 2b0c4eb3fb09f60b47a133fc6aaef35a4c99cd16 Mon Sep 17 00:00:00 2001 From: Slatian Date: Sun, 9 Feb 2025 14:41:12 +0100 Subject: [PATCH] Updated to lib-humus 0.3 and axum 0.8 --- Cargo.lock | 70 ++++++++++++++--------------------------------------- Cargo.toml | 8 +++--- src/main.rs | 6 ++--- 3 files changed, 25 insertions(+), 59 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 64c701c..f8f3f88 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "addr2line" @@ -109,14 +109,14 @@ checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" [[package]] name = "axum" -version = "0.7.9" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edca88bc138befd0323b20752846e6587272d3b03b0343c8ea28a6f819e6e71f" +checksum = "6d6fd624c75e18b3b4c6b9caf42b1afe24437daaee904069137d8bab077be8b8" dependencies = [ - "async-trait", "axum-core", "axum-macros", "bytes", + "form_urlencoded", "futures-util", "http 1.2.0", "http-body", @@ -144,9 +144,9 @@ dependencies = [ [[package]] name = "axum-client-ip" -version = "0.6.1" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9eefda7e2b27e1bda4d6fa8a06b50803b8793769045918bc37ad062d48a6efac" +checksum = "dff8ee1869817523c8f91c20bf17fd932707f66c2e7e0b0f811b29a227289562" dependencies = [ "axum", "forwarded-header-value", @@ -155,11 +155,10 @@ dependencies = [ [[package]] name = "axum-core" -version = "0.4.5" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09f2bd6146b97ae3359fa0cc6d6b376d9539582c7b4220f041a33ec24c226199" +checksum = "df1362f362fd16024ae199c1970ce98f9661bf5ef94b9808fee734bc3698b733" dependencies = [ - "async-trait", "bytes", "futures-util", "http 1.2.0", @@ -176,22 +175,20 @@ dependencies = [ [[package]] name = "axum-extra" -version = "0.9.6" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c794b30c904f0a1c2fb7740f7df7f7972dfaa14ef6f57cb6178dc63e5dca2f04" +checksum = "460fc6f625a1f7705c6cf62d0d070794e94668988b1c38111baeec177c715f7b" dependencies = [ "axum", "axum-core", "bytes", "cookie", - "fastrand", "futures-util", "headers", "http 1.2.0", "http-body", "http-body-util", "mime", - "multer", "pin-project-lite", "serde", "tower", @@ -201,9 +198,9 @@ dependencies = [ [[package]] name = "axum-macros" -version = "0.4.2" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57d123550fa8d071b7255cb0cc04dc302baa6c8c4a79f55701552684d8399bce" +checksum = "604fde5e028fea851ce1d8570bbdc034bec850d157f7569d10f347d06808c05c" dependencies = [ "proc-macro2", "quote", @@ -498,7 +495,7 @@ dependencies = [ [[package]] name = "echoip-slatecave" -version = "1.5.1" +version = "1.5.2" dependencies = [ "axum", "axum-client-ip", @@ -522,15 +519,6 @@ dependencies = [ "tower-http", ] -[[package]] -name = "encoding_rs" -version = "0.8.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3" -dependencies = [ - "cfg-if", -] - [[package]] name = "enum-as-inner" version = "0.6.1" @@ -549,12 +537,6 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" -[[package]] -name = "fastrand" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" - [[package]] name = "fnv" version = "1.0.7" @@ -1185,12 +1167,13 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "lib-humus" -version = "0.2.1" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1eb76de9af6a63056c9d3740682eb664b47c02e9cb1d19948e6018a535e99ad6" +checksum = "262ee437b006be6905b56611e1a0f80cfa5c6e6a8cac73248fc4bd60af09c3e4" dependencies = [ "axum", "axum-extra", + "log", "mime", "serde", "tera", @@ -1254,9 +1237,9 @@ checksum = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4" [[package]] name = "matchit" -version = "0.7.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" +checksum = "47e1ffaa40ddd1f3ed91f717a33c8c0ee23fff369e3aa8772b9605cc1d22f4c3" [[package]] name = "maxminddb" @@ -1312,23 +1295,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "multer" -version = "3.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83e87776546dc87511aa5ee218730c92b666d7264ab6ed41f9d215af9cd5224b" -dependencies = [ - "bytes", - "encoding_rs", - "futures-util", - "http 1.2.0", - "httparse", - "memchr", - "mime", - "spin 0.9.8", - "version_check", -] - [[package]] name = "no-std-compat" version = "0.4.1" diff --git a/Cargo.toml b/Cargo.toml index f70979d..99cc424 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,11 +7,11 @@ authors = ["Slatian "] # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -lib-humus = { version="0.2", features=["axum-view+cookie"] } +lib-humus = { version="0.3", features=["axum-view+cookie"] } -axum = { version = "0.7", features = ["macros"] } -axum-extra = { version = "0.9", features = ["cookie", "typed-header"] } -axum-client-ip = "0.6" +axum = { version = "0.8", features = ["macros"] } +axum-extra = { version = "0.10", features = ["cookie", "typed-header"] } +axum-client-ip = "0.7" clap = { version = "4.5", features = ["derive"] } governor = "0.8" idna = "1.0" diff --git a/src/main.rs b/src/main.rs index 4400199..c33800a 100644 --- a/src/main.rs +++ b/src/main.rs @@ -290,9 +290,9 @@ async fn main() { // Initalize axum server let app = Router::new() .route("/", get(handle_default_route)) - .route("/dig/:name", get(handle_dig_route_with_path)) - .route("/ip/:address", get(handle_ip_route_with_path)) - .route("/dns_resolver/:resolver", get(handle_dns_resolver_route_with_path)) + .route("/dig/{name}", get(handle_dig_route_with_path)) + .route("/ip/{address}", get(handle_ip_route_with_path)) + .route("/dns_resolver/{resolver}", get(handle_dns_resolver_route_with_path)) .route("/dns_resolver", get(handle_dns_resolver_route)) .route("/ua", get(user_agent_handler)) .route("/hi", get(hello_world_handler))