check passes

Author: syphar

Cargo.lock

@@ -78,8 +78,9 @@ serde_json = "1.0"
 serde_with = "3.4.0"
 
 # axum dependencies
-axum = { version = "0.7.3", features = ["macros"] }
-axum-extra = { version = "0.9.1", features = ["typed-header"] }
+async-trait = "0.1.83"
+axum = { version = "0.8.1", features = ["macros"] }
+axum-extra = { version = "0.10.0", features = ["typed-header"] }
 tower = "0.5.1"
 tower-http = { version = "0.6.0", features = ["fs", "trace", "timeout", "catch-panic"] }
 mime = "0.3.16"

Cargo.toml

@@ -6,7 +6,7 @@ use std::str::FromStr;
 use std::sync::Arc;
 
 use anyhow::{anyhow, Context as _, Error, Result};
-use axum::async_trait;
+use async_trait::async_trait;
 use clap::{Parser, Subcommand, ValueEnum};
 use docs_rs::cdn::CdnBackend;
 use docs_rs::db::{self, add_path_into_database, CrateId, Overrides, Pool};

src/bin/cratesfyi.rs

@@ -6,7 +6,7 @@ use crate::{
     AsyncBuildQueue, AsyncStorage, BuildQueue, Config, Index, InstanceMetrics, RegistryApi,
     ServiceMetrics, Storage,
 };
-use axum::async_trait;
+use async_trait::async_trait;
 use std::sync::Arc;
 use tokio::runtime::Runtime;
 

src/context.rs

@@ -1,6 +1,6 @@
 use crate::error::Result;
 use crate::Config;
-use axum::async_trait;
+use async_trait::async_trait;
 use chrono::{DateTime, Utc};
 use reqwest::{
     header::{HeaderMap, HeaderValue, ACCEPT, AUTHORIZATION, USER_AGENT},

src/repositories/github.rs

@@ -1,5 +1,5 @@
 use crate::error::Result;
-use axum::async_trait;
+use async_trait::async_trait;
 use chrono::{DateTime, Utc};
 use reqwest::{
     header::{HeaderMap, HeaderValue, ACCEPT, AUTHORIZATION, USER_AGENT},

src/repositories/gitlab.rs

@@ -2,7 +2,7 @@ use crate::error::Result;
 use crate::repositories::{GitHub, GitLab, RateLimitReached};
 use crate::utils::MetadataPackage;
 use crate::{db::Pool, Config};
-use axum::async_trait;
+use async_trait::async_trait;
 use chrono::{DateTime, Utc};
 use futures_util::stream::TryStreamExt;
 use once_cell::sync::Lazy;

src/repositories/updater.rs

@@ -1,8 +1,7 @@
 use crate::db::{AsyncPoolClient, Pool};
 use anyhow::Context as _;
 use axum::{
-    async_trait,
-    extract::{Extension, FromRequestParts},
+    extract::{Extension, FromRequestParts, OptionalFromRequestParts},
     http::request::Parts,
     RequestPartsExt,
 };
@@ -20,7 +19,6 @@ use super::error::AxumNope;
 #[derive(Debug)]
 pub(crate) struct DbConnection(AsyncPoolClient);
 
-#[async_trait]
 impl<S> FromRequestParts<S> for DbConnection
 where
     S: Send + Sync,
@@ -55,11 +53,33 @@ impl DerefMut for DbConnection {
 /// as error response instead of a plain text "bad request"
 #[allow(clippy::disallowed_types)]
 mod path_impl {
+    use serde::de::DeserializeOwned;
+
     use super::*;
 
     #[derive(FromRequestParts)]
     #[from_request(via(axum::extract::Path), rejection(AxumNope))]
     pub(crate) struct Path<T>(pub T);
+
+    impl<T, S> OptionalFromRequestParts<S> for Path<T>
+    where
+        T: DeserializeOwned + Send + 'static,
+        S: Send + Sync,
+    {
+        type Rejection = AxumNope;
+
+        async fn from_request_parts(
+            parts: &mut Parts,
+            _state: &S,
+        ) -> Result<Option<Self>, Self::Rejection> {
+            <axum::extract::Path<T> as OptionalFromRequestParts<S>>::from_request_parts(
+                parts, _state,
+            )
+            .await
+            .map(|path| path.map(|obj| Path(obj.0)))
+            .map_err(|err| AxumNope::BadRequest(err.into()))
+        }
+    }
 }
 
 pub(crate) use path_impl::Path;

src/web/extractors.rs

@@ -413,7 +413,9 @@ async fn apply_middleware(
     Ok(router.layer(
         ServiceBuilder::new()
             .layer(TraceLayer::new_for_http())
-            .layer(sentry_tower::NewSentryLayer::new_from_top())
+            // FIXME: send / sync error?
+            // .layer(sentry_tower::NewSentryLayer::new_from_top())
+            // .layer(sentry_tower::SentryLayer::new_from_top())
             .layer(sentry_tower::SentryHttpLayer::with_transaction())
             .layer(middleware::from_fn(
                 set_sentry_transaction_name_from_axum_route,

src/web/mod.rs

@@ -154,6 +154,7 @@ about_page!(AboutPageMetadata, "core/about/metadata.html");
 about_page!(AboutPageRedirection, "core/about/redirections.html");
 about_page!(AboutPageDownload, "core/about/download.html");
 
+#[axum::debug_handler]
 pub(crate) async fn about_handler(subpage: Option<Path<String>>) -> AxumResult<impl IntoResponse> {
     let subpage = match subpage {
         Some(subpage) => subpage.0,