diff --git a/server/actions.py b/server/actions.py index 145560a7..7cf7d692 100644 --- a/server/actions.py +++ b/server/actions.py @@ -134,7 +134,7 @@ class Actions(JailThread): aInfo = dict() bTicket = BanManager.createBanTicket(ticket) aInfo["ip"] = bTicket.getIP() - aInfo["failures"] = bTicket.getTime() + aInfo["failures"] = bTicket.getAttempt() logSys.info("Ban %s" % aInfo["ip"]) for action in self.actions: action.execActionBan(aInfo) diff --git a/server/banmanager.py b/server/banmanager.py index 6f634555..fc18f55d 100644 --- a/server/banmanager.py +++ b/server/banmanager.py @@ -101,7 +101,9 @@ class BanManager: ip = ticket.getIP() #lastTime = ticket.getTime() lastTime = time.time() - return BanTicket(ip, lastTime) + banTicket = BanTicket(ip, lastTime) + banTicket.setAttempt(ticket.getAttempt()) + return banTicket ## # Add a ban ticket. diff --git a/server/failmanager.py b/server/failmanager.py index 75468306..18ea5a86 100644 --- a/server/failmanager.py +++ b/server/failmanager.py @@ -97,7 +97,10 @@ class FailManager: if data.getRetry() >= self.maxRetry: self.delFailure(ip) self.lock.release() - return FailTicket(ip, data.getLastTime()) + # Create a FailTicket from BanData + failTicket = FailTicket(ip, data.getLastTime()) + failTicket.setAttempt(data.getRetry()) + return failTicket self.lock.release() raise FailManagerEmpty diff --git a/server/ticket.py b/server/ticket.py index 3eee74cb..1ca3f725 100644 --- a/server/ticket.py +++ b/server/ticket.py @@ -34,6 +34,7 @@ class Ticket: def __init__(self, ip, time): self.ip = ip self.time = time + self.attempt = 0 def setIP(self, value): self.ip = value @@ -46,4 +47,10 @@ class Ticket: def getTime(self): return self.time + + def setAttempt(self, value): + self.attempt = value + + def getAttempt(self): + return self.attempt \ No newline at end of file