lukas.pupkalipinski/BanGUI
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Normalise IP addresses across backend

Browse Source 
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
Lukas
2026-05-03 18:19:41 +02:00
parent 85d05ee582
commit 96525573fa
6 changed files with 24 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
backend/app/services/ban_service.py
View File

@@ -57,6 +57,7 @@ from app.utils.fail2ban_response import (
ok,
to_dict,
)
from app.utils.ip_utils import normalise_ip
from app.utils.time_utils import since_unix
if TYPE_CHECKING:
@@ -96,10 +97,11 @@ async def ban_ip(socket_path: str, jail: str, ip: str) -> None:
except ValueError as exc:
raise ValueError(f"Invalid IP address: {ip!r}") from exc
normalized = normalise_ip(ip)
client = Fail2BanClient(socket_path=socket_path, timeout=FAIL2BAN_SOCKET_TIMEOUT)
try:
ok(await client.send(["set", jail, "banip", ip]))
ok(await client.send(["set", jail, "banip", normalized]))
except ValueError as exc:
if is_not_found_error(exc):
raise JailNotFoundError(jail) from exc
@@ -113,14 +115,15 @@ async def unban_ip(socket_path: str, ip: str, jail: str | None = None) -> None:
except ValueError as exc:
raise ValueError(f"Invalid IP address: {ip!r}") from exc
normalized = normalise_ip(ip)
client = Fail2BanClient(socket_path=socket_path, timeout=FAIL2BAN_SOCKET_TIMEOUT)
if jail is None:
ok(await client.send(["unban", ip]))
ok(await client.send(["unban", normalized]))
return
try:
ok(await client.send(["set", jail, "unbanip", ip]))
ok(await client.send(["set", jail, "unbanip", normalized]))
except ValueError as exc:
if is_not_found_error(exc):
raise JailNotFoundError(jail) from exc