Stage 1.0.7/v1

.travis.yml

@@ -2,7 +2,6 @@ language: python
 
 python:
   - "2.7"
-  - "3.4"
   - "3.5"
   - "3.6"
 

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Change Log
 
+## 1.0.7 - YYYY-MM-DD
+- Better error on bad modify filter:
+  https://redmine.openinfosecfoundation.org/issues/3536
+
 ## 1.0.6 - 2019-12-11
 - If Suricata is less than 5, and Rust is not enabled, disable smb
   rules as they require

suricata/update/main.py

@@ -448,11 +448,13 @@ def load_filters(filename):
             line = line.rsplit(" #")[0]
 
             line = re.sub(r'\\\$', '$', line)  # needed to escape $ in pp
-            filter = ModifyRuleFilter.parse(line)
-            if filter:
-                filters.append(filter)
-            else:
-                log.error("Failed to parse modify filter: %s" % (line))
+            try:
+                rule_filter = ModifyRuleFilter.parse(line)
+                if rule_filter:
+                    filters.append(rule_filter)
+            except Exception as err:
+                raise exceptions.ApplicationError(
+                    "Failed to parse modify filter: {}".format(line))
 
     return filters
 

suricata/update/version.py

@@ -4,4 +4,4 @@
 # Alpha: 1.0.0a1
 # Development: 1.0.0.dev0
 # Release candidate: 1.0.0rc1
-version = "1.0.6"
+version = "1.0.7"

tox-integration.ini

@@ -4,7 +4,7 @@
 # and then run "tox" from this directory.
 
 [tox]
-envlist = py27, py34, py35, py36, py37
+envlist = py27, py35, py36, py37
 
 [testenv]
 commands = python ./tests/integration_tests.py

tox.ini

@@ -4,7 +4,7 @@
 # and then run "tox" from this directory.
 
 [tox]
-envlist = py27, py34, py35, py36, py37
+envlist = py27, py35, py36, py37
 
 [testenv]
 commands = pytest