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

Merge pull request #956 from yarikoptic/enh/badips_categories 

ENH: check badips.com response on presence of "categories" in it
pull/961/head
Yaroslav Halchenko 2015-02-14 09:30:26 -05:00
parent 3fb2becddb d5e68abf95
commit be75519402
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -111,6 +111,8 @@ class BadIPsAction(ActionBase):
------ ------
HTTPError HTTPError
Any issues with badips.com request. Any issues with badips.com request.
ValueError
If badips.com response didn't contain necessary information
""" """
try: try:
response = urlopen( response = urlopen(
@ -122,7 +124,13 @@ class BadIPsAction(ActionBase):
messages['err']) messages['err'])
raise raise
else: else:
categories = json.loads(response.read().decode('utf-8'))['categories'] response_json = json.loads(response.read().decode('utf-8'))
if not 'categories' in response_json:
err = "badips.com response lacked categories specification. Response was: %s" \
% (response_json,)
self._logSys.error(err)
raise ValueError(err)
categories = response_json['categories']
categories_names = set( categories_names = set(
value['Name'] for value in categories) value['Name'] for value in categories)
if incParents: if incParents: