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

NF: Filters now allow adding of [Init] section similar to actions

Browse Source
pull/180/head
Steven Hiscocks 12 years ago
parent 9a14cf8b7b
commit 01499ad0de
5 changed files with 103 additions and 104 deletions
Show Stats Download Patch File Download Diff File

72
fail2ban/client/actionreader.py
Unescape View File

@ -28,66 +28,42 @@ __copyright__ = "Copyright (c) 2004 Cyril Jaquier"
__license__ = "GPL" __license__ = "GPL"
import logging import logging
from configreader import ConfigReader from configreader import ConfigReader, OptionConfigReader
# Gets the instance of the logger. # Gets the instance of the logger.
logSys = logging.getLogger(__name__) logSys = logging.getLogger(__name__)
class ActionReader(ConfigReader): class ActionReader(OptionConfigReader):
def __init__(self, action, name, **kwargs): _configOpts = [
ConfigReader.__init__(self, **kwargs) ["string", "actionstart", ""],
self.__file = action[0] ["string", "actionstop", ""],
self.__cInfo = action[1] ["string", "actioncheck", ""],
self.__name = name ["string", "actionban", ""],
["string", "actionunban", ""],
def setFile(self, fileName): ]
self.__file = fileName
def getFile(self):
return self.__file
def setName(self, name):
self.__name = name
def getName(self):
return self.__name
def read(self): def read(self):
return ConfigReader.read(self, "action.d/" + self.__file) return ConfigReader.read(self, "action.d/" + self._file)
def getOptions(self, pOpts):
opts = [["string", "actionstart", ""],
["string", "actionstop", ""],
["string", "actioncheck", ""],
["string", "actionban", ""],
["string", "actionunban", ""]]
self.__opts = ConfigReader.getOptions(self, "Definition", opts, pOpts)
if self.has_section("Init"):
for opt in self.options("Init"):
if not self.__cInfo.has_key(opt):
self.__cInfo[opt] = self.get("Init", opt)
def convert(self): def convert(self):
head = ["set", self.__name] head = ["set", self._name]
stream = list() stream = list()
stream.append(head + ["addaction", self.__file]) stream.append(head + ["addaction", self._file])
for opt in self.__opts: for opt in self._opts:
if opt == "actionstart": if opt == "actionstart":
stream.append(head + ["actionstart", self.__file, self.__opts[opt]]) stream.append(head + ["actionstart", self._file, self._opts[opt]])
elif opt == "actionstop": elif opt == "actionstop":
stream.append(head + ["actionstop", self.__file, self.__opts[opt]]) stream.append(head + ["actionstop", self._file, self._opts[opt]])
elif opt == "actioncheck": elif opt == "actioncheck":
stream.append(head + ["actioncheck", self.__file, self.__opts[opt]]) stream.append(head + ["actioncheck", self._file, self._opts[opt]])
elif opt == "actionban": elif opt == "actionban":
stream.append(head + ["actionban", self.__file, self.__opts[opt]]) stream.append(head + ["actionban", self._file, self._opts[opt]])
elif opt == "actionunban": elif opt == "actionunban":
stream.append(head + ["actionunban", self.__file, self.__opts[opt]]) stream.append(head + ["actionunban", self._file, self._opts[opt]])
# cInfo # cInfo
if self.__cInfo: if self._initOpts:
for p in self.__cInfo: for p in self._initOpts:
stream.append(head + ["setcinfo", self.__file, p, self.__cInfo[p]]) stream.append(head + ["setcinfo", self._file, p, self._initOpts[p]])
return stream return stream

37
fail2ban/client/configreader.py
Unescape View File

@ -130,3 +130,40 @@ class ConfigReader(SafeConfigParserWithIncludes):
"'. Using default one: '" + `option[2]` + "'") "'. Using default one: '" + `option[2]` + "'")
values[option[1]] = option[2] values[option[1]] = option[2]
return values return values
class OptionConfigReader(ConfigReader):
_configOpts = []
def __init__(self, file_, jailName, initOpts, **kwargs):
ConfigReader.__init__(self, **kwargs)
self._file = file_
self._name = jailName
self._initOpts = initOpts
def setFile(self, fileName):
self._file = fileName
def getFile(self):
return self.__file
def setName(self, name):
self._name = name
def getName(self):
return self._name
def read(self):
return ConfigReader.read(self, self._file)
def getOptions(self, pOpts):
self._opts = ConfigReader.getOptions(
self, "Definition", self._configOpts, pOpts)
if self.has_section("Init"):
for opt in self.options("Init"):
if not self._initOpts.has_key(opt):
self._initOpts[opt] = self.get("Init", opt)
def convert(self):
raise NotImplementedError

45
fail2ban/client/filterreader.py
Unescape View File

@ -28,50 +28,33 @@ __copyright__ = "Copyright (c) 2004 Cyril Jaquier"
__license__ = "GPL" __license__ = "GPL"
import logging import logging
from configreader import ConfigReader from configreader import ConfigReader, OptionConfigReader
# Gets the instance of the logger. # Gets the instance of the logger.
logSys = logging.getLogger(__name__) logSys = logging.getLogger(__name__)
class FilterReader(ConfigReader): class FilterReader(OptionConfigReader):
def __init__(self, fileName, name, **kwargs): _configOpts = [
ConfigReader.__init__(self, **kwargs) ["string", "ignoreregex", ""],
self.__file = fileName ["string", "failregex", ""],
self.__name = name ]
def setFile(self, fileName):
self.__file = fileName
def getFile(self):
return self.__file
def setName(self, name):
self.__name = name
def getName(self):
return self.__name
def read(self): def read(self):
return ConfigReader.read(self, "filter.d/" + self.__file) return ConfigReader.read(self, "filter.d/" + self._file)
def getOptions(self, pOpts):
opts = [["string", "ignoreregex", ""],
["string", "failregex", ""]]
self.__opts = ConfigReader.getOptions(self, "Definition", opts, pOpts)
def convert(self): def convert(self):
stream = list() stream = list()
for opt in self.__opts: for opt in self._opts:
if opt == "failregex": if opt == "failregex":
for regex in self.__opts[opt].split('\n'): for regex in self._opts[opt].split('\n'):
# Do not send a command if the rule is empty. # Do not send a command if the rule is empty.
if regex != '': if regex != '':
stream.append(["set", self.__name, "addfailregex", regex]) stream.append(["set", self._name, "addfailregex", regex])
elif opt == "ignoreregex": elif opt == "ignoreregex":
for regex in self.__opts[opt].split('\n'): for regex in self._opts[opt].split('\n'):
# Do not send a command if the rule is empty. # Do not send a command if the rule is empty.
if regex != '': if regex != '':
stream.append(["set", self.__name, "addignoreregex", regex]) stream.append(["set", self._name, "addignoreregex", regex])
return stream return stream

47
fail2ban/client/jailreader.py
Unescape View File

