diff --git a/Cargo.lock b/Cargo.lock index 198f37003..5be9a1a2d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1140,9 +1140,8 @@ checksum = "2eac901828f88a5241ee0600950ab981148a18f2f756900ffba1b125ca6a3ef9" dependencies = [ "cookie", "document-features", - "idna 1.0.2", + "idna", "log", - "publicsuffix", "serde", "serde_derive", "serde_json", @@ -2707,34 +2706,23 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" [[package]] name = "idna" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" -dependencies = [ - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "idna" -version = "0.5.0" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" +checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e" dependencies = [ - "unicode-bidi", - "unicode-normalization", + "idna_adapter", + "smallvec", + "utf8_iter", ] [[package]] -name = "idna" -version = "1.0.2" +name = "idna_adapter" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd69211b9b519e98303c015e21a007e293db403b6c85b9b124e133d25e242cdd" +checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71" dependencies = [ "icu_normalizer", "icu_properties", - "smallvec", - "utf8_iter", ] [[package]] @@ -2991,7 +2979,7 @@ dependencies = [ "futures-util", "hostname", "httpdate", - "idna 1.0.2", + "idna", "mime", "nom", "percent-encoding", @@ -4746,16 +4734,6 @@ dependencies = [ "cc", ] -[[package]] -name = "publicsuffix" -version = "2.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96a8c1bda5ae1af7f99a2962e49df150414a43d62404644d98dd5c3a93d07457" -dependencies = [ - "idna 0.3.0", - "psl-types", -] - [[package]] name = "pulley-interpreter" version = "26.0.1" @@ -6690,12 +6668,12 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "url" -version = "2.5.2" +version = "2.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" +checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60" dependencies = [ "form_urlencoded", - "idna 0.5.0", + "idna", "percent-encoding", "serde", ] diff --git a/Cargo.toml b/Cargo.toml index 312c3d4b7..4079ecb61 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -350,7 +350,7 @@ default-features = false # URL manipulation [workspace.dependencies.url] -version = "2.5.2" +version = "2.5.4" features = ["serde"] # ULID support diff --git a/crates/handlers/Cargo.toml b/crates/handlers/Cargo.toml index 60ec5d7d4..40d4c53dd 100644 --- a/crates/handlers/Cargo.toml +++ b/crates/handlers/Cargo.toml @@ -109,6 +109,6 @@ zxcvbn = "3.1.0" [dev-dependencies] insta.workspace = true tracing-subscriber.workspace = true -cookie_store = "0.21.1" +cookie_store = { version = "0.21.1", default-features = false, features = ["serde_json"] } sqlx.workspace = true wiremock.workspace = true diff --git a/deny.toml b/deny.toml index 0adab1ff9..66da68bb1 100644 --- a/deny.toml +++ b/deny.toml @@ -63,8 +63,6 @@ skip = [ # a few dependencies depend on the 1.x version of thiserror { name = "thiserror", version = "1.0.69" }, { name = "thiserror-impl", version = "1.0.69" }, - # url and cookie-store depend on this old version of idna - { name = "idna", version = "0.5.0" }, # axum-macros, sqlx-macros and sea-query-attr use an old version { name = "heck", version = "0.4.1" }, # wasmtime -> cranelift is depending on this old version