From 3d04a99d25cc802d127f1eee19200214785354a6 Mon Sep 17 00:00:00 2001 From: sebres Date: Sat, 15 Jun 2019 22:08:31 +0200 Subject: [PATCH] fail2ban-regex: (verbose only) avoid errors by dump of real options (if filter doesn't have some optional parameter, like `datepattern`) --- fail2ban/client/fail2banregex.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fail2ban/client/fail2banregex.py b/fail2ban/client/fail2banregex.py index d80af23f..9279174c 100644 --- a/fail2ban/client/fail2banregex.py +++ b/fail2ban/client/fail2banregex.py @@ -293,7 +293,10 @@ class Fail2banRegex(object): for k in ['logtype', 'datepattern'] + fltOpt.keys(): # combined options win, but they contain only a sub-set in filter expected keys, # so get the rest from definition section: - realopts[k] = combopts[k] if k in combopts else reader.get('Definition', k) + try: + realopts[k] = combopts[k] if k in combopts else reader.get('Definition', k) + except NoOptionError: # pragma: no cover + pass output("Real filter options : %r" % realopts) def readRegex(self, value, regextype):