add details to invalid api key error in middleware (#1762)

* add details to invalid api key error in middleware

add user agent, src ip and  dataset name to the error

* fix coderabbit comments

* add endpoint

* use peer_addr instead of remote_addr

* update test

Author: nikhilsinhaparseable

src/handlers/http/middleware.rs

@@ -198,6 +198,34 @@ where
                     Some(session_id)
                 }
                 None => {
+                    let source_ip = req
+                        .peer_addr()
+                        .map(|address| address.ip().to_string())
+                        .unwrap_or_else(|| "unknown".to_string());
+                    let endpoint = req.path();
+                    let user_agent = req
+                        .headers()
+                        .get(header::USER_AGENT)
+                        .and_then(|value| value.to_str().ok())
+                        .unwrap_or_default();
+                    let dataset = req
+                        .match_info()
+                        .get("logstream")
+                        .or_else(|| {
+                            req.headers()
+                                .get(STREAM_NAME_HEADER_KEY)
+                                .and_then(|value| value.to_str().ok())
+                        })
+                        .unwrap_or("unknown");
+
+                    tracing::warn!(
+                        source_ip,
+                        endpoint,
+                        user_agent,
+                        dataset,
+                        requested_tenant = tenant_id.as_deref().unwrap_or("unknown"),
+                        "Invalid API key"
+                    );
                     return Box::pin(async { Err(ErrorUnauthorized("Invalid API key")) });
                 }
             }

src/handlers/http/modal/utils/ingest_utils.rs

@@ -412,12 +412,13 @@ pub fn get_custom_fields_from_header(req: &HttpRequest) -> HashMap<String, Strin
         .and_then(|a| a.to_str().ok())
         .unwrap_or_default();
 
-    let conn = req.connection_info().clone();
-
-    let source_ip = conn.realip_remote_addr().unwrap_or_default();
+    let source_ip = req
+        .peer_addr()
+        .map(|address| address.ip().to_string())
+        .unwrap_or_else(|| "unknown".to_string());
     let mut p_custom_fields = HashMap::new();
     p_custom_fields.insert(USER_AGENT_KEY.to_string(), user_agent.to_string());
-    p_custom_fields.insert(SOURCE_IP_KEY.to_string(), source_ip.to_string());
+    p_custom_fields.insert(SOURCE_IP_KEY.to_string(), source_ip);
 
     // Iterate through headers and add custom fields
     for (header_name, header_value) in req.headers().iter() {
@@ -592,6 +593,17 @@ mod tests {
 
         assert_eq!(custom_fields.len(), 2);
         assert_eq!(custom_fields.get(USER_AGENT_KEY).unwrap(), "");
-        assert_eq!(custom_fields.get(SOURCE_IP_KEY).unwrap(), "");
+        assert_eq!(custom_fields.get(SOURCE_IP_KEY).unwrap(), "unknown");
+    }
+
+    #[test]
+    fn test_get_custom_fields_from_header_with_peer_address() {
+        let req = TestRequest::default()
+            .peer_addr("192.0.2.1:8080".parse().unwrap())
+            .to_http_request();
+
+        let custom_fields = get_custom_fields_from_header(&req);
+
+        assert_eq!(custom_fields.get(SOURCE_IP_KEY).unwrap(), "192.0.2.1");
     }
 }