fix(23): properly parsing regex as Option<Regex> (#24)

eclipse-zenoh · Dec 8, 2023 · 1919225 · 1919225
1 parent aaffebf
commit 1919225
Showing 1 changed file with 11 additions and 4 deletions.
diff --git a/zenoh-plugin-mqtt/src/config.rs b/zenoh-plugin-mqtt/src/config.rs
@@ -129,10 +129,17 @@ fn deserialize_regex<'de, D>(deserializer: D) -> Result<Option<Regex>, D::Error>
 where
     D: Deserializer<'de>,
 {
-    let s: String = Deserialize::deserialize(deserializer)?;
-    Regex::new(&s)
-        .map(Some)
-        .map_err(|e| de::Error::custom(format!("Invalid regex 'allow={s}': {e}")))
+    let s: Option<String> = Deserialize::deserialize(deserializer)?;
+
+    match s {
+        Some(s) => Regex::new(&s).map(Some).map_err(|e| {
+            de::Error::custom(format!(
+                r#"Invalid regex for 'allow' or 'deny': "{s}" - {e}"#
+            ))
+        }),
+
+        None => Ok(None),
+    }
 }
 
 fn serialize_allow<S>(v: &Option<Regex>, serializer: S) -> Result<S::Ok, S::Error>