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

Merge branch '0.10' into 0.11

pull/2302/head
sebres 2019-05-24 16:18:32 +02:00
parent 5137cd2ec8 3b51c005f8
commit f48677db7d
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -63,6 +63,11 @@ ver. 0.10.5-dev-1 (20??/??/??) - development edition
-----------
### Fixes
* [grave] fixed parsing of multi-line filters (`maxlines` > 1) together with systemd backend,
now systemd-filter replaces newlines in message from systemd journal with `\n` (otherwise
multi-line parsing may be broken, because removal of matched string from multi-line buffer window
is confused by such extra new-lines, so they are retained and got matched on every followed
message, see gh-2431)
* fixed read of included config-files (`.local` overwrites options of `.conf` for config-files
included with before/after)
* `action.d/helpers-common.conf`: rewritten grep arguments, now options `-wF` used to match only

2
fail2ban/server/filtersystemd.py
View File

@ -236,7 +236,7 @@ class FilterSystemd(JournalFilter): # pragma: systemd no cover
logSys.log(5, "[%s] Read systemd journal entry: %s %s", self.jailName,
date.isoformat(), logline)
## use the same type for 1st argument:
return ((logline[:0], date.isoformat(), logline),
return ((logline[:0], date.isoformat(), logline.replace('\n', '\\n')),
time.mktime(date.timetuple()) + date.microsecond/1.0E6)
def seekToTime(self, date):