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

Merge branch '0.10' into 0.11

pull/2465/head
sebres 2019-06-12 11:44:05 +02:00
parent 686a8bdc54 326f5d4e3f
commit 2e7a600851
2 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -74,6 +74,7 @@ ver. 0.10.5-dev-1 (20??/??/??) - development edition
* fixed read of included config-files (`.local` overwrites options of `.conf` for config-files * fixed read of included config-files (`.local` overwrites options of `.conf` for config-files
included with before/after) included with before/after)
* `action.d/abuseipdb.conf`: switched to use AbuseIPDB API v2 (gh-2302) * `action.d/abuseipdb.conf`: switched to use AbuseIPDB API v2 (gh-2302)
* `action.d/badips.py`: fixed start of banaction on demand (which may be IP-family related), gh-2390
* `action.d/helpers-common.conf`: rewritten grep arguments, now options `-wF` used to match only * `action.d/helpers-common.conf`: rewritten grep arguments, now options `-wF` used to match only
whole words and fixed string (not as pattern), gh-2298 whole words and fixed string (not as pattern), gh-2298
* `filter.d/sshd.conf`: * `filter.d/sshd.conf`:

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

@ -31,7 +31,7 @@ else: # pragma: 3.x no cover
from urllib2 import Request, urlopen, HTTPError from urllib2 import Request, urlopen, HTTPError
from urllib import urlencode from urllib import urlencode
from fail2ban.server.actions import ActionBase from fail2ban.server.actions import Actions, ActionBase, BanTicket
from fail2ban.helpers import splitwords, str2LogLevel from fail2ban.helpers import splitwords, str2LogLevel
@ -286,13 +286,8 @@ class BadIPsAction(ActionBase): # pragma: no cover - may be unavailable
def _banIPs(self, ips): def _banIPs(self, ips):
for ip in ips: for ip in ips:
try: try:
self._jail.actions[self.banaction].ban({ ai = Actions.ActionInfo(BanTicket(ip), self._jail)
'ip': ip, self._jail.actions[self.banaction].ban(ai)
'failures': 0,
'matches': "",
'ipmatches': "",
'ipjailmatches': "",
})
except Exception as e: except Exception as e:
self._logSys.error( self._logSys.error(
"Error banning IP %s for jail '%s' with action '%s': %s", "Error banning IP %s for jail '%s' with action '%s': %s",
@ -307,13 +302,8 @@ class BadIPsAction(ActionBase): # pragma: no cover - may be unavailable
def _unbanIPs(self, ips): def _unbanIPs(self, ips):
for ip in ips: for ip in ips:
try: try:
self._jail.actions[self.banaction].unban({ ai = Actions.ActionInfo(BanTicket(ip), self._jail)
'ip': ip, self._jail.actions[self.banaction].unban(ai)
'failures': 0,
'matches': "",
'ipmatches': "",
'ipjailmatches': "",
})
except Exception as e: except Exception as e:
self._logSys.error( self._logSys.error(
"Error unbanning IP %s for jail '%s' with action '%s': %s", "Error unbanning IP %s for jail '%s' with action '%s': %s",