less individual selects

0x7d8 · 0x7d8 · commit dd4f2c5e6120 · 2025-04-12T10:53:10.000+02:00
diff --git a/src/main.rs b/src/main.rs
@@ -20,7 +20,7 @@ use colored::Colorize;
 use sentry_tower::SentryHttpLayer;
 use serde_json::json;
 use sha1::Digest;
-use std::{sync::Arc, time::Instant};
+use std::{net::IpAddr, sync::Arc, time::Instant};
 use tokio::sync::RwLock;
 use tower::Layer;
 use tower_http::{
@@ -51,12 +51,9 @@ fn handle_panic(_err: Box<dyn std::any::Any + Send + 'static>) -> Response<Body>
 }
 
 fn handle_request(req: &Request<Body>, _span: &tracing::Span) {
-    let ip = req
-        .headers()
-        .get("x-real-ip")
-        .or_else(|| req.headers().get("x-forwarded-for"))
-        .map(|ip| ip.to_str().unwrap_or_default())
-        .unwrap_or_default();
+    let ip = extract_ip(req.headers())
+        .map(|ip| ip.to_string())
+        .unwrap_or_else(|| "unknown".to_string());
 
     logger::log(
         logger::LoggerLevel::Info,
@@ -105,6 +102,27 @@ async fn handle_etag(req: Request, next: Next) -> Result<Response, StatusCode> {
     Ok(Response::from_parts(parts, Body::from(body_bytes)))
 }
 
+#[inline]
+pub fn extract_ip(headers: &HeaderMap) -> Option<IpAddr> {
+    let ip = headers
+        .get("x-real-ip")
+        .or_else(|| headers.get("x-forwarded-for"))
+        .map(|ip| ip.to_str().unwrap_or_default())
+        .unwrap_or_default();
+
+    if ip.is_empty() {
+        return None;
+    }
+
+    let ip = if ip.contains(',') {
+        ip.split(',').next().unwrap_or_default().trim().to_string()
+    } else {
+        ip.to_string()
+    };
+
+    ip.parse().ok()
+}
+
 #[tokio::main]
 async fn main() {
     let env = env::Env::parse();
diff --git a/src/models/extension.rs b/src/models/extension.rs
@@ -89,10 +89,7 @@ impl BaseModel for Extension {
                 format!("{}banner", prefix.unwrap_or_default()),
             ),
             (
-                format!(
-                    "(SELECT stats FROM mv_extension_stats WHERE mv_extension_stats.id = {}.id)",
-                    table
-                ),
+                "mv_extension_stats.stats".to_string(),
                 format!("{}stats", prefix.unwrap_or_default()),
             ),
             (
@@ -135,6 +132,7 @@ impl Extension {
             SELECT {}
             FROM extensions
             JOIN authors ON extensions.author_id = authors.id
+            LEFT JOIN mv_extension_stats ON extensions.id = mv_extension_stats.id
             WHERE
                 NOT pending
                 AND NOT hidden
@@ -160,6 +158,7 @@ impl Extension {
             SELECT {}
             FROM extensions
             JOIN authors ON extensions.author_id = authors.id
+            LEFT JOIN mv_extension_stats ON extensions.id = mv_extension_stats.id
             WHERE
                 extensions.identifier = $1
                 AND NOT extensions.pending
@@ -181,6 +180,7 @@ impl Extension {
             SELECT {}
             FROM extensions
             JOIN authors ON extensions.author_id = authors.id
+            LEFT JOIN mv_extension_stats ON extensions.id = mv_extension_stats.id
             WHERE
                 extensions.id = $1
                 AND NOT extensions.pending
diff --git a/src/routes/telemetry.rs b/src/routes/telemetry.rs
@@ -13,10 +13,15 @@ pub fn router(state: &State) -> OpenApiRouter<State> {
             "/",
             post(
                 |state: GetState, headers: HeaderMap, axum::Json::<TelemetryData>(data)| async move {
-                    let ip = headers.get("x-real-ip")
-                    .or_else(|| headers.get("x-forwarded-for"))
-                    .map(|ip| ip.to_str().unwrap_or_default())
-                    .unwrap_or_default();
+                    let ip = match crate::extract_ip(&headers) {
+                        Some(ip) => ip,
+                        None => {
+                            return (
+                                StatusCode::BAD_REQUEST,
+                                axum::Json(ApiError::new(&["invalid ip"]).to_value()),
+                            );
+                        }
+                    };
 
                     let telemetry = state.telemetry.log(ip, data).await;
                     if telemetry.is_none() {
diff --git a/src/telemetry.rs b/src/telemetry.rs
@@ -6,6 +6,7 @@ use sha2::Digest;
 use sqlx::types::Uuid;
 use std::{
     collections::{HashMap, HashSet},
+    net::IpAddr,
     sync::Arc,
 };
 use tokio::sync::Mutex;
@@ -98,7 +99,7 @@ impl TelemetryLogger {
     }
 
     #[inline]
-    pub async fn log(&self, ip: &str, telemetry: TelemetryData) -> Option<()> {
+    pub async fn log(&self, ip: IpAddr, telemetry: TelemetryData) -> Option<()> {
         let mut processing = self.processing.lock().await;
 
         let ratelimit_key = format!("blueprint_api::ratelimit::{}", ip);
