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

BF: fail2ban-regex adding duplicate lines with each regex 

This is another fix on top of e73b3dd to correctly resolve this issue
pull/272/head
Steven Hiscocks 2013-06-19 20:03:19 +01:00
parent 123ec3da13
commit f87c53fa52
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
bin/fail2ban-regex
View File

@ -250,6 +250,7 @@ class Fail2banRegex(object):
found = False found = False
for regex in self._ignoreregex: for regex in self._ignoreregex:
self._filter.addIgnoreRegex(regex.getFailRegex()) self._filter.addIgnoreRegex(regex.getFailRegex())
orgLineBuffer = self._filter._Filter__lineBuffer
for regex in self._failregex: for regex in self._failregex:
try: try:
self._filter.addFailRegex(regex.getFailRegex()) self._filter.addFailRegex(regex.getFailRegex())
@ -271,11 +272,9 @@ class Fail2banRegex(object):
return False return False
finally: finally:
self._filter.delFailRegex(0) self._filter.delFailRegex(0)
try: self._filter._Filter__lineBuffer = orgLineBuffer
del self._filter._Filter__lineBuffer[-1] if not found:
except IndexError: self._filter.processLine(line)
pass
self._filter.processLine(line)
for regex in self._ignoreregex: for regex in self._ignoreregex:
self._filter.delIgnoreRegex(0) self._filter.delIgnoreRegex(0)
return found return found