chore: commit local changes

backend/app/services/blocklist_service.py

@@ -14,7 +14,9 @@ under the key ``"blocklist_schedule"``.
 
 from __future__ import annotations
 
+import importlib
 import json
+from collections.abc import Awaitable
 from typing import TYPE_CHECKING
 
 import structlog
@@ -29,6 +31,7 @@ from app.models.blocklist import (
     ScheduleConfig,
     ScheduleInfo,
 )
+from app.exceptions import JailNotFoundError
 from app.repositories import blocklist_repo, import_log_repo, settings_repo
 from app.utils.ip_utils import is_valid_ip, is_valid_network
 
@@ -244,6 +247,7 @@ async def import_source(
     db: aiosqlite.Connection,
     geo_is_cached: Callable[[str], bool] | None = None,
     geo_batch_lookup: GeoBatchLookup | None = None,
+    ban_ip: Callable[[str, str, str], Awaitable[None]] | None = None,
 ) -> ImportSourceResult:
     """Download and apply bans from a single blocklist source.
 
@@ -301,8 +305,14 @@ async def import_source(
     ban_error: str | None = None
     imported_ips: list[str] = []
 
-    # Import jail_service here to avoid circular import at module level.
-    from app.services import jail_service  # noqa: PLC0415
+    if ban_ip is None:
+        try:
+            jail_svc = importlib.import_module("app.services.jail_service")
+            ban_ip_fn = jail_svc.ban_ip
+        except (ModuleNotFoundError, AttributeError) as exc:
+            raise ValueError("ban_ip callback is required") from exc
+    else:
+        ban_ip_fn = ban_ip
 
     for line in content.splitlines():
         stripped = line.strip()
@@ -315,10 +325,10 @@ async def import_source(
             continue
 
         try:
-            await jail_service.ban_ip(socket_path, BLOCKLIST_JAIL, stripped)
+            await ban_ip_fn(socket_path, BLOCKLIST_JAIL, stripped)
             imported += 1
             imported_ips.append(stripped)
-        except jail_service.JailNotFoundError as exc:
+        except JailNotFoundError as exc:
             # The target jail does not exist in fail2ban — there is no point
             # continuing because every subsequent ban would also fail.
             ban_error = str(exc)
@@ -387,6 +397,7 @@ async def import_all(
     socket_path: str,
     geo_is_cached: Callable[[str], bool] | None = None,
     geo_batch_lookup: GeoBatchLookup | None = None,
+    ban_ip: Callable[[str, str, str], Awaitable[None]] | None = None,
 ) -> ImportRunResult:
     """Import all enabled blocklist sources.
 
@@ -417,6 +428,7 @@ async def import_all(
             db,
             geo_is_cached=geo_is_cached,
             geo_batch_lookup=geo_batch_lookup,
+            ban_ip=ban_ip,
         )
         results.append(result)
         total_imported += result.ips_imported