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

Merge pull request #2452 from benrubson/badips 

Badips key is only used to retrieve list
pull/2406/head
Sergey G. Brester 2019-07-20 12:08:22 +02:00 committed by GitHub
parent d5a5efcd5a 5bc8d73220
commit 119401fced
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -54,9 +54,6 @@ class BadIPsAction(ActionBase): # pragma: no cover - may be unavailable
age : str, optional age : str, optional
Age of last report for bad IPs, per badips.com syntax. Age of last report for bad IPs, per badips.com syntax.
Default "24h" (24 hours) Default "24h" (24 hours)
key : str, optional
Key issued by badips.com to report bans, for later retrieval
of personalised content.
banaction : str, optional banaction : str, optional
Name of banaction to use for blacklisting bad IPs. If `None`, Name of banaction to use for blacklisting bad IPs. If `None`,
no blacklist of IPs will take place. no blacklist of IPs will take place.
@ -67,8 +64,8 @@ class BadIPsAction(ActionBase): # pragma: no cover - may be unavailable
"postfix", but want to use whole "mail" category for blacklist. "postfix", but want to use whole "mail" category for blacklist.
Default `category`. Default `category`.
bankey : str, optional bankey : str, optional
Key issued by badips.com to blacklist IPs reported with the Key issued by badips.com to retrieve personal list
associated key. of blacklist IPs.
updateperiod : int, optional updateperiod : int, optional
Time in seconds between updating bad IPs blacklist. Time in seconds between updating bad IPs blacklist.
Default 900 (15 minutes) Default 900 (15 minutes)
@ -93,7 +90,7 @@ class BadIPsAction(ActionBase): # pragma: no cover - may be unavailable
def _Request(self, url, **argv): def _Request(self, url, **argv):
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",
banaction=None, bancategory=None, bankey=None, updateperiod=900, banaction=None, bancategory=None, bankey=None, updateperiod=900,
loglevel='DEBUG', agent="Fail2Ban", timeout=TIMEOUT): loglevel='DEBUG', agent="Fail2Ban", timeout=TIMEOUT):
super(BadIPsAction, self).__init__(jail, name) super(BadIPsAction, self).__init__(jail, name)
@ -103,7 +100,6 @@ class BadIPsAction(ActionBase): # pragma: no cover - may be unavailable
self.category = category self.category = category
self.score = score self.score = score
self.age = age self.age = age
self.key = key
self.banaction = banaction self.banaction = banaction
self.bancategory = bancategory or category self.bancategory = bancategory or category
self.bankey = bankey self.bankey = bankey
@ -381,8 +377,6 @@ class BadIPsAction(ActionBase): # pragma: no cover - may be unavailable
""" """
try: try:
url = "/".join([self._badips, "add", self.category, str(aInfo['ip'])]) url = "/".join([self._badips, "add", self.category, str(aInfo['ip'])])
if self.key:
url = "?".join([url, urlencode({'key': self.key})])
self._logSys.debug('badips.com: ban, url: %r', url) self._logSys.debug('badips.com: ban, url: %r', url)
response = urlopen(self._Request(url), timeout=self.timeout) response = urlopen(self._Request(url), timeout=self.timeout)
except HTTPError as response: # pragma: no cover except HTTPError as response: # pragma: no cover

2
fail2ban/tests/action_d/test_badips.py
View File

@ -83,7 +83,7 @@ if sys.version_info >= (2,7): # pragma: no cover - may be unavailable
'banaction': "test", 'banaction': "test",
'age': "2w", 'age': "2w",
'score': 5, 'score': 5,
'key': "fail2ban-test-suite", #'key': "fail2ban-test-suite",
#'bankey': "fail2ban-test-suite", #'bankey': "fail2ban-test-suite",
'timeout': (3 if unittest.F2B.fast else 60), 'timeout': (3 if unittest.F2B.fast else 60),
}) })