github
/
fail2ban
mirror of https://github.com/fail2ban/fail2ban
1
0
Fork 0
Code Issues Releases Wiki Activity

Add a shortloglevel badips.py option

pull/2245/head
benrubson 2018-10-09 19:27:39 +02:00 committed by sebres
parent 140243328f
commit 689938ee99
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
config/action.d/badips.py
View File

@ -75,6 +75,9 @@ class BadIPsAction(ActionBase): # pragma: no cover - may be unavailable
loglevel : int/str, optional loglevel : int/str, optional
Log level of the message when an IP is (un)banned. Log level of the message when an IP is (un)banned.
Default `DEBUG`. Default `DEBUG`.
shortloglevel : int/str, optional
Log level of the summary message when a group of IPs is (un)banned.
Default `DEBUG`.
agent : str, optional agent : str, optional
User agent transmitted to server. User agent transmitted to server.
Default `Fail2Ban/ver.` Default `Fail2Ban/ver.`
@ -91,8 +94,8 @@ class BadIPsAction(ActionBase): # pragma: no cover - may be unavailable
return Request(url, headers={'User-Agent': self.agent}, **argv) return Request(url, headers={'User-Agent': self.agent}, **argv)
def __init__(self, jail, name, category, score=3, age="24h", key=None, def __init__(self, jail, name, category, score=3, age="24h", key=None,
banaction=None, bancategory=None, bankey=None, updateperiod=900, loglevel='DEBUG', agent="Fail2Ban", banaction=None, bancategory=None, bankey=None, updateperiod=900,
timeout=TIMEOUT): loglevel='DEBUG', shortloglevel='DEBUG', agent="Fail2Ban", timeout=TIMEOUT):
super(BadIPsAction, self).__init__(jail, name) super(BadIPsAction, self).__init__(jail, name)
self.timeout = timeout self.timeout = timeout
@ -105,6 +108,7 @@ class BadIPsAction(ActionBase): # pragma: no cover - may be unavailable
self.bancategory = bancategory or category self.bancategory = bancategory or category
self.bankey = bankey self.bankey = bankey
self.loglevel = str2LogLevel(loglevel) self.loglevel = str2LogLevel(loglevel)
self.shortloglevel = str2LogLevel(shortloglevel)
self.updateperiod = updateperiod self.updateperiod = updateperiod
self._bannedips = set() self._bannedips = set()
@ -350,9 +354,13 @@ class BadIPsAction(ActionBase): # pragma: no cover - may be unavailable
s = ips - self._bannedips s = ips - self._bannedips
p = len(s) p = len(s)
self._banIPs(s) self._banIPs(s)
self._logSys.log(self.loglevel, if m != 0 or p != 0:
"Updated IPs for jail '%s' (-%d/+%d). Update again in %i seconds", self._logSys.log(self.shortloglevel,
self._jail.name, m, p, self.updateperiod) "Updated IPs for jail '%s' (-%d/+%d)",
self._jail.name, m, p)
self._logSys.debug(
"Next update for jail '%' in %i seconds",
self._jail.name, self.updateperiod)
finally: finally:
self._timer = threading.Timer(self.updateperiod, self.update) self._timer = threading.Timer(self.updateperiod, self.update)
self._timer.start() self._timer.start()