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

BF: fail2ban-regex date detector template hits count now correct 

closes #295
pull/298/merge
Steven Hiscocks 2013-07-15 18:40:32 +01:00
parent 4855cae487
commit 2c8747cc76
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fail2ban-regex
View File

@ -46,6 +46,7 @@ from client.configparserinc import SafeConfigParserWithIncludes
from ConfigParser import NoOptionError, NoSectionError, MissingSectionHeaderError from ConfigParser import NoOptionError, NoSectionError, MissingSectionHeaderError
from server.filter import Filter from server.filter import Filter
from server.failregex import RegexException from server.failregex import RegexException
from server.datedetector import DateDetector
from testcases.utils import FormatterWithTraceBack from testcases.utils import FormatterWithTraceBack
# Gets the instance of the logger. # Gets the instance of the logger.
@ -172,6 +173,8 @@ class Fail2banRegex(object):
self._ignoreregex = list() self._ignoreregex = list()
self._failregex = list() self._failregex = list()
self._line_stats = LineStats() self._line_stats = LineStats()
self._dateDetector = DateDetector()
self._dateDetector.addDefaultTemplate()
def readRegex(self, value, regextype): def readRegex(self, value, regextype):
@ -256,6 +259,9 @@ class Fail2banRegex(object):
if line.startswith('# ') or not line.strip(): if line.startswith('# ') or not line.strip():
# skip comment and empty lines # skip comment and empty lines
continue continue
self._dateDetector.matchTime(line)
is_ignored = fail2banRegex.testIgnoreRegex(line) is_ignored = fail2banRegex.testIgnoreRegex(line)
if is_ignored: if is_ignored:
self._line_stats.ignored_lines.append(line) self._line_stats.ignored_lines.append(line)
@ -312,7 +318,7 @@ class Fail2banRegex(object):
print "\nDate template hits:" print "\nDate template hits:"
out = [] out = []
for template in self._filter.dateDetector.getTemplates(): for template in self._dateDetector.getTemplates():
if self._verbose or template.getHits(): if self._verbose or template.getHits():
out.append("[%d] %s" % (template.getHits(), template.getName())) out.append("[%d] %s" % (template.getHits(), template.getName()))
pprint_list(out, "[# of hits] date format") pprint_list(out, "[# of hits] date format")