diff --git a/Cargo.lock b/Cargo.lock index 2e9e7de..b97556a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -267,6 +267,12 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +[[package]] +name = "cfg_aliases" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" + [[package]] name = "clap" version = "4.5.8" @@ -886,6 +892,18 @@ dependencies = [ "libc", ] +[[package]] +name = "nix" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" +dependencies = [ + "bitflags", + "cfg-if", + "cfg_aliases", + "libc", +] + [[package]] name = "nu-ansi-term" version = "0.46.0" @@ -1031,7 +1049,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec6f0033707ce6eb76240e39a592e7eac2f702768636cb03969293227ca8e642" dependencies = [ "async-trait", - "base64 0.21.7", "bytes", "futures-util", "headers", @@ -1042,18 +1059,55 @@ dependencies = [ "hyper-util", "mime", "mime_guess", - "nix", + "nix 0.27.1", "parking_lot", "percent-encoding", "pin-project-lite", - "poem-derive", + "poem-derive 2.0.1", "regex", "rfc7239", "serde", "serde_json", "serde_urlencoded", "smallvec", - "sync_wrapper", + "sync_wrapper 0.1.2", + "thiserror", + "tokio", + "tokio-stream", + "tokio-util", + "tracing", + "wildmatch", +] + +[[package]] +name = "poem" +version = "3.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e88b6912ed1e8833d7c22c9c986c517f4518d7d37e3c04566d917c789aaea591" +dependencies = [ + "base64 0.22.1", + "bytes", + "futures-util", + "headers", + "http", + "http-body-util", + "httpdate", + "hyper", + "hyper-util", + "mime", + "mime_guess", + "nix 0.28.0", + "parking_lot", + "percent-encoding", + "pin-project-lite", + "poem-derive 3.0.0", + "regex", + "rfc7239", + "serde", + "serde_json", + "serde_urlencoded", + "smallvec", + "sync_wrapper 1.0.1", "thiserror", "tokio", "tokio-stream", @@ -1075,6 +1129,18 @@ dependencies = [ "syn", ] +[[package]] +name = "poem-derive" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2b961d58a6c53380c20236394381d9292fda03577f902b158f1638932964dcf" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "powerfmt" version = "0.2.0" @@ -1454,6 +1520,15 @@ dependencies = [ "futures-core", ] +[[package]] +name = "sync_wrapper" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" +dependencies = [ + "futures-core", +] + [[package]] name = "terminal_size" version = "0.3.0" @@ -2165,7 +2240,7 @@ dependencies = [ "jsonwebtoken", "log", "miette 7.2.0", - "poem", + "poem 3.0.1", "serde", "serde_json", "serde_yaml", @@ -2234,7 +2309,7 @@ dependencies = [ "hostname", "log", "miette 7.2.0", - "poem", + "poem 2.0.1", "serde", "serde_json", "tokio", diff --git a/worterbuch/Cargo.toml b/worterbuch/Cargo.toml index 6ef227b..bebb921 100644 --- a/worterbuch/Cargo.toml +++ b/worterbuch/Cargo.toml @@ -31,7 +31,7 @@ sha2 = "0.10.6" hex = "0.4.3" futures = { version = "0.3.27" } urlencoding = "2.1.2" -poem = { version = "2.0.0", features = ["websocket", "static-files", "sse"] } +poem = { version = "3.0.1", features = ["websocket", "static-files", "sse"] } tracing-subscriber = "0.3.16" serde_yaml = "0.9.22" hashlink = "0.9.0" diff --git a/worterbuch/src/server/poem/auth.rs b/worterbuch/src/server/poem/auth.rs index e890937..3aea2ed 100644 --- a/worterbuch/src/server/poem/auth.rs +++ b/worterbuch/src/server/poem/auth.rs @@ -60,7 +60,6 @@ impl BearerAuthEndpoint { } } -#[poem::async_trait] impl Endpoint for BearerAuthEndpoint { type Output = E::Output;