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

misc: fix (more) escape warnings in re patterns
---

diff --git a/suricata/update/engine.py b/suricata/update/engine.py
index c57da82..22ad9b3 100644
--- a/suricata/update/engine.py
+++ b/suricata/update/engine.py
@@ -135,7 +135,7 @@ def get_path(program="suricata"):
     return None
 
 def parse_version(buf):
-    m = re.search("((\d+)\.(\d+)(\.(\d+))?([\w\-]+)?)", str(buf).strip())
+    m = re.search(r"((\d+)\.(\d+)(\.(\d+))?([\w\-]+)?)", str(buf).strip())
     if m:
         full = m.group(1)
         major = int(m.group(2))
diff --git a/suricata/update/matchers.py b/suricata/update/matchers.py
index e886c79..56a9e29 100644
--- a/suricata/update/matchers.py
+++ b/suricata/update/matchers.py
@@ -251,7 +251,7 @@ class ModifyRuleFilter(object):
         pattern = re.compile(a)
 
         # Convert Oinkmaster backticks to Python.
-        b = re.sub("\$\{(\d+)\}", "\\\\\\1", b)
+        b = re.sub(r"\$\{(\d+)\}", "\\\\\\1", b)
 
         return cls(matcher, pattern, b)
 
@@ -269,7 +269,7 @@ class DropRuleFilter(object):
 
     def run(self, rule):
         drop_rule = suricata.update.rule.parse(re.sub(
-            "^\w+", "drop", rule.raw))
+            r"^\w+", "drop", rule.raw))
         drop_rule.enabled = rule.enabled
         return drop_rule
 
@@ -284,7 +284,7 @@ class AddMetadataFilter(object):
         return self.matcher.match(rule)
 
     def run(self, rule):
-        new_rule_string = re.sub(";\s*\)$", "; metadata: {} {};)".format(self.key, self.val), rule.format())
+        new_rule_string = re.sub(r";\s*\)$", "; metadata: {} {};)".format(self.key, self.val), rule.format())
         new_rule = suricata.update.rule.parse(new_rule_string, rule.group)
         if not new_rule:
             logger.error("Rule is not valid after adding metadata: [{}]: {}".format(rule.idstr, new_rule_string))
diff --git a/suricata/update/osinfo.py b/suricata/update/osinfo.py
index 82816bc..c3e417b 100644
--- a/suricata/update/osinfo.py
+++ b/suricata/update/osinfo.py
@@ -27,7 +27,7 @@ def parse_os_release(filename="/etc/os-release"):
     with open(filename) as fileobj:
         for line in fileobj:
             line = line.strip()
-            m = re.match("^(\w+)=\"?(.*?)\"?$", line)
+            m = re.match(r"^(\w+)=\"?(.*?)\"?$", line)
             if m:
                 os_release[m.group(1)] = m.group(2)
     return os_release
diff --git a/suricata/update/rule.py b/suricata/update/rule.py
index 42c673e..169af6c 100644
--- a/suricata/update/rule.py
+++ b/suricata/update/rule.py
@@ -436,4 +436,4 @@ def parse_var_names(var):
     """ Parse out the variable names from a string. """
     if var is None:
         return []
-    return re.findall("\$([\w_]+)", var)
+    return re.findall(r"\$([\w_]+)", var)