Moved some dependencies in the workspace and upgrade some dependencies

Cargo.toml

@@ -57,11 +57,11 @@ oauth2-types = { path = "./crates/oauth2-types/", version = "=0.8.0" }
 
 # Utility to write and implement async traits
 [workspace.dependencies.async-trait]
-version = "0.1.77"
+version = "0.1.78"
 
 # High-level error handling
 [workspace.dependencies.anyhow]
-version = "1.0.79"
+version = "1.0.81"
 
 # UTF-8 paths
 [workspace.dependencies.camino]
@@ -78,9 +78,22 @@ features = ["serde", "clock"]
 version = "4.5.3"
 features = ["derive"]
 
+# HTTP headers
+[workspace.dependencies.headers]
+version = "0.3.9"
+
 # HTTP request/response
 [workspace.dependencies.http]
-version = "0.2.11"
+version = "0.2.12"
+
+# HTTP body trait
+[workspace.dependencies.http-body]
+version = "0.4.6"
+
+# HTTP client
+[workspace.dependencies.hyper]
+version = "0.14.28"
+features = ["client", "http1", "http2", "stream", "runtime"]
 
 # Hyper Rustls support
 [workspace.dependencies.hyper-rustls]
@@ -111,17 +124,22 @@ features = ["url", "chrono", "preserve_order"]
 
 # Serialization and deserialization
 [workspace.dependencies.serde]
-version = "1.0.196"
+version = "1.0.197"
 features = ["derive"] # Most of the time, if we need serde, we need derive
 
 # JSON serialization and deserialization
 [workspace.dependencies.serde_json]
-version = "1.0.112"
+version = "1.0.114"
 features = ["preserve_order"]
 
+# SQL database support
+[workspace.dependencies.sqlx]
+version = "0.7.4"
+features = ["runtime-tokio-rustls", "postgres", "migrate", "chrono", "json", "uuid", "ipnetwork"]
+
 # Custom error types
 [workspace.dependencies.thiserror]
-version = "1.0.57"
+version = "1.0.58"
 
 # Tower services
 [workspace.dependencies.tower]
@@ -154,7 +172,7 @@ features = ["serde"]
 
 # ULID support
 [workspace.dependencies.ulid]
-version = "1.1.0"
+version = "1.1.2"
 features = ["serde"]
 
 # A few profile opt-level tweaks to make the test suite run faster

crates/axum-utils/Cargo.toml

