diff --git a/Cargo.lock b/Cargo.lock index 451591ce1..9df48c548 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -373,12 +373,12 @@ dependencies = [ [[package]] name = "axum" -version = "0.7.5" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a6c9af12842a67734c9a2e355436e5d03b22383ed60cf13cd0c18fbfe3dcbcf" +checksum = "8f43644eed690f5374f1af436ecd6aea01cd201f6fbdf0178adaf6907afb2cec" dependencies = [ "async-trait", - "axum-core 0.4.3", + "axum-core 0.4.4", "axum-macros", "bytes", "futures-util", @@ -401,7 +401,7 @@ dependencies = [ "serde_urlencoded", "sync_wrapper 1.0.1", "tokio", - "tower 0.4.13", + "tower 0.5.1", "tower-layer", "tower-service", "tracing", @@ -414,7 +414,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8169113a185f54f68614fcfc3581df585d30bf8542bcb99496990e1025e4120a" dependencies = [ "async-trait", - "axum-core 0.4.3", + "axum-core 0.4.4", "base64 0.21.7", "http 1.1.0", ] @@ -438,9 +438,9 @@ dependencies = [ [[package]] name = "axum-core" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a15c63fd72d41492dc4f497196f5da1fb04fb7529e631d73630d1b491e47a2e3" +checksum = "5e6b8ba012a258d63c9adfa28b9ddcf66149da6f986c5b5452e629d5ee64bf00" dependencies = [ "async-trait", "bytes", @@ -451,7 +451,7 @@ dependencies = [ "mime", "pin-project-lite", "rustversion", - "sync_wrapper 0.1.2", + "sync_wrapper 1.0.1", "tower-layer", "tower-service", "tracing", @@ -459,12 +459,12 @@ dependencies = [ [[package]] name = "axum-extra" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0be6ea09c9b96cb5076af0de2e383bd2bc0c18f827cf1967bdd353e0b910d733" +checksum = "73c3220b188aea709cf1b6c5f9b01c3bd936bb08bd2b5184a12b35ac8131b1f9" dependencies = [ - "axum 0.7.5", - "axum-core 0.4.3", + "axum 0.7.6", + "axum-core 0.4.4", "bytes", "cookie 0.18.1", "futures-util", @@ -474,7 +474,7 @@ dependencies = [ "mime", "pin-project-lite", "serde", - "tower 0.4.13", + "tower 0.5.1", "tower-layer", "tower-service", "tracing", @@ -487,7 +487,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "40f7051fdc094b6e5ea06cab9bca4b198c54dee4472a9419155f0ff19f19901e" dependencies = [ "async-trait", - "axum-core 0.4.3", + "axum-core 0.4.4", "futures-core", "http 1.1.0", "pin-project-lite", @@ -498,11 +498,10 @@ dependencies = [ [[package]] name = "axum-macros" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00c055ee2d014ae5981ce1016374e8213682aa14d9bf40e48ab48b5f3ef20eaa" +checksum = "57d123550fa8d071b7255cb0cc04dc302baa6c8c4a79f55701552684d8399bce" dependencies = [ - "heck 0.4.1", "proc-macro2", "quote", "syn 2.0.77", @@ -755,9 +754,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.7.1" +version = "1.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" +checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3" [[package]] name = "cast" @@ -856,9 +855,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.17" +version = "4.5.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e5a21b8495e732f1b3c364c9949b201ca7bae518c502c80256c96ad79eaf6ac" +checksum = "b0956a43b323ac1afaffc053ed5c4b7c1f1800bacd1683c353aabbb752515dd3" dependencies = [ "clap_builder", "clap_derive", @@ -866,9 +865,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.17" +version = "4.5.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cf2dd12af7a047ad9d6da2b6b249759a22a7abc0f474c1dae1777afa4b21a73" +checksum = "4d72166dd41634086d5803a47eb71ae740e61d84709c36f3c34110173db3961b" dependencies = [ "anstream", "anstyle", @@ -878,20 +877,20 @@ dependencies = [ [[package]] name = "clap_complete" -version = "4.5.26" +version = "4.5.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "205d5ef6d485fa47606b98b0ddc4ead26eb850aaa86abfb562a94fb3280ecba0" +checksum = "8937760c3f4c60871870b8c3ee5f9b30771f792a7045c48bcbba999d7d6b3b8e" dependencies = [ "clap", ] [[package]] name = "clap_derive" -version = "4.5.13" +version = "4.5.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "501d359d5f3dcaf6ecdeee48833ae73ec6e42723a1e52419c79abf9507eec0a0" +checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab" dependencies = [ - "heck 0.5.0", + "heck", "proc-macro2", "quote", "syn 2.0.77", @@ -2666,12 +2665,6 @@ dependencies = [ "hashbrown 0.14.5", ] -[[package]] -name = "heck" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" - [[package]] name = "heck" version = "0.5.0" @@ -3134,9 +3127,9 @@ dependencies = [ [[package]] name = "jsonschema" -version = "0.19.1" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14a655181740aa66dfcb182daca1bc8109fda5c7c0399c4f30dcb155ab0d32a6" +checksum = "f2eef4e82b548e08ac880d307c8e8838b45f497a08d3202f3b26c9debaed8058" dependencies = [ "ahash", "anyhow", @@ -3412,7 +3405,7 @@ version = "1.4.0-dev" dependencies = [ "askama", "async-trait", - "axum 0.7.5", + "axum 0.7.6", "axum-auth", "axum-extra", "axum-htmx", @@ -6170,6 +6163,11 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2873938d487c3cfb9aed7546dc9f2711d867c9f90c46b889989a2cb84eba6b4f" dependencies = [ + "futures-core", + "futures-util", + "pin-project-lite", + "sync_wrapper 0.1.2", + "tokio", "tokio-stream", "tower-layer", "tower-service", @@ -6178,9 +6176,9 @@ dependencies = [ [[package]] name = "tower-http" -version = "0.5.2" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e9cd434a998747dd2c4276bc96ee2e0c7a2eadf3cae88e52be55a05fa9053f5" +checksum = "41515cc9e193536d93fd0dbbea0c73819c08eca76e0b30909a325c3ec90985bb" dependencies = [ "async-compression", "bitflags 2.6.0", @@ -6498,7 +6496,7 @@ version = "6.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b39868d43c011961e04b41623e050aedf2cc93652562ff7935ce0f819aaf2da" dependencies = [ - "axum 0.7.5", + "axum 0.7.6", "mime_guess", "regex", "rust-embed", diff --git a/Cargo.toml b/Cargo.toml index 779bf5480..a86358bba 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -144,7 +144,7 @@ argon2 = { version = "0.5.3", features = ["alloc"] } askama = { version = "0.12.1", features = ["serde"] } async-recursion = "1.1.0" async-trait = "^0.1.82" -axum = { version = "0.7.5", features = [ +axum = { version = "0.7.6", features = [ "form", "json", "macros", @@ -159,9 +159,9 @@ base32 = "^0.5.1" base64 = "^0.22.1" base64urlsafedata = "0.5.0" bitflags = "^2.6.0" -bytes = "^1.7.1" -clap = { version = "^4.5.17", features = ["derive", "env"] } -clap_complete = "^4.5.26" +bytes = "^1.7.2" +clap = { version = "^4.5.18", features = ["derive", "env"] } +clap_complete = "^4.5.29" # Forced by saffron/cron chrono = "^0.4.35" compact_jwt = { version = "^0.4.2", default-features = false } diff --git a/server/core/Cargo.toml b/server/core/Cargo.toml index e34fe8619..69c0f5ca2 100644 --- a/server/core/Cargo.toml +++ b/server/core/Cargo.toml @@ -24,7 +24,7 @@ askama = { workspace = true } axum = { workspace = true } axum-htmx = { workspace = true } axum-auth = "0.7.0" -axum-extra = { version = "0.9.3", features = ["cookie"] } +axum-extra = { version = "0.9.4", features = ["cookie"] } axum-macros = "0.4.1" axum-server = { version = "0.7.1", features = ["tls-openssl"] } bytes = { workspace = true } @@ -60,7 +60,7 @@ tokio-openssl = { workspace = true } tokio-util = { workspace = true, features = ["codec"] } toml = { workspace = true } tower = { version = "0.5.1", features = ["tokio-stream", "tracing"] } -tower-http = { version = "0.5.2", features = [ +tower-http = { version = "0.6.0", features = [ "compression-gzip", "fs", "tokio", diff --git a/server/testkit/Cargo.toml b/server/testkit/Cargo.toml index 6a97a3564..cd5f0d36a 100644 --- a/server/testkit/Cargo.toml +++ b/server/testkit/Cargo.toml @@ -66,4 +66,4 @@ tokio-openssl = { workspace = true } kanidm_lib_crypto = { workspace = true } uuid = { workspace = true } webauthn-authenticator-rs = { workspace = true } -jsonschema = "0.19.1" +jsonschema = "0.20.0"