fix: Breaking changes in Axum

- Swap to new `matchit` syntax for Router
- Swap to `axum_extra::extract::Host`
- Use `Result<Host, HostRejection>` instead of (no longer working
   tokio-rs/axum#3170) `Option<Host>` to
   swallow missing Host header

Author: AllexVeldman

Cargo.lock

@@ -60,6 +60,7 @@ opentelemetry = { version = "0.27.1", default-features = false, features = ["tra
 opentelemetry_sdk = { version = "0.27.1", default-features = false, features = ["trace"], optional = true }
 tracing-core = {version = "0.1.32", optional = true }
 prost = {version = "0.13.4", optional = true }
+axum-extra = { version = "0.10.0", default-features = false }
 
 
 

Cargo.toml

@@ -7,6 +7,7 @@ use axum::{
     routing::{get, post},
     Json, Router,
 };
+use axum_extra::extract::{rejection::HostRejection, Host};
 use http::{header::CACHE_CONTROL, HeaderValue, StatusCode};
 use serde::{ser::SerializeMap, Serialize, Serializer};
 use tracing::{info_span, Instrument};
@@ -60,17 +61,17 @@ pub fn router(subpath: Option<String>, body_limit: usize) -> Router {
             get(|| async { Redirect::to(env!("CARGO_PKG_HOMEPAGE")) })
                 .layer(axum::middleware::from_fn(cache_control_middleware)),
         )
-        .route("/:registry/:namespace/:package/", get(list_package))
+        .route("/{registry}/{namespace}/{package}/", get(list_package))
         .route(
-            "/:registry/:namespace/:package/json",
+            "/{registry}/{namespace}/{package}/json",
             get(list_package_json),
         )
         .route(
-            "/:registry/:namespace/:package/:filename",
+            "/{registry}/{namespace}/{package}/{filename}",
             get(download_package).delete(delete_package_version),
         )
         .route(
-            "/:registry/:namespace/",
+            "/{registry}/{namespace}/",
             post(publish_package).layer(DefaultBodyLimit::max(body_limit)),
         );
     let router = match subpath {
@@ -104,7 +105,7 @@ async fn cache_control_middleware(
 /// Log incoming requests
 async fn accesslog_middleware(
     method: axum::http::Method,
-    host: Option<axum::extract::Host>,
+    host: Result<Host, HostRejection>,
     uri: axum::http::Uri,
     headers: axum::http::HeaderMap,
     request: axum::extract::Request,
@@ -116,8 +117,9 @@ async fn accesslog_middleware(
     let user_agent = headers
         .get("user-agent")
         .map(|ua| ua.to_str().unwrap_or(""));
+
     tracing::info!(
-        host = host.map(|value| value.0),
+        host = host.map(|value| value.0).unwrap_or("".to_string()),
         "type" = "request",
         status,
         method = method.to_string(),