feat: finish axum migration

Signed-off-by: Henry Gressmann <mail@henrygressmann.de>

Author: explodingcamera

Cargo.lock

@@ -17,7 +17,7 @@ path="src/main.rs"
 [dependencies]
 # async/concurrency
 arc-swap="1.8"
-tokio={version="1.48", default-features=false, features=["macros", "rt-multi-thread", "signal"]}
+tokio={version="1.49", default-features=false, features=["macros", "rt-multi-thread", "signal"]}
 tokio-util={version="0.7", features=["io"]}
 futures-lite={version="2.6", default-features=false, features=["alloc"]}
 quick_cache={version="0.6", features=["ahash"]}

Cargo.toml

@@ -3,7 +3,7 @@ use crate::utils::hash::{hash_ip, visitor_id};
 use crate::utils::referrer::{Referrer, process_referer};
 use crate::utils::useragent;
 use crate::web::RouterState;
-use crate::web::webext::{ApiResult, AxumErrExt, empty_response};
+use crate::web::webext::{ApiResult, AxumErrExt, ClientIp, empty_response};
 
 use aide::axum::routing::post;
 use aide::axum::{ApiRouter, IntoApiResponse};
@@ -46,16 +46,14 @@ static EXISTING_ENTITIES: LazyLock<quick_cache::sync::Cache<String, ()>> =
 
 async fn event_handler(
     state: State<RouterState>,
-    // RealIp(ip): RealIp, TODO
+    ClientIp(ip): ClientIp,
     TypedHeader(user_agent): TypedHeader<headers::UserAgent>,
     Json(event): Json<EventRequest>,
 ) -> ApiResult<impl IntoApiResponse> {
     let url = Uri::from_str(&event.url).context("invalid url").http_err("invalid url", StatusCode::BAD_REQUEST)?;
     let app = state.app.clone();
     let events = state.events.clone();
 
-    let ip = None; // TODO: RealIp
-
     // run the event processing in the background
     tokio::task::spawn_blocking(move || {
         if let Err(e) = process_event(app, events, event, url, ip, user_agent) {

data/licenses-cargo.json

@@ -3,13 +3,15 @@
 use std::convert::Infallible;
 use std::fmt::Display;
 use std::marker::PhantomData;
+use std::net::{IpAddr, SocketAddr};
 use std::pin::Pin;
 use std::task::{Context, Poll};
 
-use aide::OperationOutput;
+use crate::web::Files;
 use aide::axum::IntoApiResponse;
+use aide::{OperationIo, OperationOutput};
 use axum::body::Body;
-use axum::extract::Request;
+use axum::extract::{ConnectInfo, FromRequestParts, Request};
 use axum::response::IntoResponse;
 use axum::{Json, extract};
 use http::{Response, StatusCode, header};
@@ -205,7 +207,47 @@ macro_rules! http_bail {
         })
     };
 }
-
 pub(crate) use http_bail;
 
-use crate::web::Files;
+#[derive(Debug, Copy, Clone, OperationIo)]
+pub struct ClientIp(pub Option<IpAddr>);
+
+impl<S: Send + Sync> FromRequestParts<S> for ClientIp {
+    type Rejection = Infallible;
+
+    async fn from_request_parts(parts: &mut http::request::Parts, state: &S) -> Result<Self, Self::Rejection> {
+        if let Some(ip) = [
+            "cf-connecting-ip",
+            "fly-client-ip",
+            "true-client-ip",
+            "x-real-ip",
+            "cloudfront-viewer-address",
+            "x-forwarded-for",
+            "forwarded",
+        ]
+        .iter()
+        .find_map(|&name| {
+            let v = parts.headers.get(name)?.to_str().ok()?.trim();
+            match name {
+                "cloudfront-viewer-address" => v.rsplit_once(':')?.0.parse().ok(),
+                "x-forwarded-for" => v.split(',').next_back()?.trim().parse().ok(),
+                "forwarded" => v
+                    .split(',')
+                    .next_back()?
+                    .split(';')
+                    .find_map(|p| p.trim().strip_prefix("for="))
+                    .map(|p| p.trim_matches('"'))
+                    .and_then(|p| p.parse().ok()),
+                _ => v.parse().ok(),
+            }
+        }) {
+            return Ok(ClientIp(Some(ip)));
+        }
+
+        if let Ok(ConnectInfo(addr)) = ConnectInfo::<SocketAddr>::from_request_parts(parts, state).await {
+            return Ok(ClientIp(Some(addr.ip())));
+        }
+
+        Ok(ClientIp(None))
+    }
+}

data/licenses-npm.json

@@ -51,11 +51,11 @@
 		"@types/d3-shape": "^3.1.7",
 		"@types/d3-transition": "^3.0.9",
 		"@types/d3-zoom": "^3.0.8",
-		"@types/react": "^19.2.7",
+		"@types/react": "^19.2.8",
 		"@types/react-dom": "^19.2.3",
 		"@types/topojson-client": "^3.1.5",
 		"@types/topojson-specification": "^1.0.5",
-		"astro": "5.16.6",
+		"astro": "5.16.8",
 		"rollup-plugin-license": "^3.6.0",
 		"typescript": "^5.9.3"
 	},