From: Jason Ish <jason.ish@oisf.net>
Date: Thu, 15 Feb 2024 16:50:23 +0000 (-0600)
Subject: misc: fix escape warnings in re patterns
X-Git-Tag: 1.3.1~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7c8f5678a3670505bd83584c3f73d29bdab7da20;p=thirdparty%2Fsuricata-update.git

misc: fix escape warnings in re patterns
---

diff --git a/suricata/update/main.py b/suricata/update/main.py
index 455a3d5..50c22df 100644
--- a/suricata/update/main.py
+++ b/suricata/update/main.py
@@ -464,7 +464,7 @@ def handle_dataset_files(rule, dep_files):
         dataset_contents = dep_files[source_filename]
 
     content_hash = hashlib.md5(dataset_contents).hexdigest()
-    new_rule = re.sub("(dataset.*?load\s+){}".format(dataset_filename), "\g<1>datasets/{}".format(content_hash), rule.format())
+    new_rule = re.sub(r"(dataset.*?load\s+){}".format(dataset_filename), r"\g<1>datasets/{}".format(content_hash), rule.format())
     dest_filename = os.path.join(config.get_output_dir(), "datasets", content_hash)
     dest_dir = os.path.dirname(dest_filename)
     logger.debug("Copying dataset file {} to {}".format(dataset_filename, dest_filename))
@@ -699,9 +699,9 @@ def resolve_flowbits(rulemap, disabled_rules):
 class ThresholdProcessor:
 
     patterns = [
-        re.compile("\s+(re:\"(.*)\")"),
-        re.compile("\s+(re:(.*?)),.*"),
-        re.compile("\s+(re:(.*))"),
+        re.compile(r"\s+(re:\"(.*)\")"),
+        re.compile(r"\s+(re:(.*?)),.*"),
+        re.compile(r"\s+(re:(.*))"),
     ]
 
     def extract_regex(self, buf):
@@ -1183,7 +1183,7 @@ def _main():
     # Disable rule that are for app-layers that are not enabled.
     if suriconf:
         for key in suriconf.keys():
-            m = re.match("app-layer\.protocols\.([^\.]+)\.enabled", key)
+            m = re.match(r"app-layer\.protocols\.([^\.]+)\.enabled", key)
             if m:
                 proto = m.group(1)
                 if not suriconf.is_true(key, ["detection-only"]):
diff --git a/tests/test_main.py b/tests/test_main.py
index 86fa486..919b88b 100644
--- a/tests/test_main.py
+++ b/tests/test_main.py
@@ -127,7 +127,7 @@ class ModifyRuleFilterTestCase(unittest.TestCase):
 
     def test_id_match(self):
         rule0 = suricata.update.rule.parse(self.rule_string)
-        line = '2020757 "\|0d 0a\|" "|ff ff|"'
+        line = r'2020757 "\|0d 0a\|" "|ff ff|"'
         rule_filter = matchers_mod.ModifyRuleFilter.parse(line)
         self.assertTrue(rule_filter != None)
         self.assertTrue(rule_filter.match(rule0))
@@ -138,7 +138,7 @@ class ModifyRuleFilterTestCase(unittest.TestCase):
 
     def test_re_match(self):
         rule0 = suricata.update.rule.parse(self.rule_string)
-        line = 're:classtype:trojan-activity "\|0d 0a\|" "|ff ff|"'
+        line = r're:classtype:trojan-activity "\|0d 0a\|" "|ff ff|"'
         rule_filter = matchers_mod.ModifyRuleFilter.parse(line)
         self.assertTrue(rule_filter != None)
         self.assertTrue(rule_filter.match(rule0))