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

BF: Multiline regex now works with log line strip of "\r\n"

pull/218/head
Steven Hiscocks 2013-05-08 21:57:23 +01:00
parent f5dfa610e6
commit d4e5c174e2
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fail2ban/server/failregex.py
View File

@ -117,7 +117,7 @@ class Regex:
n += 1 n += 1
except IndexError: except IndexError:
break break
return skippedLines.splitlines(True) return skippedLines.splitlines(False)
## ##
# Returns unmatched lines. # Returns unmatched lines.
@ -129,9 +129,9 @@ class Regex:
if not self.hasMatched(): if not self.hasMatched():
return [] return []
unmatchedLines = ( unmatchedLines = (
self._matchCache.string[:self._matchLineStart].splitlines(True) self._matchCache.string[:self._matchLineStart].splitlines(False)
+ self.getSkippedLines() + self.getSkippedLines()
+ self._matchCache.string[self._matchLineEnd:].splitlines(True)) + self._matchCache.string[self._matchLineEnd:].splitlines(False))
return unmatchedLines return unmatchedLines
## ##
@ -145,7 +145,7 @@ class Regex:
if not self.hasMatched(): if not self.hasMatched():
return [] return []
matchedLines = self._matchCache.string[ matchedLines = self._matchCache.string[
self._matchLineStart:self._matchLineEnd].splitlines(True) self._matchLineStart:self._matchLineEnd].splitlines(False)
return [line for line in matchedLines return [line for line in matchedLines
if line not in self.getSkippedLines()] if line not in self.getSkippedLines()]

5
fail2ban/server/filter.py
View File

@ -325,7 +325,7 @@ class Filter(JailThread):
logLine = line logLine = line
self.__lineBuffer = ((self.__lineBuffer + self.__lineBuffer = ((self.__lineBuffer +
[logLine])[-self.__lineBufferSize:]) [logLine])[-self.__lineBufferSize:])
return self.findFailure(timeLine, "".join(self.__lineBuffer)) return self.findFailure(timeLine, "\n".join(self.__lineBuffer) + "\n")
def processLineAndAdd(self, line): def processLineAndAdd(self, line):
"""Processes the line for failures and populates failManager """Processes the line for failures and populates failManager
@ -373,7 +373,8 @@ class Filter(JailThread):
failRegex.search(logLine) failRegex.search(logLine)
if failRegex.hasMatched(): if failRegex.hasMatched():
# Checks if we must ignore this match. # Checks if we must ignore this match.
if self.ignoreLine("".join(failRegex.getMatchedLines())): if self.ignoreLine(
"\n".join(failRegex.getMatchedLines()) + "\n"):
# The ignoreregex matched. Remove ignored match. # The ignoreregex matched. Remove ignored match.
self.__lineBuffer = failRegex.getUnmatchedLines() self.__lineBuffer = failRegex.getUnmatchedLines()
continue continue