chore: serialize as filter directly from serde, fix check_acl_config

Author: SharksT

.gitignore

@@ -6,3 +6,4 @@ foxmq.d/
 
 # These are test keys and must not be used anywhere else.
 !/tests/dmq
+.env

src/config/acl.rs

@@ -1,27 +1,40 @@
-use std::path::Path;
+use std::{path::Path, str::FromStr};
 
 use tashi_collections::HashMap;
 
-use crate::mqtt::trie::Filter;
+use crate::mqtt::trie::{Filter, TopicName};
 
-#[derive(serde::Deserialize, serde::Serialize, Default)]
+#[derive(serde::Deserialize, Default)]
 pub struct AclConfig {
+    #[serde(default)]
     pub permissions: HashMap<String, TopicsConfig>,
 }
 
-#[derive(serde::Deserialize, serde::Serialize)]
+#[derive(serde::Deserialize, Debug)]
 pub struct TopicsConfig {
     pub topic: Vec<TopicPermissions>,
 }
 
-#[derive(serde::Deserialize, serde::Serialize)]
+#[derive(serde::Deserialize, Debug)]
 pub struct TopicPermissions {
-    pub filter: String,
+    #[serde(deserialize_with = "from_str")]
+    pub filter: Filter,
     pub allowed: Vec<TransactionType>,
+    #[serde(default)]
     pub denied: Vec<TransactionType>,
 }
 
-#[derive(serde::Deserialize, serde::Serialize, PartialEq, Eq)]
+fn from_str<'de, D>(deserializer: D) -> Result<Filter, D::Error>
+where
+    D: serde::Deserializer<'de>,
+{
+    let s: String = serde::Deserialize::deserialize(deserializer)?;
+
+    Filter::from_str(&s).map_err(serde::de::Error::custom)
+}
+
+#[derive(serde::Deserialize, PartialEq, Eq, Debug)]
+#[serde(rename_all = "lowercase")]
 pub enum TransactionType {
     Subscribe,
     Publish,
@@ -38,13 +51,14 @@ impl AclConfig {
     pub fn check_acl_config(
         &self,
         topics_config: Option<&TopicsConfig>,
-        filter: &Filter,
+        topic_name: &str,
         transaction_type: TransactionType,
     ) -> bool {
         // Allows everything if no topics config was found.
         topics_config.map_or(true, |perms| {
-            !perms.topic.iter().any(|k| {
-                k.allowed.iter().any(|k| *k == transaction_type) && filter.matches_topic(&k.filter)
+            perms.topic.iter().any(|k| {
+                k.allowed.iter().any(|k| *k == transaction_type)
+                    && k.filter.matches_topic(topic_name)
             })
         })
     }

src/mqtt/router.rs

@@ -2,7 +2,6 @@ use std::cmp;
 use std::collections::BTreeMap;
 use std::num::NonZeroU32;
 use std::ops::{Index, IndexMut};
-use std::str::FromStr;
 use std::sync::{Arc, OnceLock};
 use std::time::{Instant, SystemTime};
 
@@ -702,7 +701,7 @@ fn handle_subscribe(state: &mut RouterState, client_idx: ClientIndex, request: S
                 .and_then(|(filter, props)| {
                     if !state.acl.check_acl_config(
                         permissions,
-                        &filter,
+                        filter.as_str(),
                         crate::config::acl::TransactionType::Subscribe,
                     ) {
                         Err(SubscribeReasonCode::NotAuthorized)?
@@ -941,13 +940,11 @@ fn dispatch(state: &mut RouterState, publish: Arc<PublishTrasaction>, origin: Pu
             return;
         };
 
-        let topic_filter = Filter::from(&topic);
-
         let topics_config = state.acl.get_topics_acl_config(&client.user);
 
         if !state.acl.check_acl_config(
             topics_config,
-            &topic_filter,
+            &publish.topic,
             crate::config::acl::TransactionType::Publish,
         ) {
             return;