Merge branch 'fix_matcher' into 'master'

Fix matcher parsing

See merge request !2501

core/matcher.py

@@ -37,6 +37,8 @@ def match(ctx, expr):
                 return False
             if isinstance(expr[x], dict):
                 for m in expr[x]:
+                    if ctx[x] is None:
+                        continue
                     mf = matchers.get(m)
                     if mf and not isinstance(expr[x][m], tuple):
                         if not mf(ctx[x], expr[x][m]):

tests/test_matcher.py

@@ -49,6 +49,12 @@ def test_eq_and(raw, config, expected):
             {"platform": {"$regex": "^S"}, "vendor": "Dell"},
             False,
         ),
+        (
+            {"vendor": "Eltex", "image": "_image.bin"},
+            {"image": {"$regex": r"^\S+"}, "vendor": "Eltex"},
+            True,
+        ),
+        ({"vendor": "Eltex"}, {"image": {"$regex": r"^\S+"}, "vendor": "Eltex"}, False),
     ],
 )
 def test_regex(raw, config, expected):