From 011a25597a12b4dc19ea2a8b2e4b4ef8aac76b8d Mon Sep 17 00:00:00 2001 From: Kasper Juul Hermansen Date: Mon, 11 Mar 2024 10:31:45 +0000 Subject: [PATCH] chore(deps): update all dependencies --- Cargo.lock | 169 +++++++++++++++++++++-------------------------------- Cargo.toml | 12 ++-- 2 files changed, 74 insertions(+), 107 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 385961c..a6b6348 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -454,7 +454,6 @@ checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf" dependencies = [ "async-trait", "axum-core 0.3.4", - "axum-macros 0.3.8", "bitflags 1.3.2", "bytes", "futures-util", @@ -482,19 +481,19 @@ dependencies = [ [[package]] name = "axum" -version = "0.7.1" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "810a80b128d70e6ed2bdf3fe8ed72c0ae56f5f5948d01c2753282dd92a84fce8" +checksum = "1236b4b292f6c4d6dc34604bb5120d85c3fe1d1aa596bd5cc52ca054d13e7b9e" dependencies = [ "async-trait", - "axum-core 0.4.0", - "axum-macros 0.4.0", + "axum-core 0.4.3", + "axum-macros", "bytes", "futures-util", "http 1.0.0", "http-body 1.0.0", "http-body-util", - "hyper 1.0.1", + "hyper 1.2.0", "hyper-util", "itoa", "matchit", @@ -512,6 +511,7 @@ dependencies = [ "tower", "tower-layer", "tower-service", + "tracing", ] [[package]] @@ -533,9 +533,9 @@ dependencies = [ [[package]] name = "axum-core" -version = "0.4.0" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de0ddc355eab88f4955090a823715df47acf0b7660aab7a69ad5ce6301ee3b73" +checksum = "a15c63fd72d41492dc4f497196f5da1fb04fb7529e631d73630d1b491e47a2e3" dependencies = [ "async-trait", "bytes", @@ -549,6 +549,7 @@ dependencies = [ "sync_wrapper", "tower-layer", "tower-service", + "tracing", ] [[package]] @@ -575,33 +576,12 @@ dependencies = [ [[package]] name = "axum-extra" -version = "0.8.0" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ab90e7b70bea63a153137162affb6a0bce26b584c24a4c7885509783e2cf30b" +checksum = "895ff42f72016617773af68fb90da2a9677d89c62338ec09162d4909d86fdd8f" dependencies = [ - "axum 0.6.20", - "axum-core 0.3.4", - "bytes", - "futures-util", - "http 0.2.11", - "http-body 0.4.5", - "mime", - "pin-project-lite", - "serde", - "tokio", - "tower", - "tower-layer", - "tower-service", -] - -[[package]] -name = "axum-extra" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "523ae92256049a3b02d3bb4df80152386cd97ddba0c8c5077619bdc8c4b1859b" -dependencies = [ - "axum 0.7.1", - "axum-core 0.4.0", + "axum 0.7.4", + "axum-core 0.4.3", "bytes", "cookie 0.18.0", "futures-util", @@ -619,21 +599,9 @@ dependencies = [ [[package]] name = "axum-macros" -version = "0.3.8" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdca6a10ecad987bda04e95606ef85a5417dcaac1a78455242d72e031e2b6b62" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "syn 2.0.39", -] - -[[package]] -name = "axum-macros" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a2edad600410b905404c594e2523549f1bcd4bded1e252c8f74524ccce0b867" +checksum = "00c055ee2d014ae5981ce1016374e8213682aa14d9bf40e48ab48b5f3ef20eaa" dependencies = [ "heck", "proc-macro2", @@ -710,7 +678,7 @@ name = "basic" version = "0.1.0" dependencies = [ "anyhow", - "axum 0.7.1", + "axum 0.7.4", "clap 4.4.10", "nefarious-login", "tokio", @@ -859,7 +827,7 @@ name = "clap" version = "0.1.0" dependencies = [ "anyhow", - "axum 0.7.1", + "axum 0.7.4", "clap 4.4.10", "nefarious-login", "tokio", @@ -1129,7 +1097,7 @@ name = "custom_redirect" version = "0.1.0" dependencies = [ "anyhow", - "axum 0.7.1", + "axum 0.7.4", "clap 4.4.10", "nefarious-login", "tokio", @@ -1707,9 +1675,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.4.0" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1d308f63daf4181410c242d34c11f928dcb3aa105852019e043c9d1f4e4368a" +checksum = "31d030e59af851932b72ceebadf4a2b5986dba4c3b99dd2493f8273a0f151943" dependencies = [ "bytes", "fnv", @@ -1929,12 +1897,6 @@ dependencies = [ "pin-project-lite", ] -[[package]] -name = "http-range-header" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "add0ab9360ddbd88cfeb3bd9574a1d85cfdfa14db10b3e21d3700dbc4328758f" - [[package]] name = "httparse" version = "1.8.0" @@ -1973,20 +1935,21 @@ dependencies = [ [[package]] name = "hyper" -version = "1.0.1" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "403f9214f3e703236b221f1a9cd88ec8b4adfa5296de01ab96216361f4692f56" +checksum = "186548d73ac615b32a73aafe38fb4f56c0d340e110e5a200bcadbaf2e199263a" dependencies = [ "bytes", "futures-channel", "futures-util", - "h2 0.4.0", + "h2 0.4.2", "http 1.0.0", "http-body 1.0.0", "httparse", "httpdate", "itoa", "pin-project-lite", + "smallvec", "tokio", ] @@ -2006,22 +1969,18 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.1" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ca339002caeb0d159cc6e023dff48e199f081e42fa039895c7c6f38b37f2e9d" +checksum = "ca38ef113da30126bbff9cd1705f9273e15d45498615d138b0c20279ac7a76aa" dependencies = [ "bytes", - "futures-channel", "futures-util", "http 1.0.0", "http-body 1.0.0", - "hyper 1.0.1", + "hyper 1.2.0", "pin-project-lite", "socket2 0.5.5", "tokio", - "tower", - "tower-service", - "tracing", ] [[package]] @@ -2155,11 +2114,12 @@ dependencies = [ [[package]] name = "jsonwebtoken" -version = "9.1.0" +version = "9.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "155c4d7e39ad04c172c5e3a99c434ea3b4a7ba7960b38ecd562b270b097cce09" +checksum = "5c7ea04a7c5c055c175f189b6dc6ba036fd62306b58c66c9f6389036c503a3f4" dependencies = [ "base64 0.21.5", + "js-sys", "pem", "ring", "serde", @@ -2338,8 +2298,8 @@ dependencies = [ "anyhow", "async-sqlx-session", "async-trait", - "axum 0.7.1", - "axum-extra 0.9.0", + "axum 0.7.4", + "axum-extra 0.9.2", "axum-sessions", "clap 4.4.10", "oauth2", @@ -2383,7 +2343,7 @@ name = "noop" version = "0.1.0" dependencies = [ "anyhow", - "axum 0.7.1", + "axum 0.7.4", "clap 4.4.10", "nefarious-login", "tokio", @@ -2428,6 +2388,12 @@ dependencies = [ "zeroize", ] +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + [[package]] name = "num-integer" version = "0.1.45" @@ -2512,9 +2478,9 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "openidconnect" -version = "3.4.0" +version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62d6050f6a84b81f23c569f5607ad883293e57491036e318fafe6fc4895fadb1" +checksum = "f47e80a9cfae4462dd29c41e987edd228971d6565553fbc14b8a11e666d91590" dependencies = [ "base64 0.13.1", "chrono", @@ -2988,9 +2954,9 @@ checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] name = "reqwest" -version = "0.11.22" +version = "0.11.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b" +checksum = "0eea5a9eb898d3783f17c6407670e3592fd174cb81a10e51d4c37f49450b9946" dependencies = [ "base64 0.21.5", "bytes", @@ -3014,6 +2980,7 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded", + "sync_wrapper", "system-configuration", "tokio", "tokio-rustls", @@ -3455,9 +3422,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "socket2" @@ -3866,20 +3833,20 @@ checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" [[package]] name = "system-configuration" -version = "0.5.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" +checksum = "658bc6ee10a9b4fcf576e9b0819d95ec16f4d2c02d39fd83ac1c8789785c4a42" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.1", "core-foundation", "system-configuration-sys", ] [[package]] name = "system-configuration-sys" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" +checksum = "8e1d1b10ced5ca923a1fcb8d03e96b8d3268065d724548c0211415ff6ac6bac4" dependencies = [ "core-foundation-sys", "libc", @@ -3930,12 +3897,13 @@ dependencies = [ [[package]] name = "time" -version = "0.3.30" +version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5" +checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749" dependencies = [ "deranged", "itoa", + "num-conv", "powerfmt", "serde", "time-core", @@ -3950,10 +3918,11 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.15" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20" +checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774" dependencies = [ + "num-conv", "time-core", ] @@ -4055,17 +4024,15 @@ dependencies = [ [[package]] name = "tower-http" -version = "0.4.4" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61c5bb1d698276a2443e5ecfabc1008bf15a36c12e6a7176e7bf089ea9131140" +checksum = "1e9cd434a998747dd2c4276bc96ee2e0c7a2eadf3cae88e52be55a05fa9053f5" dependencies = [ "bitflags 2.4.1", "bytes", - "futures-core", - "futures-util", - "http 0.2.11", - "http-body 0.4.5", - "http-range-header", + "http 1.0.0", + "http-body 1.0.0", + "http-body-util", "pin-project-lite", "tower-layer", "tower-service", @@ -4233,9 +4200,9 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "uuid" -version = "1.6.1" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e395fcf16a7a3d8127ec99782007af141946b4795001f876d54fb0d55978560" +checksum = "f00cc9702ca12d3c81455259621e676d0f7251cec66a21e98fe2e9a37db93b2a" dependencies = [ "getrandom", ] @@ -4593,12 +4560,12 @@ checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" [[package]] name = "zitadel" -version = "3.4.29" +version = "4.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aab76990d831d980e72e52f6eed5ef8e4a740ee7ad14c65e1a3374b974f92258" +checksum = "9c376f97668d705c17059285c133864d99ed70661d0ba025d2dab3e93f69966c" dependencies = [ - "axum 0.6.20", - "axum-extra 0.8.0", + "axum 0.7.4", + "axum-extra 0.9.2", "base64-compat", "custom_error", "jsonwebtoken", diff --git a/Cargo.toml b/Cargo.toml index 394fa47..458088f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,10 +13,10 @@ tracing-subscriber = { version = "0.3", features = ["env-filter"] } clap = { version = "4", features = ["derive", "env"] } async-trait = { version = "0.1", features = [] } -axum = { version = "0.7.1", features = [ +axum = { version = "0.7.4", features = [ "macros", ] } -axum-extra = { version = "0.9.0", features = [ +axum-extra = { version = "0.9.2", features = [ "cookie", "cookie-private", "typed-header", @@ -27,18 +27,18 @@ async-sqlx-session = { version = "0.4.0", features = ["pg"] } serde = { version = "1", features = ["derive"] } serde_json = { version = "1" } -uuid = {version = "1.5.0", features = ["v4"]} +uuid = {version = "1.7.0", features = ["v4"]} sqlx = { version = "0.7", features = [ "runtime-tokio", "postgres", "migrate", ] } -zitadel = { version = "3.4", features = ["axum"] } +zitadel = { version = "4.1", features = ["axum"] } tower = "0.4" -tower-http = { version = "0.4", features = ["cors", "trace"] } +tower-http = { version = "0.5", features = ["cors", "trace"] } oauth2 = "4.4.2" -openidconnect = "3.4" +openidconnect = "3.5" pretty_assertions = "1.4.0" sealed_test = "1.0.0"