mirror of https://github.com/fail2ban/fail2ban
BF: badips.py action methods not static due to use of self._logSys
parent
5b14bc048f
commit
16125ec81a
|
@ -99,8 +99,7 @@ class BadIPsAction(ActionBase):
|
||||||
# Used later for threading.Timer for updating badips
|
# Used later for threading.Timer for updating badips
|
||||||
self._timer = None
|
self._timer = None
|
||||||
|
|
||||||
@classmethod
|
def getCategories(self, incParents=False):
|
||||||
def getCategories(cls, incParents=False):
|
|
||||||
"""Get badips.com categories.
|
"""Get badips.com categories.
|
||||||
|
|
||||||
Returns
|
Returns
|
||||||
|
@ -115,7 +114,7 @@ class BadIPsAction(ActionBase):
|
||||||
"""
|
"""
|
||||||
try:
|
try:
|
||||||
response = urlopen(
|
response = urlopen(
|
||||||
cls._Request("/".join([cls._badips, "get", "categories"])))
|
self._Request("/".join([self._badips, "get", "categories"])))
|
||||||
except HTTPError as response:
|
except HTTPError as response:
|
||||||
messages = json.loads(response.read().decode('utf-8'))
|
messages = json.loads(response.read().decode('utf-8'))
|
||||||
self._logSys.error(
|
self._logSys.error(
|
||||||
|
@ -132,8 +131,7 @@ class BadIPsAction(ActionBase):
|
||||||
if "Parent" in value))
|
if "Parent" in value))
|
||||||
return categories_names
|
return categories_names
|
||||||
|
|
||||||
@classmethod
|
def getList(self, category, score, age, key=None):
|
||||||
def getList(cls, category, score, age, key=None):
|
|
||||||
"""Get badips.com list of bad IPs.
|
"""Get badips.com list of bad IPs.
|
||||||
|
|
||||||
Parameters
|
Parameters
|
||||||
|
@ -160,11 +158,11 @@ class BadIPsAction(ActionBase):
|
||||||
"""
|
"""
|
||||||
try:
|
try:
|
||||||
url = "?".join([
|
url = "?".join([
|
||||||
"/".join([cls._badips, "get", "list", category, str(score)]),
|
"/".join([self._badips, "get", "list", category, str(score)]),
|
||||||
urlencode({'age': age})])
|
urlencode({'age': age})])
|
||||||
if key:
|
if key:
|
||||||
url = "&".join([url, urlencode({"key", key})])
|
url = "&".join([url, urlencode({"key", key})])
|
||||||
response = urlopen(cls._Request(url))
|
response = urlopen(self._Request(url))
|
||||||
except HTTPError as response:
|
except HTTPError as response:
|
||||||
messages = json.loads(response.read().decode('utf-8'))
|
messages = json.loads(response.read().decode('utf-8'))
|
||||||
self._logSys.error(
|
self._logSys.error(
|
||||||
|
|
Loading…
Reference in New Issue