Harden fail2ban integration and mark task complete
This commit is contained in:
@@ -51,36 +51,6 @@ from app.tasks import blocklist_import, geo_cache_flush, geo_re_resolve, health_
|
||||
from app.utils.fail2ban_client import Fail2BanConnectionError, Fail2BanProtocolError
|
||||
from app.utils.jail_config import ensure_jail_configs
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Ensure the bundled fail2ban package is importable from fail2ban-master/
|
||||
#
|
||||
# The directory layout differs between local dev and the Docker image:
|
||||
# Local: <repo-root>/backend/app/main.py → fail2ban-master at parents[2]
|
||||
# Docker: /app/app/main.py → fail2ban-master at parents[1]
|
||||
# Walk up from this file until we find a "fail2ban-master" sibling directory
|
||||
# so the path resolution is environment-agnostic.
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
|
||||
def _find_fail2ban_master() -> Path | None:
|
||||
"""Return the first ``fail2ban-master`` directory found while walking up.
|
||||
|
||||
Returns:
|
||||
Absolute :class:`~pathlib.Path` to the ``fail2ban-master`` directory,
|
||||
or ``None`` if no such directory exists among the ancestors.
|
||||
"""
|
||||
here = Path(__file__).resolve()
|
||||
for ancestor in here.parents:
|
||||
candidate = ancestor / "fail2ban-master"
|
||||
if candidate.is_dir():
|
||||
return candidate
|
||||
return None
|
||||
|
||||
|
||||
_fail2ban_master: Path | None = _find_fail2ban_master()
|
||||
if _fail2ban_master is not None and str(_fail2ban_master) not in sys.path:
|
||||
sys.path.insert(0, str(_fail2ban_master))
|
||||
|
||||
log: structlog.stdlib.BoundLogger = structlog.get_logger()
|
||||
|
||||
|
||||
@@ -328,8 +298,8 @@ class SetupRedirectMiddleware(BaseHTTPMiddleware):
|
||||
if path.startswith("/api") and not getattr(
|
||||
request.app.state, "_setup_complete_cached", False
|
||||
):
|
||||
from app.services import setup_service # noqa: PLC0415
|
||||
from app.db import open_db # noqa: PLC0415
|
||||
from app.services import setup_service # noqa: PLC0415
|
||||
|
||||
db = getattr(request.app.state, "db", None)
|
||||
if db is None:
|
||||
|
||||
Reference in New Issue
Block a user