diff --git a/Cargo.lock b/Cargo.lock index c22bfb148..9d2ee40b4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -156,7 +156,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a41603f7cdbf5ac4af60760f17253eb6adf6ec5b6f14a7ed830cf687d375f163" dependencies = [ "askama", - "axum-core", + "axum-core 0.4.5", "http 1.2.0", ] @@ -322,8 +322,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "edca88bc138befd0323b20752846e6587272d3b03b0343c8ea28a6f819e6e71f" dependencies = [ "async-trait", - "axum-core", - "axum-macros", + "axum-core 0.4.5", + "axum-macros 0.4.2", "bytes", "futures-util", "http 1.2.0", @@ -332,7 +332,7 @@ dependencies = [ "hyper 1.6.0", "hyper-util", "itoa", - "matchit", + "matchit 0.7.3", "memchr", "mime", "multer", @@ -351,6 +351,33 @@ dependencies = [ "tracing", ] +[[package]] +name = "axum" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d6fd624c75e18b3b4c6b9caf42b1afe24437daaee904069137d8bab077be8b8" +dependencies = [ + "axum-core 0.5.0", + "bytes", + "futures-util", + "http 1.2.0", + "http-body 1.0.1", + "http-body-util", + "itoa", + "matchit 0.8.4", + "memchr", + "mime", + "percent-encoding", + "pin-project-lite", + "rustversion", + "serde", + "sync_wrapper 1.0.2", + "tower 0.5.2", + "tower-layer", + "tower-service", + "tracing", +] + [[package]] name = "axum-core" version = "0.4.5" @@ -373,22 +400,40 @@ dependencies = [ ] [[package]] -name = "axum-extra" -version = "0.9.6" +name = "axum-core" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c794b30c904f0a1c2fb7740f7df7f7972dfaa14ef6f57cb6178dc63e5dca2f04" +checksum = "df1362f362fd16024ae199c1970ce98f9661bf5ef94b9808fee734bc3698b733" dependencies = [ - "axum", - "axum-core", "bytes", - "cookie 0.18.1", - "fastrand", "futures-util", "http 1.2.0", "http-body 1.0.1", "http-body-util", "mime", - "multer", + "pin-project-lite", + "rustversion", + "sync_wrapper 1.0.2", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "axum-extra" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "460fc6f625a1f7705c6cf62d0d070794e94668988b1c38111baeec177c715f7b" +dependencies = [ + "axum 0.8.1", + "axum-core 0.5.0", + "bytes", + "cookie 0.18.1", + "futures-util", + "http 1.2.0", + "http-body 1.0.1", + "http-body-util", + "mime", "pin-project-lite", "serde", "tower 0.5.2", @@ -403,7 +448,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "40f7051fdc094b6e5ea06cab9bca4b198c54dee4472a9419155f0ff19f19901e" dependencies = [ "async-trait", - "axum-core", + "axum-core 0.4.5", "futures-core", "http 1.2.0", "pin-project-lite", @@ -423,6 +468,17 @@ dependencies = [ "syn 2.0.98", ] +[[package]] +name = "axum-macros" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "604fde5e028fea851ce1d8570bbdc034bec850d157f7569d10f347d06808c05c" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.98", +] + [[package]] name = "axum-server" version = "0.7.1" @@ -665,9 +721,9 @@ checksum = "f61dac84819c6588b558454b194026eb1f09c293b9036ae9b159e74e73ab6cf9" [[package]] name = "cc" -version = "1.2.13" +version = "1.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7777341816418c02e033934a09f20dc0ccaf65a5201ef8a450ae0105a573fda" +checksum = "0c3d1b2e905a3a7b00a6141adb0e4c0bb941d11caf55349d863942a1cc44e3c9" dependencies = [ "shlex", ] @@ -727,9 +783,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.28" +version = "4.5.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e77c3243bd94243c03672cb5154667347c457ca271254724f9f393aee1c05ff" +checksum = "8acebd8ad879283633b343856142139f2da2317c96b05b4dd6181c61e2480184" dependencies = [ "clap_builder", "clap_derive", @@ -737,9 +793,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.27" +version = "4.5.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b26884eb4b57140e4d2d93652abfa49498b938b3c9179f9fc487b0acc3edad7" +checksum = "f6ba32cbda51c7e1dfd49acc1457ba1a7dec5b64fe360e828acb13ca8dc9c2f9" dependencies = [ "anstream", "anstyle", @@ -3117,10 +3173,10 @@ version = "1.6.0-dev" dependencies = [ "askama", "askama_axum", - "axum", + "axum 0.7.9", "axum-extra", "axum-htmx", - "axum-macros", + "axum-macros 0.5.0", "axum-server", "bytes", "chrono", @@ -3501,6 +3557,12 @@ version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" +[[package]] +name = "matchit" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47e1ffaa40ddd1f3ed91f717a33c8c0ee23fff369e3aa8772b9605cc1d22f4c3" + [[package]] name = "mathru" version = "0.13.0" @@ -3933,9 +3995,9 @@ checksum = "945462a4b81e43c4e3ba96bd7b49d834c6f61198356aa858733bc4acf3cbe62e" [[package]] name = "openssl" -version = "0.10.70" +version = "0.10.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61cfb4e166a8bb8c9b55c500bc2308550148ece889be90f609377e58140f42c6" +checksum = "5e14130c6a98cd258fdcb0fb6d744152343ff729cbfcb28c656a9d12b999fbcd" dependencies = [ "bitflags 2.8.0", "cfg-if", @@ -3965,9 +4027,9 @@ checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e" [[package]] name = "openssl-sys" -version = "0.9.105" +version = "0.9.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b22d5b84be05a8d6947c7cb71f7c849aa0f112acd4bf51c2a7c1c988ac0a9dc" +checksum = "8bb61ea9811cc39e3c2069f40b8b8e2e70d8569b361f879786cc7ed48b777cdd" dependencies = [ "cc", "libc", @@ -4832,9 +4894,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.22" +version = "0.23.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fb9263ab4eb695e42321db096e3b8fbd715a59b154d5c88d82db2175b681ba7" +checksum = "47796c98c480fce5406ef69d1c76378375492c3b0a0de587be0c1d9feb12f395" dependencies = [ "once_cell", "ring", @@ -5702,7 +5764,7 @@ checksum = "877c5b330756d856ffcc4553ab34a5684481ade925ecc54bcd1bf02b1d0d4d52" dependencies = [ "async-stream", "async-trait", - "axum", + "axum 0.7.9", "base64 0.22.1", "bytes", "h2 0.4.7", @@ -6057,7 +6119,7 @@ version = "6.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b39868d43c011961e04b41623e050aedf2cc93652562ff7935ce0f819aaf2da" dependencies = [ - "axum", + "axum 0.7.9", "mime_guess", "regex", "rust-embed", diff --git a/Cargo.toml b/Cargo.toml index 9d0634dd1..ff4f3eea7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -159,7 +159,7 @@ base64 = "^0.22.1" base64urlsafedata = "0.5.1" bitflags = "^2.8.0" bytes = "^1.9.0" -clap = { version = "^4.5.27", features = ["derive", "env"] } +clap = { version = "^4.5.29", features = ["derive", "env"] } clap_complete = "^4.5.42" # Forced by saffron/cron chrono = "^0.4.39" @@ -209,7 +209,7 @@ notify-debouncer-full = { version = "0.1" } num_enum = "^0.5.11" oauth2_ext = { version = "^4.4.2", package = "oauth2", default-features = false } openssl-sys = "^0.9" -openssl = "^0.10.70" +openssl = "^0.10.71" opentelemetry = { version = "0.27.0" } opentelemetry_api = { version = "0.27.0", features = ["logs", "metrics"] } @@ -242,7 +242,7 @@ reqwest = { version = "0.12.12", default-features = false, features = [ "rustls-tls-native-roots", ] } rusqlite = { version = "^0.28.0", features = ["array", "bundled"] } -rustls = { version = "0.23.21", default-features = false, features = [ +rustls = { version = "0.23.23", default-features = false, features = [ "aws_lc_rs", ] } diff --git a/server/core/Cargo.toml b/server/core/Cargo.toml index 1c753cb44..69074db05 100644 --- a/server/core/Cargo.toml +++ b/server/core/Cargo.toml @@ -24,8 +24,8 @@ askama = { workspace = true, features = ["with-axum"] } askama_axum = { workspace = true } axum = { workspace = true } axum-htmx = { workspace = true } -axum-extra = { version = "0.9.6", features = ["cookie"] } -axum-macros = "0.4.2" +axum-extra = { version = "0.10.0", features = ["cookie"] } +axum-macros = "0.5.0" axum-server = { version = "0.7.1", default-features = false } bytes = { workspace = true } chrono = { workspace = true } diff --git a/unix_integration/nss_kanidm/Cargo.toml b/unix_integration/nss_kanidm/Cargo.toml index 4d84cfe1e..fd3820620 100644 --- a/unix_integration/nss_kanidm/Cargo.toml +++ b/unix_integration/nss_kanidm/Cargo.toml @@ -24,7 +24,7 @@ libc = { workspace = true } lazy_static = { workspace = true } [target."cfg(target_os = \"freebsd\")".build-dependencies] -cc = "^1.2.10" +cc = "^1.2.14" ## Debian packaging # The base metadata does **not** work to build a functioning package!