From 69f5623f83180dda4e9461f553fd676f029b3ba9 Mon Sep 17 00:00:00 2001 From: sebres Date: Mon, 4 Jan 2016 09:30:32 +0100 Subject: [PATCH] code simplifying (remove duplication): agent will be always supplied as parameter from jail.conf --- config/action.d/badips.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/config/action.d/badips.py b/config/action.d/badips.py index 5248e994..025289ca 100644 --- a/config/action.d/badips.py +++ b/config/action.d/badips.py @@ -32,7 +32,6 @@ else: from urllib import urlencode from fail2ban.server.actions import ActionBase -from fail2ban.version import version as f2bVersion class BadIPsAction(ActionBase): @@ -86,10 +85,10 @@ class BadIPsAction(ActionBase): return Request(url, headers={'User-Agent': self.agent}, **argv) def __init__(self, jail, name, category, score=3, age="24h", key=None, - banaction=None, bancategory=None, bankey=None, updateperiod=900, agent=None): + banaction=None, bancategory=None, bankey=None, updateperiod=900, agent="Fail2Ban"): super(BadIPsAction, self).__init__(jail, name) - self.agent = agent if agent is not None else ("Fail2Ban/%s" % f2bVersion) + self.agent = agent self.category = category self.score = score self.age = age