Merge ~ltrager/maas:lp1891027 into maas:master

[Lee Trager]

LP: #1891027 - Escape NodeMetadata information before constructing the regex.

[MAAS Lander (maas-lander)]

UNIT TESTS
-b lp1891027 lp:~ltrager/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: fa8017803fb8f42ea987f396ec94fc797c093f53

review: Approve

[Dougal Matthews (d0ugal)]

LGTM. One question inline about fnmatch.translate

review: Approve

[Adam Collard (adam-collard)]

Discussed this morning and we think this can be much simpler (see https://code.launchpad.net/~d0ugal/maas/+git/maas/+merge/389147 )

review: Disapprove

Unmerged commits

fa80178... by Lee Trager on 2020-08-12

LP: #1891027 - Escape NodeMetadata information before constructing the regex.

diff --git a/src/metadataserver/models/scriptset.py b/src/metadataserver/models/scriptset.py
index 6b4889b..9223de9 100644
--- a/src/metadataserver/models/scriptset.py
+++ b/src/metadataserver/models/scriptset.py
@@ -5,7 +5,6 @@ __all__ = ["ScriptSet", "get_status_from_qs", "translate_result_type"]
 
 from contextlib import suppress
 from datetime import timedelta
-import fnmatch
 import re
 
 from django.contrib.postgres.fields import ArrayField
@@ -238,7 +237,7 @@ class ScriptSetManager(Manager):
             | Q(key__startswith="firmware_")
             | Q(key__startswith="chassis_")
         ):
-            regexes.append("%s:%s" % (nmd.key, fnmatch.translate(nmd.value)))
+            regexes.append(re.escape("%s:%s" % (nmd.key, nmd.value)))
         if len(regexes) > 0:
             node_hw_regex = re.compile("^%s$" % "|".join(regexes), re.I)
         else:
@@ -481,7 +480,7 @@ class ScriptSet(CleanSave, Model):
             | Q(key__startswith="firmware_")
             | Q(key__startswith="chassis_")
         ):
-            regexes.append("%s:%s" % (nmd.key, fnmatch.translate(nmd.value)))
+            regexes.append(re.escape("%s:%s" % (nmd.key, nmd.value)))
         if len(regexes) > 0:
             node_hw_regex = re.compile("^%s$" % "|".join(regexes), re.I)
         else:
diff --git a/src/metadataserver/models/tests/test_scriptset.py b/src/metadataserver/models/tests/test_scriptset.py
index d3597cb..5085090 100644
--- a/src/metadataserver/models/tests/test_scriptset.py
+++ b/src/metadataserver/models/tests/test_scriptset.py
@@ -1201,6 +1201,29 @@ class TestScriptSet(MAASServerTestCase):
             [script_result.name for script_result in script_set],
         )
 
+    def test_select_for_hardware_scripts_with_bracket_in_firmware(self):
+        # Regression test for LP:1891213
+        node = factory.make_Node()
+        factory.make_NodeMetadata(
+            node=node,
+            key="mainboard_firmware_version",
+            value="-[IVE156L-2.61]-",
+        )
+        script = factory.make_Script(
+            script_type=SCRIPT_TYPE.COMMISSIONING,
+            for_hardware=["mainboard_firmware_version:-[IVE156L-2.61]-"],
+        )
+        script_set = ScriptSet.objects.create_commissioning_script_set(
+            node, [random.choice(script.tags)]
+        )
+
+        script_set.select_for_hardware_scripts()
+
+        self.assertItemsEqual(
+            list(NODE_INFO_SCRIPTS) + [script.name],
+            [script_result.name for script_result in script_set],
+        )
+
     def test_regenerate_storage(self):
         node = factory.make_Node(interface=True)
         script_set = factory.make_ScriptSet(node=node)