Merge branch 'feat/dashboard-single-ip-page' into feat/add-search-bar

src/routes/api.py

@@ -7,7 +7,6 @@ All endpoints are prefixed with the secret dashboard path.
 """
 
 import os
-import json
 
 from fastapi import APIRouter, Request, Response, Query
 from fastapi.responses import JSONResponse, PlainTextResponse

src/routes/dashboard.py

@@ -6,6 +6,8 @@ Renders the main dashboard page with server-side data for initial load.
 """
 
 from fastapi import APIRouter, Request
+from fastapi.responses import JSONResponse
+from logger import get_app_logger
 
 from dependencies import get_db, get_templates
 
@@ -21,7 +23,7 @@ async def dashboard_page(request: Request):
 
     # Get initial data for server-rendered sections
     stats = db.get_dashboard_counts()
-    suspicious = db.get_recent_suspicious(limit=20)
+    suspicious = db.get_recent_suspicious(limit=10)
 
     # Get credential count for the stats card
     cred_result = db.get_credentials_paginated(page=1, page_size=1)
@@ -37,3 +39,36 @@ async def dashboard_page(request: Request):
             "suspicious_activities": suspicious,
         },
     )
+
+
+@router.get("/ip/{ip_address:path}")
+async def ip_page(ip_address: str, request: Request):
+    db = get_db()
+    try:
+        stats = db.get_ip_stats_by_ip(ip_address)
+        config = request.app.state.config
+        dashboard_path = "/" + config.dashboard_secret_path.lstrip("/")
+
+        if stats:
+            # Transform fields for template compatibility
+            list_on = stats.get("list_on") or {}
+            stats["blocklist_memberships"] = list(list_on.keys()) if list_on else []
+            stats["reverse_dns"] = stats.get("reverse")
+
+            templates = get_templates()
+            return templates.TemplateResponse(
+                "dashboard/ip.html",
+                {
+                    "request": request,
+                    "dashboard_path": dashboard_path,
+                    "stats": stats,
+                    "ip_address": ip_address,
+                },
+            )
+        else:
+            return JSONResponse(
+                content={"error": "IP not found"},
+            )
+    except Exception as e:
+        get_app_logger().error(f"Error fetching IP stats: {e}")
+        return JSONResponse(content={"error": str(e)})

src/routes/htmx.py

@@ -58,7 +58,7 @@ async def htmx_top_ips(
 ):
     db = get_db()
     result = db.get_top_ips_paginated(
-        page=max(1, page), page_size=5, sort_by=sort_by, sort_order=sort_order
+        page=max(1, page), page_size=8, sort_by=sort_by, sort_order=sort_order
     )
 
     templates = get_templates()
@@ -167,6 +167,42 @@ async def htmx_attackers(
     )
 
 
+# ── Access logs by ip ────────────────────────────────────────────────────────
+
+
+@router.get("/htmx/access-logs")
+async def htmx_access_logs_by_ip(
+    request: Request,
+    page: int = Query(1),
+    sort_by: str = Query("total_requests"),
+    sort_order: str = Query("desc"),
+    ip_filter: str = Query("ip_filter"),
+):
+    db = get_db()
+    result = db.get_access_logs_paginated(
+        page=max(1, page), page_size=25, ip_filter=ip_filter
+    )
+
+    # Normalize pagination key (DB returns total_attackers, template expects total)
+    pagination = result["pagination"]
+    if "total_access_logs" in pagination and "total" not in pagination:
+        pagination["total"] = pagination["total_access_logs"]
+
+    templates = get_templates()
+    return templates.TemplateResponse(
+        "dashboard/partials/access_by_ip_table.html",
+        {
+            "request": request,
+            "dashboard_path": _dashboard_path(request),
+            "items": result["access_logs"],
+            "pagination": pagination,
+            "sort_by": sort_by,
+            "sort_order": sort_order,
+            "ip_filter": ip_filter,
+        },
+    )
+
+
 # ── Credentials ──────────────────────────────────────────────────────
 
 
@@ -280,6 +316,34 @@ async def htmx_patterns(
     )
 
 
+# ── IP Insight (full IP page as partial) ─────────────────────────────
+
+
+@router.get("/htmx/ip-insight/{ip_address:path}")
+async def htmx_ip_insight(ip_address: str, request: Request):
+    db = get_db()
+    stats = db.get_ip_stats_by_ip(ip_address)
+
+    if not stats:
+        stats = {"ip": ip_address, "total_requests": "N/A"}
+
+    # Transform fields for template compatibility
+    list_on = stats.get("list_on") or {}
+    stats["blocklist_memberships"] = list(list_on.keys()) if list_on else []
+    stats["reverse_dns"] = stats.get("reverse")
+
+    templates = get_templates()
+    return templates.TemplateResponse(
+        "dashboard/partials/ip_insight.html",
+        {
+            "request": request,
+            "dashboard_path": _dashboard_path(request),
+            "stats": stats,
+            "ip_address": ip_address,
+        },
+    )
+
+
 # ── IP Detail ────────────────────────────────────────────────────────