From 6d914006d713d29585ae8782df522b091cef4e21 Mon Sep 17 00:00:00 2001 From: Kasper Juul Hermansen Date: Sat, 30 Mar 2024 21:14:01 +0000 Subject: [PATCH] chore(deps): update all dependencies --- Cargo.lock | 190 ++++++++++++++++++++--------------------------------- Cargo.toml | 12 ++-- 2 files changed, 78 insertions(+), 124 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 385961c..41d6f29 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", @@ -473,7 +472,7 @@ dependencies = [ "serde_json", "serde_path_to_error", "serde_urlencoded", - "sync_wrapper", + "sync_wrapper 0.1.2", "tokio", "tower", "tower-layer", @@ -482,19 +481,19 @@ dependencies = [ [[package]] name = "axum" -version = "0.7.1" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "810a80b128d70e6ed2bdf3fe8ed72c0ae56f5f5948d01c2753282dd92a84fce8" +checksum = "3a6c9af12842a67734c9a2e355436e5d03b22383ed60cf13cd0c18fbfe3dcbcf" 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", @@ -507,11 +506,12 @@ dependencies = [ "serde_json", "serde_path_to_error", "serde_urlencoded", - "sync_wrapper", + "sync_wrapper 1.0.0", "tokio", "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", @@ -546,9 +546,10 @@ dependencies = [ "mime", "pin-project-lite", "rustversion", - "sync_wrapper", + "sync_wrapper 0.1.2", "tower-layer", "tower-service", + "tracing", ] [[package]] @@ -575,33 +576,12 @@ dependencies = [ [[package]] name = "axum-extra" -version = "0.8.0" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ab90e7b70bea63a153137162affb6a0bce26b584c24a4c7885509783e2cf30b" +checksum = "0be6ea09c9b96cb5076af0de2e383bd2bc0c18f827cf1967bdd353e0b910d733" 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.5", + "axum-core 0.4.3", "bytes", "cookie 0.18.0", "futures-util", @@ -615,25 +595,14 @@ dependencies = [ "tower", "tower-layer", "tower-service", + "tracing", ] [[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 +679,7 @@ name = "basic" version = "0.1.0" dependencies = [ "anyhow", - "axum 0.7.1", + "axum 0.7.5", "clap 4.4.10", "nefarious-login", "tokio", @@ -859,7 +828,7 @@ name = "clap" version = "0.1.0" dependencies = [ "anyhow", - "axum 0.7.1", + "axum 0.7.5", "clap 4.4.10", "nefarious-login", "tokio", @@ -1129,7 +1098,7 @@ name = "custom_redirect" version = "0.1.0" dependencies = [ "anyhow", - "axum 0.7.1", + "axum 0.7.5", "clap 4.4.10", "nefarious-login", "tokio", @@ -1705,25 +1674,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "h2" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1d308f63daf4181410c242d34c11f928dcb3aa105852019e043c9d1f4e4368a" -dependencies = [ - "bytes", - "fnv", - "futures-core", - "futures-sink", - "futures-util", - "http 1.0.0", - "indexmap 2.1.0", - "slab", - "tokio", - "tokio-util", - "tracing", -] - [[package]] name = "hashbrown" version = "0.11.2" @@ -1929,12 +1879,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" @@ -1957,7 +1901,7 @@ dependencies = [ "futures-channel", "futures-core", "futures-util", - "h2 0.3.22", + "h2", "http 0.2.11", "http-body 0.4.5", "httparse", @@ -1973,20 +1917,20 @@ 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", "http 1.0.0", "http-body 1.0.0", "httparse", "httpdate", "itoa", "pin-project-lite", + "smallvec", "tokio", ] @@ -2006,22 +1950,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 +2095,12 @@ dependencies = [ [[package]] name = "jsonwebtoken" -version = "9.1.0" +version = "9.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "155c4d7e39ad04c172c5e3a99c434ea3b4a7ba7960b38ecd562b270b097cce09" +checksum = "b9ae10193d25051e74945f1ea2d0b42e03cc3b890f7e4cc5faa44997d808193f" dependencies = [ "base64 0.21.5", + "js-sys", "pem", "ring", "serde", @@ -2338,8 +2279,8 @@ dependencies = [ "anyhow", "async-sqlx-session", "async-trait", - "axum 0.7.1", - "axum-extra 0.9.0", + "axum 0.7.5", + "axum-extra 0.9.3", "axum-sessions", "clap 4.4.10", "oauth2", @@ -2383,7 +2324,7 @@ name = "noop" version = "0.1.0" dependencies = [ "anyhow", - "axum 0.7.1", + "axum 0.7.5", "clap 4.4.10", "nefarious-login", "tokio", @@ -2428,6 +2369,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 +2459,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,16 +2935,16 @@ checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] name = "reqwest" -version = "0.11.22" +version = "0.11.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b" +checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62" dependencies = [ "base64 0.21.5", "bytes", "encoding_rs", "futures-core", "futures-util", - "h2 0.3.22", + "h2", "http 0.2.11", "http-body 0.4.5", "hyper 0.14.27", @@ -3014,6 +2961,7 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded", + "sync_wrapper 0.1.2", "system-configuration", "tokio", "tokio-rustls", @@ -3455,9 +3403,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "socket2" @@ -3864,6 +3812,12 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" +[[package]] +name = "sync_wrapper" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "384595c11a4e2969895cad5a8c4029115f5ab956a9e5ef4de79d11a426e5f20c" + [[package]] name = "system-configuration" version = "0.5.1" @@ -3930,12 +3884,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 +3905,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 +4011,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 +4187,9 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "uuid" -version = "1.6.1" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e395fcf16a7a3d8127ec99782007af141946b4795001f876d54fb0d55978560" +checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" dependencies = [ "getrandom", ] @@ -4593,12 +4547,12 @@ checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" [[package]] name = "zitadel" -version = "3.4.29" +version = "4.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aab76990d831d980e72e52f6eed5ef8e4a740ee7ad14c65e1a3374b974f92258" +checksum = "f6d929b4824f3bf1bef7bd3e7496595269b8a8d07a9be88b014d4cc3785e7695" dependencies = [ - "axum 0.6.20", - "axum-extra 0.8.0", + "axum 0.7.5", + "axum-extra 0.9.3", "base64-compat", "custom_error", "jsonwebtoken", diff --git a/Cargo.toml b/Cargo.toml index 394fa47..2a209aa 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.5", features = [ "macros", ] } -axum-extra = { version = "0.9.0", features = [ +axum-extra = { version = "0.9.3", 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.8.0", features = ["v4"]} sqlx = { version = "0.7", features = [ "runtime-tokio", "postgres", "migrate", ] } -zitadel = { version = "3.4", features = ["axum"] } +zitadel = { version = "4.2", 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"