migrate source-handlers to axum

Author: syphar

src/web/file.rs

@@ -1,9 +1,22 @@
 //! Database based file handler
 
 use super::cache::CachePolicy;
-use crate::storage::{Blob, Storage};
-use crate::{error::Result, Config};
+use crate::{
+    error::Result,
+    storage::{Blob, Storage},
+    utils::report_error,
+    Config,
+};
+use anyhow::anyhow;
+use axum::{
+    http::{
+        header::{CONTENT_TYPE, LAST_MODIFIED},
+        StatusCode,
+    },
+    response::{IntoResponse, Response as AxumResponse},
+};
 use iron::{status, Response};
+use mime::Mime;
 
 #[derive(Debug)]
 pub(crate) struct File(pub(crate) Blob);
@@ -44,6 +57,28 @@ impl File {
     }
 }
 
+impl IntoResponse for File {
+    fn into_response(self) -> AxumResponse {
+        let content_type: Mime = self.0.mime.parse::<Mime>().unwrap_or_else(|e| {
+            report_error(&anyhow!(e).context("could not parse mime from storage object"));
+            mime::APPLICATION_OCTET_STREAM
+        });
+
+        (
+            StatusCode::OK,
+            [
+                (CONTENT_TYPE, content_type.as_ref()),
+                (
+                    LAST_MODIFIED,
+                    &self.0.date_updated.format("%a, %d %b %Y %T %Z").to_string(),
+                ),
+            ],
+            self.0.content,
+        )
+            .into_response()
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;

src/web/page/web_page.rs

@@ -67,6 +67,7 @@ macro_rules! impl_axum_webpage {
         $page:ty = $template:literal
         $(, status = $status:expr)?
         $(, content_type = $content_type:expr)?
+        $(, canonical_url = $canonical_url:expr)?
         $(, cache_policy  = $cache_policy:expr)?
         $(, cpu_intensive_rendering = $cpu_intensive_rendering:expr)?
         $(,)?
@@ -75,6 +76,7 @@ macro_rules! impl_axum_webpage {
             $page = |_| ::std::borrow::Cow::Borrowed($template)
             $(, status = $status)?
             $(, content_type = $content_type)?
+            $(, canonical_url = $canonical_url)?
             $(, cache_policy = $cache_policy)?
             $(, cpu_intensive_rendering = $cpu_intensive_rendering )?
          );
@@ -84,6 +86,7 @@ macro_rules! impl_axum_webpage {
         $page:ty = $template:expr
         $(, status = $status:expr)?
         $(, content_type = $content_type:expr)?
+        $(, canonical_url = $canonical_url:expr)?
         $(, cache_policy  = $cache_policy:expr)?
         $(, cpu_intensive_rendering = $cpu_intensive_rendering:expr)?
         $(,)?
@@ -124,6 +127,19 @@ macro_rules! impl_axum_webpage {
                     });
                 )?
 
+                $(
+                    let canonical_url = {
+                        let canonical_url: fn(&Self) -> Option<String> = $canonical_url;
+                        (canonical_url)(&self)
+                    };
+                    if let Some(canonical_url) = canonical_url {
+                        response.headers_mut().insert(
+                            axum::http::header::LINK,
+                            format!(r#"<{}>; rel="canonical"#, canonical_url).parse().unwrap(),
+                        );
+                    }
+                )?
+
 
                 response.extensions_mut().insert($crate::web::page::web_page::DelayedTemplateRender {
                     context: ::tera::Context::from_serialize(&self)

src/web/routes.rs

@@ -146,22 +146,30 @@ pub(super) fn build_axum_routes() -> AxumRouter {
             "/releases/queue",
             get_internal(super::releases::build_queue_handler),
         )
-        .route(
+        .route_with_tsr(
             "/crate/:name/:version/builds",
             get_internal(super::builds::build_list_handler),
         )
         .route(
             "/crate/:name/:version/builds.json",
             get_static(super::builds::build_list_json_handler),
         )
-        .route(
+        .route_with_tsr(
             "/crate/:name/:version/builds/:id",
             get_internal(super::build_details::build_details_handler),
         )
-        .route(
+        .route_with_tsr(
             "/crate/:name/:version/features",
             get_internal(super::features::build_features_handler),
         )
+        .route_with_tsr(
+            "/crate/:name/:version/source/",
+            get_internal(super::source::source_browser_handler),
+        )
+        .route(
+            "/crate/:name/:version/source/*path",
+            get_internal(super::source::source_browser_handler),
+        )
 }
 
 // REFACTOR: Break this into smaller initialization functions
@@ -195,18 +203,6 @@ pub(super) fn build_routes() -> Routes {
         "/crate/:name/:version/download",
         super::rustdoc::download_handler,
     );
-    routes.internal_page(
-        "/crate/:name/:version/source",
-        SimpleRedirect::new(|url| url.set_path(&format!("{}/", url.path()))),
-    );
-    routes.internal_page(
-        "/crate/:name/:version/source/",
-        super::source::source_browser_handler,
-    );
-    routes.internal_page(
-        "/crate/:name/:version/source/*",
-        super::source::source_browser_handler,
-    );
     routes.internal_page(
         "/crate/:name/:version/target-redirect/*",
         super::rustdoc::target_redirect_handler,