Merge torrust#1175: Udpate dependencies

76329d7 chore: fix format (Jose Celano)
ce12fe7 test: fix test should_fail_getting_torrents_when_the_offset_query_parameter_cannot_be_parsed (Jose Celano)
cb40687 test: should_fail_getting_torrents_when_the_limit_query_parameter_cannot_be_parsed (Jose Celano)
f4a7399 test: fix should_fail_generating_a_new_auth_key_when_the_key_duration_is_invalid (Jose Celano)
bfab30f fix: update axum routes captures (Jose Celano)
366ef1c fix: lifetime parameters on function `from_request_parts` do not match the trait (Jose Celano)
3337948 chore(deps): udpate dependencies (Jose Celano)

Pull request description:

  ```output
  cargo update
      Updating crates.io index
       Locking 26 packages to latest compatible versions
      Removing async-trait v0.1.83
      Updating axum v0.7.9 -> v0.8.1
      Updating axum-client-ip v0.6.1 -> v0.7.0
      Updating axum-core v0.4.5 -> v0.5.0
      Updating axum-extra v0.9.6 -> v0.10.0
      Updating axum-macros v0.4.2 -> v0.5.0
      Updating btoi v0.4.3 -> v0.4.4
      Updating cc v1.2.6 -> v1.2.7
      Updating glob v0.3.1 -> v0.3.2
      Updating matchit v0.7.3 -> v0.8.4 (available: v0.8.6)
      Removing multer v3.1.0
      Updating phf v0.11.2 -> v0.11.3
      Updating phf_codegen v0.11.2 -> v0.11.3
      Updating phf_generator v0.11.2 -> v0.11.3
      Updating phf_shared v0.11.2 -> v0.11.3
      Updating pin-project v1.1.7 -> v1.1.8
      Updating pin-project-internal v1.1.7 -> v1.1.8
      Updating pin-project-lite v0.2.15 -> v0.2.16
      Updating reqwest v0.12.10 -> v0.12.12
      Updating rstest v0.23.0 -> v0.24.0
      Updating rstest_macros v0.23.0 -> v0.24.0
      Updating serde v1.0.216 -> v1.0.217
      Updating serde_derive v1.0.216 -> v1.0.217
      Updating serde_json v1.0.134 -> v1.0.135
      Updating siphasher v0.3.11 -> v1.0.1
      Updating syn v2.0.92 -> v2.0.95
      Updating tempfile v3.14.0 -> v3.15.0
      Updating winnow v0.6.20 -> v0.6.22
  ```

  Some fixes were needed after updating Axum. For example, The `:` and `*` are now prohibited in routes to define segment variables:

  ```
  let app = Router::<()>::new()
      .without_v07_checks()
      .route("/:colon", get(|| async {}))
      .route("/*asterisk", get(|| async {}));
  ```

  You have to use `{variable}`:

  ```
  let app = Router::<()>::new()
      .without_v07_checks()
      .route("/{apture}", get(|| async {}));
  ```

  https://docs.rs/axum/latest/axum/routing/struct.Router.html#method.without_v07_checks

ACKs for top commit:
  josecelano:
    ACK 76329d7

Tree-SHA512: 8885be12db9c71d35ebd09926285ca7ae0e4f20580e7652c7af430169d34ebee28ab9808c909664d8ed65be4294300ad4991c848868c9a9ae57c2556c985add0

Author: josecelano

Cargo.lock

