From: Jason Ish <jason.ish@oisf.net>
Date: Wed, 8 Apr 2020 17:38:17 +0000 (-0600)
Subject: modify filters: better error on badly formatted filter
X-Git-Tag: 1.2.0rc1~19
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=da51abb197cdb592311c19e5c140a4f4a138e5e0;p=thirdparty%2Fsuricata-update.git

modify filters: better error on badly formatted filter

Instead of exiting with an uncaught exception on a badly formatted
modify filter, convert the exception to an ApplicationError that
will be logged, along with the line that is badly formatted.

Redmine issue:
https://redmine.openinfosecfoundation.org/issues/3536
---

diff --git a/suricata/update/main.py b/suricata/update/main.py
index b926ae8..bbb95f1 100644
--- a/suricata/update/main.py
+++ b/suricata/update/main.py
@@ -237,11 +237,12 @@ def load_filters(filename):
             line = line.rsplit(" #")[0]
 
             line = re.sub(r'\\\$', '$', line)  # needed to escape $ in pp
-            rule_filter = matchers_mod.ModifyRuleFilter.parse(line)
-            if rule_filter:
+            try:
+                rule_filter = matchers_mod.ModifyRuleFilter.parse(line)
                 filters.append(rule_filter)
-            else:
-                log.error("Failed to parse modify filter: %s" % (line))
+            except Exception as err:
+                raise exceptions.ApplicationError(
+                    "Failed to parse modify filter: {}".format(line))
 
     return filters