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

closes gh-2395: safe conversion of `SYSLOG_PID` or `_PID` (if journal entry contains a string instead of numeric)

pull/2369/merge
Sergey G. Brester 2019-04-03 23:58:23 +02:00 committed by GitHub
parent 7a7a905ab2
commit 7a463eb3f7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
fail2ban/server/filtersystemd.py
View File

@ -204,7 +204,14 @@ class FilterSystemd(JournalFilter): # pragma: systemd no cover
if not v: if not v:
v = logentry.get('_PID') v = logentry.get('_PID')
if v: if v:
logelements[-1] += ("[%i]" % v) try: # [integer] (if already numeric):
v = "[%i]" % v
except TypeError:
try: # as [integer] (try to convert to int):
v = "[%i]" % int(v, 0)
except (TypeError, ValueError): # fallback - [string] as it is
v = "[%s]" % v
logelements[-1] += v
logelements[-1] += ":" logelements[-1] += ":"
if logelements[-1] == "kernel:": if logelements[-1] == "kernel:":
if '_SOURCE_MONOTONIC_TIMESTAMP' in logentry: if '_SOURCE_MONOTONIC_TIMESTAMP' in logentry: