[PATCH proxmox v7 19/41] notify: matcher: expression: reject ambiguous field matchers

[Lukas Wagner <l.wagner@proxmox.com>]

Otherwise, API users could create field matchers that set both, the
'values' and the 'regex' field, with one field being ignored when
serialized/evaluated.

Suggested-by: Michael Köppl <m.koeppl@proxmox.com>
Signed-off-by: Lukas Wagner <l.wagner@proxmox.com>
Tested-by: Michael Köppl <m.koeppl@proxmox.com>
Reviewed-by: Michael Köppl <m.koeppl@proxmox.com>
---

Notes:
    New in v5.

 proxmox-notify/src/matcher/expression.rs | 15 +++++++++++++++
 proxmox-notify/src/matcher/field.rs      |  2 +-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/proxmox-notify/src/matcher/expression.rs b/proxmox-notify/src/matcher/expression.rs
index 55c71cc4..df9fe439 100644
--- a/proxmox-notify/src/matcher/expression.rs
+++ b/proxmox-notify/src/matcher/expression.rs
@@ -94,4 +94,19 @@ mod test {
 
         let _: Expression<NotificationMatcher> = serde_json::from_str(e).unwrap();
     }
+
+    #[test]
+    fn test_field_matcher_ambigious_variant() {
+        let e = r#"
+            {
+              "match": {
+                "type": "field",
+                "field": "something",
+                "regex": "^abc$",
+                "values": ["a", "b"]
+                }
+            }"#;
+
+        assert!(serde_json::from_str::<Expression<NotificationMatcher>>(e).is_err());
+    }
 }
diff --git a/proxmox-notify/src/matcher/field.rs b/proxmox-notify/src/matcher/field.rs
index 11459cb8..e0d36238 100644
--- a/proxmox-notify/src/matcher/field.rs
+++ b/proxmox-notify/src/matcher/field.rs
@@ -10,7 +10,7 @@ use super::MatchDirective;
 
 /// Check if the notification metadata fields match
 #[derive(Clone, Debug, Serialize, Deserialize)]
-#[serde(rename_all = "kebab-case", untagged)]
+#[serde(rename_all = "kebab-case", untagged, deny_unknown_fields)]
 pub enum FieldMatcher {
     Exact {
         field: String,
-- 
2.47.3