prehistoric-systems/fail2ban
1
0
Fork 0
mirror of https://github.com/fail2ban/fail2ban.git synced 2026-03-11 08:55:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

make Ticket.getID() return str

Browse source 
If the original id is a str, it's internally stored as IPAddr. Instead
of returning the IPAddr, the getter now only returns a plain str. If it
originally was a tuple or None, that is passed as-is. Also now throws an
error if the id has an unexpected type. One testcase now fails.
This commit is contained in:
Marko Hauptvogel 2025-11-11 10:54:08 +01:00
parent 92176d729c
commit 6eb17a5602
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
fail2ban/server/ticket.py
View file

@ -24,6 +24,8 @@ __author__ = "Cyril Jaquier"
__copyright__ = "Copyright (c) 2004 Cyril Jaquier"
__license__ = "GPL"
from typing import Union
from ..helpers import getLogger
from .ipdns import IPAddr, asip
from .mytime import MyTime
@ -89,13 +91,17 @@ class Ticket(object):
if v is not None:
setattr(self, n, v)
def setID(self, value):
def setID(self, value: Union[str, IPAddr, tuple, None]) -> None:
# guarantee using IPAddr instead of unicode, str for the IP
if isinstance(value, str):
value = IPAddr(value)
if not isinstance(value, (IPAddr, tuple, type(None))):
raise TypeError(f"ID has unsupported type: {type(value).__name__}")
self._id = value
def getID(self):
def getID(self) -> Union[IPAddr, tuple, None]:
if isinstance(self._id, IPAddr):
return str(self._id)
return self._id
def getIP(self) -> IPAddr: