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

improve logging of date pattern (count of default templates added, info if it's filtered or used pre-match)

pull/2852/merge
sebres 2025-09-01 18:03:09 +02:00
parent 52399e6ef1
commit 6ac181f559
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
fail2ban/server/datedetector.py
View File

@ -252,6 +252,8 @@ class DateDetector(object):
"There is already a template with name %s" % name) "There is already a template with name %s" % name)
self.__known_names.add(name) self.__known_names.add(name)
self.__templates.append(DateDetectorTemplate(template)) self.__templates.append(DateDetectorTemplate(template))
logSys.debug(" date pattern regex for `%s`: `%s`",
getattr(template, 'pattern', ''), template.regex)
def appendTemplate(self, template): def appendTemplate(self, template):
"""Add a date template to manage and use in search of dates. """Add a date template to manage and use in search of dates.
@ -290,15 +292,14 @@ class DateDetector(object):
DD_patternCache.set(key, template) DD_patternCache.set(key, template)
self._appendTemplate(template) self._appendTemplate(template)
logSys.info(" date pattern `%r`: `%s`", logSys.info(" date pattern `%s`: `%s`",
getattr(template, 'pattern', ''), template.name) getattr(template, 'pattern', ''), template.name)
logSys.debug(" date pattern regex for %r: %s",
getattr(template, 'pattern', ''), template.regex)
def addDefaultTemplate(self, filterTemplate=None, preMatch=None, allDefaults=True): def addDefaultTemplate(self, filterTemplate=None, preMatch=None, allDefaults=True):
"""Add Fail2Ban's default set of date templates. """Add Fail2Ban's default set of date templates.
""" """
ignoreDup = len(self.__templates) > 0 ignoreDup = len(self.__templates) > 0
cnt = 0
for template in ( for template in (
DateDetector._defCache.templates if allDefaults else DateDetector._defCache.defaultTemplates DateDetector._defCache.templates if allDefaults else DateDetector._defCache.defaultTemplates
): ):
@ -311,6 +312,11 @@ class DateDetector(object):
wrap=lambda s: RE_DATE_PREMATCH.sub(lambda m: DateTemplate.unboundPattern(s), preMatch)) wrap=lambda s: RE_DATE_PREMATCH.sub(lambda m: DateTemplate.unboundPattern(s), preMatch))
# append date detector template (ignore duplicate if some was added before default): # append date detector template (ignore duplicate if some was added before default):
self._appendTemplate(template, ignoreDup=ignoreDup) self._appendTemplate(template, ignoreDup=ignoreDup)
cnt += 1
if preMatch:
logSys.info(" default date pattern for `%r`: %d template(s)", preMatch, cnt)
else:
logSys.info(" default %sdate pattern: %d template(s)", "filtered " if filterTemplate else "", cnt)
@property @property
def templates(self): def templates(self):