@@ -27,7 +27,7 @@ pub fn add(prefix: &str, router: Router, tracker: Arc<Tracker>) -> Router {
             //
             // The POST /key/:seconds_valid has been deprecated and it will removed in the future.
             // Use POST /keys
-            &format!("{prefix}/key/:seconds_valid_or_key"),
+            &format!("{prefix}/key/{{seconds_valid_or_key}}"),
             post(generate_auth_key_handler)
                 .with_state(tracker.clone())
                 .delete(delete_auth_key_handler)

src/servers/apis/v1/context/auth_key/routes.rs

@@ -17,7 +17,7 @@ pub fn add(prefix: &str, router: Router, tracker: Arc<Tracker>) -> Router {
     // Torrents
     router
         .route(
-            &format!("{prefix}/torrent/:info_hash"),
+            &format!("{prefix}/torrent/{{info_hash}}"),
             get(get_torrent_handler).with_state(tracker.clone()),
         )
         .route(&format!("{prefix}/torrents"), get(get_torrents_handler).with_state(tracker))

src/servers/apis/v1/context/torrent/routes.rs

@@ -20,11 +20,11 @@ pub fn add(prefix: &str, router: Router, tracker: Arc<Tracker>) -> Router {
     router
         // Whitelisted torrents
         .route(
-            &format!("{prefix}/:info_hash"),
+            &format!("{prefix}/{{info_hash}}"),
             post(add_torrent_to_whitelist_handler).with_state(tracker.clone()),
         )
         .route(
-            &format!("{prefix}/:info_hash"),
+            &format!("{prefix}/{{info_hash}}"),
             delete(remove_torrent_from_whitelist_handler).with_state(tracker.clone()),
         )
         // Whitelist commands

src/servers/apis/v1/context/whitelist/routes.rs

@@ -27,12 +27,12 @@
 //! ```text
 //! d14:failure reason240:Bad request. Cannot parse query params for announce request: invalid param value invalid for info_hash in not enough bytes for infohash: got 7 bytes, expected 20 src/shared/bit_torrent/info_hash.rs:240:27, src/servers/http/v1/requests/announce.rs:182:42e
 //! ```
+use std::future::Future;
 use std::panic::Location;
 
 use axum::extract::FromRequestParts;
 use axum::http::request::Parts;
 use axum::response::{IntoResponse, Response};
-use futures::future::BoxFuture;
 use futures::FutureExt;
 
 use crate::servers::http::v1::query::Query;
@@ -49,16 +49,7 @@ where
 {
     type Rejection = Response;
 
-    #[must_use]
-    fn from_request_parts<'life0, 'life1, 'async_trait>(
-        parts: &'life0 mut Parts,
-        _state: &'life1 S,
-    ) -> BoxFuture<'async_trait, Result<Self, Self::Rejection>>
-    where
-        'life0: 'async_trait,
-        'life1: 'async_trait,
-        Self: 'async_trait,
-    {
+    fn from_request_parts(parts: &mut Parts, _state: &S) -> impl Future<Output = Result<Self, Self::Rejection>> + Send {
         async {
             match extract_announce_from(parts.uri.query()) {
                 Ok(announce_request) => Ok(ExtractRequest(announce_request)),

src/servers/http/v1/extractors/announce_request.rs

@@ -42,14 +42,13 @@
 //! > Neither [The `BitTorrent` Protocol Specification](https://www.bittorrent.org/beps/bep_0003.html)
 //! > nor [The Private Torrents](https://www.bittorrent.org/beps/bep_0027.html)
 //! > specifications specify any HTTP status code for authentication errors.
+use std::future::Future;
 use std::panic::Location;
 
 use axum::extract::rejection::PathRejection;
 use axum::extract::{FromRequestParts, Path};
 use axum::http::request::Parts;
 use axum::response::{IntoResponse, Response};
-use futures::future::BoxFuture;
-use futures::FutureExt;
 use serde::Deserialize;
 
 use crate::core::auth::Key;
@@ -71,21 +70,13 @@ impl KeyParam {
 
 impl<S> FromRequestParts<S> for Extract
 where
-    S: Send + Sync,
+    S: Send + Sync + 'static,
 {
     type Rejection = Response;
 
-    #[must_use]
-    fn from_request_parts<'life0, 'life1, 'async_trait>(
-        parts: &'life0 mut Parts,
-        state: &'life1 S,
-    ) -> BoxFuture<'async_trait, Result<Self, Self::Rejection>>
-    where
-        'life0: 'async_trait,
-        'life1: 'async_trait,
-        Self: 'async_trait,
-    {
-        async {
+    #[allow(clippy::manual_async_fn)]
+    fn from_request_parts(parts: &mut Parts, state: &S) -> impl Future<Output = Result<Self, Self::Rejection>> + Send {
+        async move {
             // Extract `key` from URL path with Axum `Path` extractor
             let maybe_path_with_key = Path::<KeyParam>::from_request_parts(parts, state).await;
 
@@ -94,7 +85,6 @@ where
                 Err(error) => Err(error.into_response()),
             }
         }
-        .boxed()
     }
 }
 

src/servers/http/v1/extractors/authentication_key.rs

@@ -35,14 +35,13 @@
 //! `right_most_x_forwarded_for` = 126.0.0.2
 //! `connection_info_ip`         = 126.0.0.3
 //! ```
+use std::future::Future;
 use std::net::SocketAddr;
 
 use axum::extract::{ConnectInfo, FromRequestParts};
 use axum::http::request::Parts;
 use axum::response::Response;
 use axum_client_ip::RightmostXForwardedFor;
-use futures::future::BoxFuture;
-use futures::FutureExt;
 
 use crate::servers::http::v1::services::peer_ip_resolver::ClientIpSources;
 
@@ -56,17 +55,9 @@ where
 {
     type Rejection = Response;
 
-    #[must_use]
-    fn from_request_parts<'life0, 'life1, 'async_trait>(
-        parts: &'life0 mut Parts,
-        state: &'life1 S,
-    ) -> BoxFuture<'async_trait, Result<Self, Self::Rejection>>
-    where
-        'life0: 'async_trait,
-        'life1: 'async_trait,
-        Self: 'async_trait,
-    {
-        async {
+    #[allow(clippy::manual_async_fn)]
+    fn from_request_parts(parts: &mut Parts, state: &S) -> impl Future<Output = Result<Self, Self::Rejection>> + Send {
+        async move {
             let right_most_x_forwarded_for = match RightmostXForwardedFor::from_request_parts(parts, state).await {
                 Ok(right_most_x_forwarded_for) => Some(right_most_x_forwarded_for.0),
                 Err(_) => None,
@@ -82,6 +73,5 @@ where
                 connection_info_ip,
             }))
         }
-        .boxed()
     }
 }

src/servers/http/v1/extractors/client_ip_sources.rs

@@ -27,12 +27,12 @@
 //! ```text
 //! d14:failure reason235:Bad request. Cannot parse query params for scrape request: invalid param value invalid for info_hash in not enough bytes for infohash: got 7 bytes, expected 20 src/shared/bit_torrent/info_hash.rs:240:27, src/servers/http/v1/requests/scrape.rs:66:46e
 //! ```
+use std::future::Future;
 use std::panic::Location;
 
 use axum::extract::FromRequestParts;
 use axum::http::request::Parts;
 use axum::response::{IntoResponse, Response};
-use futures::future::BoxFuture;
 use futures::FutureExt;
 
 use crate::servers::http::v1::query::Query;
@@ -49,16 +49,7 @@ where
 {
     type Rejection = Response;
 
-    #[must_use]
-    fn from_request_parts<'life0, 'life1, 'async_trait>(
-        parts: &'life0 mut Parts,
-        _state: &'life1 S,
-    ) -> BoxFuture<'async_trait, Result<Self, Self::Rejection>>
-    where
-        'life0: 'async_trait,
-        'life1: 'async_trait,
-        Self: 'async_trait,
-    {
+    fn from_request_parts(parts: &mut Parts, _state: &S) -> impl Future<Output = Result<Self, Self::Rejection>> + Send {
         async {
             match extract_scrape_from(parts.uri.query()) {
                 Ok(scrape_request) => Ok(ExtractRequest(scrape_request)),

src/servers/http/v1/extractors/scrape_request.rs

@@ -38,10 +38,10 @@ pub fn router(tracker: Arc<Tracker>, server_socket_addr: SocketAddr) -> Router {
         .route("/health_check", get(health_check::handler))
         // Announce request
         .route("/announce", get(announce::handle_without_key).with_state(tracker.clone()))
-        .route("/announce/:key", get(announce::handle_with_key).with_state(tracker.clone()))
+        .route("/announce/{key}", get(announce::handle_with_key).with_state(tracker.clone()))
         // Scrape request
         .route("/scrape", get(scrape::handle_without_key).with_state(tracker.clone()))
-        .route("/scrape/:key", get(scrape::handle_with_key).with_state(tracker))
+        .route("/scrape/{key}", get(scrape::handle_with_key).with_state(tracker))
         // Add extension to get the client IP from the connection info
         .layer(SecureClientIpSource::ConnectInfo.into_extension())
         .layer(CompressionLayer::new())

src/servers/http/v1/routes.rs

@@ -117,7 +117,7 @@ pub async fn assert_unprocessable_auth_key_duration_param(response: Response, _i
 pub async fn assert_invalid_key_duration_param(response: Response, invalid_key_duration: &str) {
     assert_bad_request(
         response,
-        &format!("Invalid URL: Cannot parse `\"{invalid_key_duration}\"` to a `u64`"),
+        &format!("Invalid URL: Cannot parse `{invalid_key_duration}` to a `u64`"),
     )
     .await;
 }

tests/servers/api/v1/asserts.rs

@@ -189,7 +189,11 @@ async fn should_fail_getting_torrents_when_the_offset_query_parameter_cannot_be_
             )
             .await;
 
-        assert_bad_request(response, "Failed to deserialize query string: invalid digit found in string").await;
+        assert_bad_request(
+            response,
+            "Failed to deserialize query string: offset: invalid digit found in string",
+        )
+        .await;
     }
 
     env.stop().await;
@@ -213,7 +217,11 @@ async fn should_fail_getting_torrents_when_the_limit_query_parameter_cannot_be_p
             )
             .await;
 
-        assert_bad_request(response, "Failed to deserialize query string: invalid digit found in string").await;
+        assert_bad_request(
+            response,
+            "Failed to deserialize query string: limit: invalid digit found in string",
+        )
+        .await;
     }
 
     env.stop().await;