From ccacfc1047b092aa00eb07e93f5f7c198ec86843 Mon Sep 17 00:00:00 2001 From: sebres Date: Mon, 5 May 2014 15:17:22 +0200 Subject: [PATCH] code review --- fail2ban/client/jailreader.py | 2 +- fail2ban/server/actions.py | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/fail2ban/client/jailreader.py b/fail2ban/client/jailreader.py index 85b136d9..4d3f2801 100644 --- a/fail2ban/client/jailreader.py +++ b/fail2ban/client/jailreader.py @@ -93,7 +93,7 @@ class JailReader(ConfigReader): ["int", "maxretry", None], ["int", "findtime", None], ["int", "bantime", None], - ["bool", "bantimeextra.enabled", False], + ["bool", "bantimeextra.enabled", None], ["string", "bantimeextra.findtime", None], ["string", "bantimeextra.factor", None], ["string", "bantimeextra.formula", None], diff --git a/fail2ban/server/actions.py b/fail2ban/server/actions.py index 73848b55..5b1c738a 100644 --- a/fail2ban/server/actions.py +++ b/fail2ban/server/actions.py @@ -248,8 +248,9 @@ class Actions(JailThread, Mapping): be[opt] = value; logSys.info('Set banTimeExtra.%s = %s', opt, value) if opt == 'enabled': - be[opt] = bool(value) - if bool(value) and self._jail.database is None: + if isinstance(value, str): + be[opt] = value.lower() in ("yes", "true", "ok", "1") + if be[opt] and self._jail.database is None: logSys.warning("banTimeExtra is not available as long jail database is not set") if opt in ['findtime', 'maxtime', 'rndtime']: if not value is None: @@ -346,7 +347,7 @@ class Actions(JailThread, Mapping): ip=ip, jail=self._jail).getAttempt()) try: # if ban time was not set: - if bTicket.getBanTime() is None: + if not ticket.getRestored() and bTicket.getBanTime() is None: btime = self.incrBanTime(bTicket, ip) bTicket.setBanTime(btime); except Exception as e: