Merge pull request #70 from dfinity/igornovg/axum08

Upgrade to axum 0.8

Author: blind-oracle

Cargo.lock

@@ -10,8 +10,8 @@ anyhow = "1.0.93"
 arc-swap = "1.7.1"
 async-channel = "2.3.1"
 async-trait = "0.1.83"
-axum = "0.7.9"
-axum-extra = "0.9.6"
+axum = { version = "0.8.1", features = ["macros"] }
+axum-extra = "0.10.0"
 backoff = { version = "0.4.0", features = ["tokio"] }
 base64 = "0.22.1"
 bytes = "1.9.0"
@@ -33,7 +33,7 @@ derive-new = "0.7.0"
 fqdn = { version = "0.4.1", features = ["serde"] }
 futures = "0.3.31"
 futures-util = "0.3.31"
-governor = "0.6.0" # must match tower-governor deps
+governor = "0.8.0" # must match tower-governor deps
 hickory-resolver = { version = "0.24.1", features = [
     "dns-over-https-rustls",
     "webpki-roots",
@@ -49,7 +49,7 @@ ic-agent = { version = "0.39.3", features = [
     "ring",
     "_internal_dynamic-routing",
 ] }
-ic-bn-lib = { git = "https://github.com/dfinity/ic-bn-lib", rev = "530f8e8ea577740213aff4b6dfa7a49cc32bae4a" }
+ic-bn-lib = { git = "https://github.com/dfinity/ic-bn-lib", rev = "686cff6ccd422716d48767a299ab33044a27d4ad" }
 ic-http-gateway = "0.2.0"
 ic-transport-types = "0.39.3"
 itertools = "0.13.0"
@@ -85,7 +85,8 @@ time = { version = "0.3.36", features = ["macros", "serde"] }
 tokio = { version = "1.42.0", features = ["full", "tracing"] }
 tokio-util = { version = "0.7.12", features = ["full"] }
 tower = { version = "0.5.1", features = ["limit"] }
-tower_governor = "0.4.3"
+# axum 0.8 support not yet released, use git
+tower_governor = { git = "https://github.com/benwis/tower-governor", rev = "bc9a6eacafcaec1e732886ceae8ae324bbd327df" }
 tower-http = { version = "0.6.1", features = ["cors", "compression-full"] }
 tower-service = "0.3.3"
 tracing = "0.1.40"

Cargo.toml

@@ -158,11 +158,12 @@ impl HttpMetrics {
 pub async fn middleware(
     State(state): State<Arc<HttpMetrics>>,
     Extension(conn_info): Extension<Arc<ConnInfo>>,
-    tls_info: Option<Extension<Arc<TlsInfo>>>,
     Extension(request_id): Extension<RequestId>,
     request: Request,
     next: Next,
 ) -> impl IntoResponse {
+    let tls_info = request.extensions().get::<Arc<TlsInfo>>().cloned();
+
     // Prepare to execute the request and count its body size
     let (parts, body) = request.into_parts();
     let (body, rx) = CountingBody::new(body);

src/metrics/mod.rs

@@ -2,7 +2,8 @@ use std::{sync::Arc, time::Instant};
 
 use anyhow::Error;
 use arc_swap::ArcSwap;
-use axum::{async_trait, extract::State, response::IntoResponse};
+use async_trait::async_trait;
+use axum::{extract::State, response::IntoResponse};
 use bytes::{BufMut, Bytes, BytesMut};
 use http::header::CONTENT_TYPE;
 use ic_bn_lib::tasks::Run;

src/metrics/runner.rs

@@ -31,16 +31,18 @@ pub struct HandlerState {
 }
 
 // Main HTTP->IC request handler
+//#[axum::debug_handler]
 pub async fn handler(
     State(state): State<Arc<HandlerState>>,
-    canister_id: Option<Extension<CanisterId>>,
     Extension(conn_info): Extension<Arc<ConnInfo>>,
     Extension(request_id): Extension<RequestId>,
     Extension(ctx): Extension<Arc<RequestCtx>>,
     request: Request,
 ) -> Result<Response, ErrorCause> {
-    let canister_id = canister_id
-        .map(|x| (x.0).0)
+    let canister_id = request
+        .extensions()
+        .get::<CanisterId>()
+        .map(|x| x.0)
         .ok_or(ErrorCause::CanisterIdNotFound)?;
 
     let (parts, body) = request.into_parts();

src/routing/ic/handler.rs

@@ -39,13 +39,14 @@ impl CanisterMatcherState {
 pub async fn middleware(
     State(state): State<CanisterMatcherState>,
     Extension(ctx): Extension<Arc<RequestCtx>>,
-    canister_id: Option<Extension<CanisterId>>,
     request: Request,
     next: Next,
 ) -> Result<Response, ErrorCause> {
+    let canister_id = request.extensions().get::<CanisterId>().copied();
+
     if let Some(v) = canister_id {
         // Do not run for custom domains
-        if !ctx.domain.custom && !state.0.check(v.0.into(), &ctx.authority) {
+        if !ctx.domain.custom && !state.0.check(v.0, &ctx.authority) {
             return Err(ErrorCause::DomainCanisterMismatch);
         }
     }

src/routing/middleware/canister_match.rs

@@ -3,7 +3,7 @@ use std::{path::PathBuf, sync::Arc};
 use anyhow::{Context, Error};
 use async_trait::async_trait;
 use axum::{
-    extract::{Extension, Request, State},
+    extract::{Request, State},
     middleware::Next,
     response::Response,
 };
@@ -81,14 +81,15 @@ impl Run for DenylistState {
 
 pub async fn middleware(
     State(state): State<DenylistState>,
-    country_code: Option<Extension<CountryCode>>,
-    canister_id: Option<Extension<CanisterId>>,
     request: Request,
     next: Next,
 ) -> Result<Response, ErrorCause> {
+    let country_code = request.extensions().get::<CountryCode>().cloned();
+    let canister_id = request.extensions().get::<CanisterId>().copied();
+
     // Check denylisting if configured
     if let Some(v) = canister_id {
-        if state.0.is_blocked(v.0.into(), country_code.map(|x| x.0)) {
+        if state.0.is_blocked(v.0, country_code) {
             return Err(ErrorCause::Denylisted);
         }
     }

src/routing/middleware/denylist.rs

@@ -9,13 +9,13 @@ use std::{str::FromStr, sync::Arc, time::Duration};
 
 use anyhow::{Context, Error};
 use axum::{
-    extract::{Host, MatchedPath, OriginalUri, Request},
+    extract::{MatchedPath, OriginalUri, Request},
     middleware::{from_fn, from_fn_with_state, FromFnLayer},
     response::{IntoResponse, Redirect},
     routing::{get, post},
     Extension, Router,
 };
-use axum_extra::middleware::option_layer;
+use axum_extra::{extract::Host, middleware::option_layer};
 use candid::Principal;
 use domain::{CustomDomainStorage, DomainResolver, ProvidesCustomDomains};
 use fqdn::FQDN;
@@ -102,14 +102,14 @@ impl From<Option<&MatchedPath>> for RequestType {
         };
 
         match path.as_str() {
-            "/api/v2/canister/:principal/query" => Self::Api(RequestTypeApi::Query),
-            "/api/v2/canister/:principal/call" => Self::Api(RequestTypeApi::Call),
-            "/api/v3/canister/:principal/call" => Self::Api(RequestTypeApi::SyncCall),
-            "/api/v2/canister/:principal/read_state" => Self::Api(RequestTypeApi::ReadState),
-            "/api/v2/subnet/:principal/read_state" => Self::Api(RequestTypeApi::ReadStateSubnet),
+            "/api/v2/canister/{principal}/query" => Self::Api(RequestTypeApi::Query),
+            "/api/v2/canister/{principal}/call" => Self::Api(RequestTypeApi::Call),
+            "/api/v3/canister/{principal}/call" => Self::Api(RequestTypeApi::SyncCall),
+            "/api/v2/canister/{principal}/read_state" => Self::Api(RequestTypeApi::ReadState),
+            "/api/v2/subnet/{principal}/read_state" => Self::Api(RequestTypeApi::ReadStateSubnet),
             "/api/v2/status" => Self::Api(RequestTypeApi::Status),
             "/health" => Self::Health,
-            "/registrations" | "/registrations/:id" => Self::Registrations,
+            "/registrations" | "/registrations/{id}" => Self::Registrations,
             _ => Self::Unknown,
         }
     }
@@ -244,15 +244,13 @@ pub fn setup_router(
     };
 
     // Metrics
-    let metrics_mw = from_fn_with_state(
-        Arc::new(metrics::HttpMetrics::new(
-            registry,
-            cli.log.log_requests,
-            clickhouse,
-            vector,
-        )),
-        metrics::middleware,
-    );
+    let metrics_state = Arc::new(metrics::HttpMetrics::new(
+        registry,
+        cli.log.log_requests,
+        clickhouse,
+        vector,
+    ));
+    let metrics_mw = from_fn_with_state(metrics_state, metrics::middleware);
 
     // Concurrency
     let concurrency_limit_mw = option_layer(
@@ -333,19 +331,19 @@ pub fn setup_router(
     // IC API proxy routers
     let router_api_v2 = Router::new()
         .route(
-            "/canister/:principal/query",
+            "/canister/{principal}/query",
             post(proxy::api_proxy).layer(cors_post.clone()),
         )
         .route(
-            "/canister/:principal/call",
+            "/canister/{principal}/call",
             post(proxy::api_proxy).layer(cors_post.clone()),
         )
         .route(
-            "/canister/:principal/read_state",
+            "/canister/{principal}/read_state",
             post(proxy::api_proxy).layer(cors_post.clone()),
         )
         .route(
-            "/subnet/:principal/read_state",
+            "/subnet/{principal}/read_state",
             post(proxy::api_proxy).layer(cors_post.clone()),
         )
         .route("/status", get(proxy::api_proxy).layer(cors_get.clone()))
@@ -354,7 +352,7 @@ pub fn setup_router(
 
     let router_api_v3 = Router::new()
         .route(
-            "/canister/:principal/call",
+            "/canister/{principal}/call",
             post(proxy::api_proxy).layer(cors_post.clone()),
         )
         .fallback(|| async { (StatusCode::NOT_FOUND, "") })
@@ -421,7 +419,7 @@ pub fn setup_router(
 
         let router = Router::new()
             .route(
-                "/registrations/:id",
+                "/registrations/{id}",
                 get(proxy::issuer_proxy)
                     .put(proxy::issuer_proxy)
                     .delete(proxy::issuer_proxy)