diff options
| author | sebres <serg.brester@sebres.de> | 2017-03-24 12:05:51 +0100 |
|---|---|---|
| committer | sebres <serg.brester@sebres.de> | 2017-03-24 13:20:04 +0100 |
| commit | bc888e07533bcebd81a9fedf7ce846d86851d63b (patch) | |
| tree | 97c71abbfd8772ec29ef09675fe6f8e7af16a03b /fail2ban/server/failregex.py | |
| parent | 61c1bdfe79a98be3f1aa7ccb2957bf2299d768fc (diff) | |
| download | fail2ban-bc888e07533bcebd81a9fedf7ce846d86851d63b.tar.gz | |
Regex compiled in multi-line parsing mode only if `maxlines` > 1 (buffering), if however expected - prefix `(?m)` could be used in regex to enable it;
Removed warning "Mutliline regex set for jail ... but maxlines not greater than 1", because can be expected situation now:
non multi-line entry from systemd-filter containing new-lines (that should be ignored by anchors resp. entry parsed as single string);
small code review;
Diffstat (limited to 'fail2ban/server/failregex.py')
| -rw-r--r-- | fail2ban/server/failregex.py | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/fail2ban/server/failregex.py b/fail2ban/server/failregex.py index c1e7107a..d5c9345f 100644 --- a/fail2ban/server/failregex.py +++ b/fail2ban/server/failregex.py @@ -111,9 +111,8 @@ class Regex: # if regex.lstrip() == '': raise RegexException("Cannot add empty regex") - flags = re.MULTILINE if (multiline or "\n" in regex or r"\n" in regex) else 0 try: - self._regexObj = re.compile(regex, flags) + self._regexObj = re.compile(regex, re.MULTILINE if multiline else 0) self._regex = regex except sre_constants.error: raise RegexException("Unable to compile regular expression '%s'" % @@ -122,11 +121,6 @@ class Regex: def __str__(self): return "%s(%r)" % (self.__class__.__name__, self._regex) - @property - def flags(self): - """Returns the regex matching flags combination of the compiled regex object""" - return self._regexObj.flags - ## # Replaces "<HOST>", "<IP4>", "<IP6>", "<FID>" with default regular expression for host # |