@@ -18,9 +18,9 @@ axum-extra = { version = "0.8.0", features = ["cookie-private", "cookie-key-expa
 chrono.workspace = true
 data-encoding = "2.5.0"
 futures-util = "0.3.30"
-headers = "0.3.9"
+headers.workspace = true
 http.workspace = true
-http-body = "0.4.5"
+http-body.workspace = true
 icu_locid = "1.4.0"
 mime = "0.3.17"
 rand.workspace = true
@@ -30,7 +30,7 @@ serde_with = "3.7.0"
 serde_urlencoded = "0.7.1"
 serde_json.workspace = true
 thiserror.workspace = true
-tokio = "1.35.1"
+tokio = "1.36.0"
 tower.workspace = true
 tracing.workspace = true
 url.workspace = true

crates/cli/Cargo.toml

@@ -18,7 +18,7 @@ camino.workspace = true
 clap.workspace = true
 dotenvy = "0.15.7"
 httpdate = "1.0.3"
-hyper = { version = "0.14.28", features = ["full"] }
+hyper.workspace = true
 ipnetwork = "0.20.0"
 itertools = "0.12.1"
 listenfd = "1.0.1"
@@ -26,9 +26,9 @@ rand.workspace = true
 rand_chacha = "0.3.1"
 rustls.workspace = true
 serde_json.workspace = true
-serde_yaml = "0.9.30"
+serde_yaml = "0.9.33"
-sqlx = { version = "0.7.3", features = ["runtime-tokio-rustls", "postgres"] }
+sqlx.workspace = true
-tokio = { version = "1.35.1", features = ["full"] }
+tokio = { version = "1.36.0", features = ["full"] }
 tower.workspace = true
 tower-http = { version = "0.4.4", features = ["fs"] }
 url.workspace = true

crates/config/Cargo.toml

@@ -12,7 +12,7 @@ publish = false
 workspace = true
 
 [dependencies]
-tokio = { version = "1.35.1", features = ["fs", "rt"] }
+tokio = { version = "1.36.0", features = ["fs", "rt"] }
 tracing.workspace = true
 async-trait.workspace = true
 
@@ -32,8 +32,8 @@ serde_with = { version = "3.7.0", features = ["hex", "chrono"] }
 serde_json.workspace = true
 
 pem-rfc7468 = "0.7.0"
-rustls-pki-types = "1.2.0"
+rustls-pki-types = "1.3.1"
-rustls-pemfile = "2.0.0"
+rustls-pemfile = "2.1.1"
 rand.workspace = true
 rand_chacha = "0.3.1"
 

crates/email/Cargo.toml

@@ -15,7 +15,7 @@ workspace = true
 async-trait.workspace = true
 tracing.workspace = true
 thiserror.workspace = true
-headers = "0.3.9"
+headers.workspace = true
 
 mas-templates.workspace = true
 

crates/graphql/Cargo.toml

@@ -19,7 +19,7 @@ chrono.workspace = true
 lettre = { version = "0.11.4", default-features = false  }
 serde.workspace = true
 thiserror.workspace = true
-tokio = { version = "1.35.1", features = ["sync"] }
+tokio = { version = "1.36.0", features = ["sync"] }
 tracing.workspace = true
 tower.workspace = true
 ulid.workspace = true

crates/handlers/Cargo.toml

@@ -13,7 +13,7 @@ workspace = true
 
 [dependencies]
 # Async runtime
-tokio = { version = "1.35.1", features = ["macros"] }
+tokio = { version = "1.36.0", features = ["macros"] }
 futures-util = "0.3.30"
 
 # Logging and tracing
@@ -27,7 +27,7 @@ anyhow.workspace = true
 sentry = { version = "0.31.8", default-features = false }
 
 # Web server
-hyper = { version = "0.14.27", features = ["full"] }
+hyper.workspace = true
 tower.workspace = true
 tower-http = { version = "0.4.4", features = ["cors"] }
 axum = "0.6.20"
@@ -40,7 +40,7 @@ async-graphql = { version = "6.0.11", features = ["tracing", "apollo_tracing"] }
 lettre = { version = "0.11.4", default-features = false, features = ["builder"] }
 
 # Database access
-sqlx = { version = "0.7.3", features = ["runtime-tokio-rustls", "postgres"] }
+sqlx.workspace = true
 
 # Various structure (de)serialization
 serde.workspace = true
@@ -50,7 +50,7 @@ serde_urlencoded = "0.7.1"
 
 # Password hashing
 argon2 = { version = "0.5.3", features = ["password-hash", "std"] }
-bcrypt = "0.15.0"
+bcrypt = "0.15.1"
 pbkdf2 = { version = "0.12.2", features = ["password-hash", "std", "simple", "parallel"] }
 zeroize = "1.7.0"
 
@@ -58,14 +58,14 @@ zeroize = "1.7.0"
 base64ct = "1.6.0"
 camino.workspace = true
 chrono.workspace = true
-psl = "2.1.16"
+psl = "2.1.28"
 time = "0.3.34"
 url.workspace = true
 mime = "0.3.17"
 minijinja.workspace = true
 rand.workspace = true
 rand_chacha = "0.3.1"
-headers = "0.3.9"
+headers.workspace = true
 ulid.workspace = true
 
 mas-axum-utils.workspace = true
@@ -87,6 +87,7 @@ mas-templates.workspace = true
 oauth2-types.workspace = true
 
 [dev-dependencies]
-insta = "1.34.0"
+insta = "1.36.1"
 tracing-subscriber.workspace = true
-cookie_store = "0.20.0"
+cookie_store = "0.21.0"
+sqlx.workspace = true

crates/http/Cargo.toml

@@ -14,10 +14,10 @@ workspace = true
 [dependencies]
 bytes = "1.5.0"
 futures-util = "0.3.30"
-headers = "0.3.9"
+headers.workspace = true
 http.workspace = true
-http-body = "0.4.5"
+http-body.workspace = true
-hyper = "0.14.27"
+hyper.workspace = true
 hyper-rustls = { workspace = true, optional = true }
 opentelemetry.workspace = true
 rustls = { workspace = true, optional = true }
@@ -35,7 +35,7 @@ mas-tower = { workspace = true, optional = true }
 
 [dev-dependencies]
 anyhow.workspace = true
-tokio = { version = "1.35.1", features = ["macros", "rt"] }
+tokio = { version = "1.36.0", features = ["macros", "rt"] }
 
 [features]
 client = [

crates/i18n-scan/Cargo.toml

@@ -18,6 +18,6 @@ minijinja = { workspace = true, features = ["unstable_machinery"] }
 serde_json.workspace = true
 tracing-subscriber.workspace = true
 tracing.workspace = true
-walkdir = "2.4.0"
+walkdir = "2.5.0"
 
 mas-i18n.workspace = true

crates/i18n/Cargo.toml

@@ -23,8 +23,8 @@ icu_provider = { version = "1.4.0", features = ["std", "sync"] }
 icu_provider_adapters = { version = "1.4.0", features = ["std"] }
 icu_relativetime = { version = "0.1.4", features = ["compiled_data", "std"] }
 pad = "0.1.6"
-pest = "2.7.7"
+pest = "2.7.8"
-pest_derive = "2.7.6"
+pest_derive = "2.7.8"
 serde.workspace = true
 serde_json.workspace = true
 thiserror.workspace = true

crates/iana-codegen/Cargo.toml

@@ -18,8 +18,8 @@ camino.workspace = true
 convert_case = "0.6.0"
 csv = "1.3.0"
 futures-util = "0.3.30"
-hyper = { version = "0.14.27", features = ["tcp", "client", "http1"] }
+hyper.workspace = true
 serde.workspace = true
-tokio = { version = "1.35.1", features = ["macros", "rt-multi-thread", "fs", "io-util"] }
+tokio = { version = "1.36.0", features = ["macros", "rt-multi-thread", "fs", "io-util"] }
 tracing.workspace = true
 tracing-subscriber.workspace = true

crates/jose/Cargo.toml

@@ -38,5 +38,5 @@ url.workspace = true
 mas-iana.workspace = true
 
 [dev-dependencies]
-insta = { version = "1.34.0" }
+insta = { version = "1.36.1" }
 rand_chacha = "0.3.1"

crates/keystore/Cargo.toml

@@ -36,5 +36,5 @@ mas-iana.workspace = true
 mas-jose.workspace = true
 
 [dev-dependencies]
-insta = { version = "1.34.0", features = ["yaml"] }
+insta = { version = "1.36.1", features = ["yaml"] }
 rand_chacha = "0.3.1"

crates/keystore/tests/keystore.rs

@@ -166,16 +166,16 @@ fn generate_sign_and_verify() {
     let mut rng = rand_chacha::ChaCha8Rng::seed_from_u64(42);
 
     let rsa = PrivateKey::generate_rsa(&mut rng).expect("Failed to generate RSA key");
-    insta::assert_snapshot!(rsa.to_pem(LineEnding::LF).unwrap());
+    insta::assert_snapshot!(&*rsa.to_pem(LineEnding::LF).unwrap());
 
     let ec_p256 = PrivateKey::generate_ec_p256(&mut rng);
-    insta::assert_snapshot!(ec_p256.to_pem(LineEnding::LF).unwrap());
+    insta::assert_snapshot!(&*ec_p256.to_pem(LineEnding::LF).unwrap());
 
     let ec_p384 = PrivateKey::generate_ec_p384(&mut rng);
-    insta::assert_snapshot!(ec_p384.to_pem(LineEnding::LF).unwrap());
+    insta::assert_snapshot!(&*ec_p384.to_pem(LineEnding::LF).unwrap());
 
     let ec_k256 = PrivateKey::generate_ec_k256(&mut rng);
-    insta::assert_snapshot!(ec_k256.to_pem(LineEnding::LF).unwrap());
+    insta::assert_snapshot!(&*ec_k256.to_pem(LineEnding::LF).unwrap());
 
     // Create a keystore out of the keys
     let keyset = Keystore::new(JsonWebKeySet::new(vec![

crates/listener/Cargo.toml

@@ -13,15 +13,15 @@ workspace = true
 
 [dependencies]
 bytes = "1.5.0"
-event-listener = "4.0.3"
+event-listener = "5.2.0"
 futures-util = "0.3.30"
-http-body = "0.4.5"
+http-body.workspace = true
-hyper = { version = "0.14.27", features = ["server", "http1", "http2", "tcp"] }
+hyper = { workspace = true, features = ["server"] }
-libc = "0.2.152"
+libc = "0.2.153"
 pin-project-lite = "0.2.13"
-socket2 = "0.5.5"
+socket2 = "0.5.6"
 thiserror.workspace = true
-tokio = { version = "1.35.1", features = ["net", "rt", "macros", "signal", "time"] }
+tokio = { version = "1.36.0", features = ["net", "rt", "macros", "signal", "time"] }
 tokio-rustls = "0.25.0"
 tower-http = { version = "0.4.4", features = ["add-extension"] }
 tower-service = "0.3.2"
@@ -29,9 +29,9 @@ tracing.workspace = true
 
 [dev-dependencies]
 anyhow.workspace = true
-rustls-pemfile = "2.0.0"
+rustls-pemfile = "2.1.1"
-tokio = { version = "1.35.1", features = ["net", "rt", "macros", "signal", "time", "rt-multi-thread"] }
+tokio = { version = "1.36.0", features = ["net", "rt", "macros", "signal", "time", "rt-multi-thread"] }
-tokio-test = "0.4.3"
+tokio-test = "0.4.4"
 tracing-subscriber.workspace = true
 
 [[example]]

crates/listener/src/server.rs

@@ -254,7 +254,6 @@ pin_project! {
         connection: C,
         #[pin]
         shutdown_listener: EventListener,
-        shutdown_event: Arc<Event>,
         shutdown_in_progress: Arc<AtomicBool>,
         did_start_shutdown: bool,
     }
@@ -262,12 +261,10 @@ pin_project! {
 
 impl<C> AbortableConnection<C> {
     fn new(connection: C, shutdown_in_progress: &Arc<AtomicBool>, event: &Arc<Event>) -> Self {
-        let shutdown_listener = EventListener::new();
         Self {
             connection,
-            shutdown_listener,
+            shutdown_listener: event.listen(),
             shutdown_in_progress: Arc::clone(shutdown_in_progress),
-            shutdown_event: Arc::clone(event),
             did_start_shutdown: false,
         }
     }
@@ -289,14 +286,6 @@ where
     fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
         let mut this = self.project();
 
-        // If we aren't listening for the shutdown signal, start listening
-        if !this.shutdown_listener.is_listening() {
-            // XXX: it feels like we should setup the listener when we create it, but it
-            // needs a `Pin<&mut EventListener>` to do so, and I can't figure out
-            // how to get one outside of the `poll` method.
-            this.shutdown_listener.as_mut().listen(this.shutdown_event);
-        }
-
         // Poll the shutdown signal, so that wakers get registered.
         // XXX: I don't think we care about the result of this poll, since it's only
         // really to register wakers. But I'm not sure if it's safe to

crates/matrix/Cargo.toml

@@ -16,5 +16,5 @@ anyhow.workspace = true
 serde.workspace = true
 async-trait.workspace = true
 http.workspace = true
-tokio = { version = "1.35.1", features = ["sync", "macros", "rt"] }
+tokio = { version = "1.36.0", features = ["sync", "macros", "rt"] }
 url.workspace = true

crates/oidc-client/Cargo.toml

@@ -30,7 +30,7 @@ bytes = "1.5.0"
 chrono.workspace = true
 form_urlencoded = "1.2.1"
 futures-util = "0.3.30"
-headers = "0.3.9"
+headers.workspace = true
 http.workspace = true
 language-tags = "0.3.2"
 mime = "0.3.17"
@@ -51,15 +51,11 @@ mas-keystore = { workspace = true, optional = true }
 oauth2-types.workspace = true
 
 # Default http service
-http-body = { version = "0.4.5", optional = true }
+http-body = { workspace = true, optional = true }
+hyper = { workspace = true, optional = true }
+hyper-rustls = { workspace = true, optional = true }
 rustls = { workspace = true, optional = true }
 rustls-platform-verifier = { workspace = true, optional = true }
-hyper-rustls = { workspace = true, optional = true }
-
-[dependencies.hyper]
-version = "0.14.27"
-features = ["client", "http1", "http2", "stream", "runtime"]
-optional = true
 
 [dependencies.tower-http]
 version = "0.4.4"
@@ -68,8 +64,8 @@ optional = true
 
 [dev-dependencies]
 assert_matches = "1.5.0"
-bitflags = "2.4.2"
+bitflags = "2.5.0"
 mas-keystore.workspace = true
 rand_chacha = "0.3.1"
-tokio = { version = "1.35.1", features = ["rt", "macros", "rt-multi-thread"] }
+tokio = { version = "1.36.0", features = ["rt", "macros", "rt-multi-thread"] }
 wiremock = "0.5.22"

crates/policy/Cargo.toml

@@ -18,7 +18,7 @@ serde.workspace = true
 serde_json.workspace = true
 schemars = { workspace = true, optional = true }
 thiserror.workspace = true
-tokio = { version = "1.35.1", features = ["io-util", "rt"] }
+tokio = { version = "1.36.0", features = ["io-util", "rt"] }
 tracing.workspace = true
 wasmtime = { version = "18.0.3", default-features = false, features = ["async", "cranelift"] }
 
@@ -26,7 +26,7 @@ mas-data-model.workspace = true
 oauth2-types.workspace = true
 
 [dev-dependencies]
-tokio = { version = "1.35.1", features = ["fs", "rt", "macros"] }
+tokio = { version = "1.36.0", features = ["fs", "rt", "macros"] }
 
 [features]
 cache = ["wasmtime/cache"]

crates/storage-pg/Cargo.toml

@@ -13,7 +13,7 @@ workspace = true
 
 [dependencies]
 async-trait.workspace = true
-sqlx = { version = "0.7.3", features = ["runtime-tokio-rustls", "postgres", "migrate", "chrono", "json", "uuid", "ipnetwork"] }
+sqlx.workspace = true
 sea-query = { version = "0.30.7", features = ["derive", "attr", "with-uuid", "with-chrono", "postgres-array"] }
 sea-query-binder = { version = "0.5.0", features = ["sqlx-postgres", "with-uuid", "with-chrono", "postgres-array"] }
 chrono.workspace = true
@@ -26,7 +26,7 @@ futures-util = "0.3.30"
 rand.workspace = true
 rand_chacha = "0.3.1"
 url.workspace = true
-uuid = "1.7.0"
+uuid = "1.8.0"
 ulid = { workspace = true, features = ["uuid"] }
 
 oauth2-types.workspace = true

crates/tasks/Cargo.toml

@@ -18,13 +18,13 @@ apalis-cron = "0.4.9"
 async-stream = "0.3.5"
 async-trait.workspace = true
 chrono.workspace = true
-event-listener = "4.0.3"
+event-listener = "5.2.0"
-futures-lite = "2.2.0"
+futures-lite = "2.3.0"
 rand.workspace = true
 rand_chacha = "0.3.1"
-sqlx = { version = "0.7.3", features = ["runtime-tokio-rustls", "postgres"] }
+sqlx.workspace = true
 thiserror.workspace = true
-tokio = { version = "1.35.1", features = ["rt"] }
+tokio = { version = "1.36.0", features = ["rt"] }
 tower.workspace = true
 tracing.workspace = true
 tracing-opentelemetry.workspace = true

crates/templates/Cargo.toml

@@ -12,10 +12,10 @@ publish = false
 workspace = true
 
 [dependencies]
-arc-swap = "1.6.0"
+arc-swap = "1.7.0"
 tracing.workspace = true
-tokio = { version = "1.35.1", features = ["macros", "rt", "fs"] }
+tokio = { version = "1.36.0", features = ["macros", "rt", "fs"] }
-walkdir = "2.4.0"
+walkdir = "2.5.0"
 
 anyhow.workspace = true
 thiserror.workspace = true

crates/tower/Cargo.toml

@@ -16,7 +16,7 @@ http.workspace = true
 tracing.workspace = true
 tracing-opentelemetry.workspace = true
 tower.workspace = true
-tokio = { version = "1.35.1", features = ["time"] }
+tokio = { version = "1.36.0", features = ["time"] }
 opentelemetry.workspace = true
 opentelemetry-http.workspace = true
 opentelemetry-semantic-conventions.workspace = true

deny.toml

@@ -63,6 +63,7 @@ skip = [
     { name = "regex-syntax", version = "0.6.29" }, # tracing-subscriber[env-filter] -> matchers depends on the old version
     { name = "regex-automata", version = "0.1.10" }, # ^
     { name = "itertools", version = "0.10.5" }, # wasmtime & others depends on the old version
+    { name = "itertools", version = "0.11.0" },
     { name = "bitflags", version = "1.3.2" }, # axum depends on an old version
     { name = "hashbrown" }, # Too many versions :(
     # sqlx uses old versions of those: