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

ENH: Added datepattern option to fail2ban-regex

pull/214/merge^2
Steven Hiscocks 2013-05-04 17:12:33 +01:00
parent 20049dd3a0
commit 7371d2a271
1 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
bin/fail2ban-regex
View File

@ -111,6 +111,8 @@ class Fail2banRegex:
print " -V, --version print the version" print " -V, --version print the version"
print " -v, --verbose verbose output" print " -v, --verbose verbose output"
print " -l INT, --maxlines=INT set maxlines for multi-line regex default: 1" print " -l INT, --maxlines=INT set maxlines for multi-line regex default: 1"
print " -d PATTERN --datepattern=PATTERN"
print " set a custom pattern used to match date/times"
print print
print "Log:" print "Log:"
print " string a string representing a log line" print " string a string representing a log line"
@ -132,6 +134,9 @@ class Fail2banRegex:
self.__filter.setMaxLines(int(v)) self.__filter.setMaxLines(int(v))
self.__maxlines_set = True self.__maxlines_set = True
def setDatePattern(self, pattern):
self.__filter.setDatePattern(pattern)
def getCmdLineOptions(self, optList): def getCmdLineOptions(self, optList):
""" Gets the command line options """ Gets the command line options
""" """
@ -154,6 +159,13 @@ class Fail2banRegex:
opt[1]) opt[1])
fail2banRegex.dispUsage() fail2banRegex.dispUsage()
sys.exit(-1) sys.exit(-1)
elif opt[0] in ["-d", "--datepattern"]:
try:
self.setDatePattern(opt[1])
except (TypeError, ValueError), e:
print "Invalid date pattern: '%s': %s" % (opt[1], e)
fail2banRegex.dispUsage()
sys.exit(1)
#@staticmethod #@staticmethod
def logIsFile(value): def logIsFile(value):
@ -165,7 +177,7 @@ class Fail2banRegex:
reader = SafeConfigParserWithIncludes(defaults=self.CONFIG_DEFAULTS) reader = SafeConfigParserWithIncludes(defaults=self.CONFIG_DEFAULTS)
try: try:
reader.read(value) reader.read(value)
print "Use ignoreregex file : " + value print "Use ignoreregex file\t " + value
self.__ignoreregex = [RegexStat(m) self.__ignoreregex = [RegexStat(m)
for m in reader.get("Definition", "ignoreregex").split('\n')] for m in reader.get("Definition", "ignoreregex").split('\n')]
except NoSectionError: except NoSectionError:
@ -185,7 +197,7 @@ class Fail2banRegex:
stripReg = value[0:50] + "..." stripReg = value[0:50] + "..."
else: else:
stripReg = value stripReg = value
print "Use ignoreregex line : " + stripReg print "Use ignoreregex line\t: " + stripReg
self.__ignoreregex = [RegexStat(value)] self.__ignoreregex = [RegexStat(value)]
return True return True
@ -194,7 +206,7 @@ class Fail2banRegex:
reader = SafeConfigParserWithIncludes(defaults=self.CONFIG_DEFAULTS) reader = SafeConfigParserWithIncludes(defaults=self.CONFIG_DEFAULTS)
try: try:
reader.read(value) reader.read(value)
print "Use regex file : " + value print "Use regex file\t\t: " + value
self.__failregex = [RegexStat(m) self.__failregex = [RegexStat(m)
for m in reader.get("Definition", "failregex").split('\n')] for m in reader.get("Definition", "failregex").split('\n')]
except NoSectionError: except NoSectionError:
@ -228,10 +240,13 @@ class Fail2banRegex:
stripReg = value[0:50] + "..." stripReg = value[0:50] + "..."
else: else:
stripReg = value stripReg = value
print "Use regex line : " + stripReg print "Use regex line\t\t: " + stripReg
self.__failregex = [RegexStat(value)] self.__failregex = [RegexStat(value)]
print "Use maxlines : %d" % self.__filter.getMaxLines() print "Use maxlines\t\t: %d" % self.__filter.getMaxLines()
datepattern = self.__filter.getDatePattern()
if datepattern:
print "Use date pattern\t: %s (%s)" % self.__filter.getDatePattern()
return True return True
def testIgnoreRegex(self, line): def testIgnoreRegex(self, line):
@ -347,8 +362,9 @@ if __name__ == "__main__":
fail2banRegex = Fail2banRegex() fail2banRegex = Fail2banRegex()
# Reads the command line options. # Reads the command line options.
try: try:
cmdOpts = 'hVcvl:e:' cmdOpts = 'hVcvl:e:d:'
cmdLongOpts = ['help', 'version', 'verbose', 'maxlines=', 'encoding='] cmdLongOpts = ['help', 'version', 'verbose', 'maxlines=', 'encoding=',
'datepattern=']
optList, args = getopt.getopt(sys.argv[1:], cmdOpts, cmdLongOpts) optList, args = getopt.getopt(sys.argv[1:], cmdOpts, cmdLongOpts)
except getopt.GetoptError: except getopt.GetoptError:
fail2banRegex.dispUsage() fail2banRegex.dispUsage()
@ -376,8 +392,8 @@ if __name__ == "__main__":
if fail2banRegex.logIsFile(cmd_log): if fail2banRegex.logIsFile(cmd_log):
try: try:
hdlr = open(cmd_log, 'rb') hdlr = open(cmd_log, 'rb')
print "Use log file : " + cmd_log print "Use log file\t\t: " + cmd_log
print "Use encoding : " + fail2banRegex.encoding print "Use encoding\t\t: " + fail2banRegex.encoding
print print
for line in hdlr: for line in hdlr:
try: try:
@ -396,7 +412,7 @@ if __name__ == "__main__":
stripLog = cmd_log[0:50] + "..." stripLog = cmd_log[0:50] + "..."
else: else:
stripLog = cmd_log stripLog = cmd_log
print "Use single line: " + stripLog print "Use single line\t\t: " + stripLog
print print
fail2banRegex.testIgnoreRegex(cmd_log) fail2banRegex.testIgnoreRegex(cmd_log)
fail2banRegex.testRegex(cmd_log) fail2banRegex.testRegex(cmd_log)