✨ add support for Whitelist domains #172 (#176)

mokeyish · Oct 29, 2023 · 1665310 · 1665310
1 parent a53a073
commit 1665310
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 2 deletions.
diff --git a/src/collections.rs b/src/collections.rs
@@ -28,7 +28,11 @@ impl<T: Debug> DomainMap<T> {
                 break;
             }
 
-            domain = domain.base_name();
+            if domain.is_wildcard() {
+                domain = domain.base_name();
+            } else {
+                domain = domain.into_wildcard();
+            }
         }
 
         None

diff --git a/src/config/parser/domain.rs b/src/config/parser/domain.rs
@@ -12,7 +12,7 @@ impl NomParser for Domain {
 fn parse(input: &str) -> IResult<&str, Domain> {
     let set = alphanumeric0;
 
-    let name = is_not(" \n\t\\/|\"#',!+*<>");
+    let name = is_not(" \n\t\\/|\"#',!+<>");
 
     alt((
         map(
@@ -47,4 +47,13 @@ mod test {
         let (_, domain) = parse("xxx.集团 w").unwrap();
         assert_eq!(domain, Domain::Name(Name::from_str("xxx.集团").unwrap()));
     }
+
+    #[test]
+    fn test2() {
+        let n = Name::from_str(".").unwrap();
+        assert_eq!(n, Name::root());
+
+        let n = Name::from_str("*").unwrap();
+        assert!(n.is_wildcard());
+    }
 }
diff --git a/src/dns_conf.rs b/src/dns_conf.rs
@@ -2115,6 +2115,8 @@ mod parse {
 
     #[cfg(test)]
     mod tests {
+        use std::str::FromStr;
+
         use crate::libdns::resolver::config::Protocol;
 
         use crate::config::{HttpsListener, ListenerAddress};
@@ -2441,6 +2443,26 @@ mod parse {
             assert_eq!(domain_addr_rule.value, DomainAddress::IGNv6);
         }
 
+        #[test]
+        fn test_config_address_whitelist_mode() {
+            let cfg = SmartDnsConfig::builder()
+                .with("address /google.com/-")
+                .with("address /*/#")
+                .build();
+
+            assert_eq!(
+                cfg.find_domain_rule(&Name::from_str("cloudflare.com").unwrap())
+                    .and_then(|r| r.get(|n| n.address)),
+                Some(DomainAddress::SOA)
+            );
+
+            assert_eq!(
+                cfg.find_domain_rule(&Name::from_str("google.com").unwrap())
+                    .and_then(|r| r.get(|n| n.address)),
+                Some(DomainAddress::IGN)
+            );
+        }
+
         #[test]
         fn test_config_nameserver() {
             let mut cfg = SmartDnsConfig::builder();