@ -38,7 +38,7 @@ logSys = logging.getLogger(__name__)
class JailReader(ConfigReader): class JailReader(ConfigReader):
actionCRE = re.compile("^((?:\w|-|_|\.)+)(?:\[(.*)\])?$") optionCRE = re.compile("^((?:\w|-|_|\.)+)(?:\[(.*)\])?$")
def __init__(self, name, force_enable=False, **kwargs): def __init__(self, name, force_enable=False, **kwargs):
ConfigReader.__init__(self, **kwargs) ConfigReader.__init__(self, **kwargs)
@ -78,8 +78,10 @@ class JailReader(ConfigReader):
if self.isEnabled(): if self.isEnabled():
# Read filter # Read filter
self.__filter = FilterReader(self.__opts["filter"], self.__name, filterName, filterOpt = JailReader.splitOption(
basedir=self.getBaseDir()) self.__opts["filter"])
self.__filter = FilterReader(
filterName, self.__name, filterOpt, basedir=self.getBaseDir())
ret = self.__filter.read() ret = self.__filter.read()
if ret: if ret:
self.__filter.getOptions(self.__opts) self.__filter.getOptions(self.__opts)
@ -92,8 +94,9 @@ class JailReader(ConfigReader):
try: try:
if not act: # skip empty actions if not act: # skip empty actions
continue continue
splitAct = JailReader.splitAction(act) actName, actOpt = JailReader.splitOption(act)
action = ActionReader(splitAct, self.__name, basedir=self.getBaseDir()) action = ActionReader(
actName, self.__name, actOpt, basedir=self.getBaseDir())
ret = action.read() ret = action.read()
if ret: if ret:
action.getOptions(self.__opts) action.getOptions(self.__opts)
@ -151,23 +154,23 @@ class JailReader(ConfigReader):
return stream return stream
#@staticmethod #@staticmethod
def splitAction(action): def splitOption(option):
m = JailReader.actionCRE.match(action) m = JailReader.optionCRE.match(option)
d = dict() d = dict()
mgroups = m.groups() mgroups = m.groups()
if len(mgroups) == 2: if len(mgroups) == 2:
action_name, action_opts = mgroups option_name, option_opts = mgroups
elif len(mgroups) == 1: elif len(mgroups) == 1:
action_name, action_opts = mgroups[0], None option_name, option_opts = mgroups[0], None
else: else:
raise ValueError("While reading action %s we should have got up to " raise ValueError("While reading option %s we should have got up to "
"2 groups. Got: %r" % (action, mgroups)) "2 groups. Got: %r" % (option, mgroups))
if not action_opts is None: if not option_opts is None:
# Huge bad hack :( This method really sucks. TODO Reimplement it. # Huge bad hack :( This method really sucks. TODO Reimplement it.
actions = "" options = ""
escapeChar = None escapeChar = None
allowComma = False allowComma = False
for c in action_opts: for c in option_opts:
if c in ('"', "'") and not allowComma: if c in ('"', "'") and not allowComma:
# Start # Start
escapeChar = c escapeChar = c
@ -178,20 +181,20 @@ class JailReader(ConfigReader):
allowComma = False allowComma = False
else: else:
if c == ',' and allowComma: if c == ',' and allowComma:
actions += "<COMMA>" options += "<COMMA>"
else: else:
actions += c options += c
# Split using , # Split using ,
actionsSplit = actions.split(',') optionsSplit = options.split(',')
# Replace the tag <COMMA> with , # Replace the tag <COMMA> with ,
actionsSplit = [n.replace("<COMMA>", ',') for n in actionsSplit] optionsSplit = [n.replace("<COMMA>", ',') for n in optionsSplit]
for param in actionsSplit: for param in optionsSplit:
p = param.split('=') p = param.split('=')
try: try:
d[p[0].strip()] = p[1].strip() d[p[0].strip()] = p[1].strip()
except IndexError: except IndexError:
logSys.error("Invalid argument %s in '%s'" % (p, action_opts)) logSys.error("Invalid argument %s in '%s'" % (p, option_opts))
return [action_name, d] return [option_name, d]
splitAction = staticmethod(splitAction) splitOption = staticmethod(splitOption)

6
fail2ban/tests/clientreadertestcase.py
Unescape View File

@ -112,10 +112,10 @@ class JailReaderTest(unittest.TestCase):
self.assertFalse(jail.isEnabled()) self.assertFalse(jail.isEnabled())
self.assertEqual(jail.getName(), 'ssh-iptables') self.assertEqual(jail.getName(), 'ssh-iptables')
def testSplitAction(self): def testSplitOption(self):
action = "mail-whois[name=SSH]" action = "mail-whois[name=SSH]"
expected = ['mail-whois', {'name': 'SSH'}] expected = ['mail-whois', {'name': 'SSH'}]
result = JailReader.splitAction(action) result = JailReader.splitOption(action)
self.assertEquals(expected, result) self.assertEquals(expected, result)
class FilterReaderTest(unittest.TestCase): class FilterReaderTest(unittest.TestCase):
@ -140,7 +140,7 @@ class FilterReaderTest(unittest.TestCase):
"+$<SKIPLINES>^.+ module for .* from <HOST>\\s*$"], "+$<SKIPLINES>^.+ module for .* from <HOST>\\s*$"],
['set', 'testcase01', 'addignoreregex', ['set', 'testcase01', 'addignoreregex',
"^.+ john from host 192.168.1.1\\s*$"]] "^.+ john from host 192.168.1.1\\s*$"]]
filterReader = FilterReader("testcase01", "testcase01") filterReader = FilterReader("testcase01", "testcase01", {})
filterReader.setBaseDir(TEST_FILES_DIR) filterReader.setBaseDir(TEST_FILES_DIR)
filterReader.read() filterReader.read()
#filterReader.getOptions(["failregex", "ignoreregex"]) #filterReader.getOptions(["failregex", "ignoreregex"])

Write Preview
Loading…
Cancel
Save