From b8d42871f49684a587f927eda95cd1cfc5e9693c Mon Sep 17 00:00:00 2001
From: Shreyas Zare <shreyas@technitium.com>
Date: Fri, 7 Apr 2023 14:07:14 +0530
Subject: [PATCH] AdvancedForwarding: updated domain matching to support
 wildcard domain.

---
 Apps/AdvancedForwardingApp/App.cs | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/Apps/AdvancedForwardingApp/App.cs b/Apps/AdvancedForwardingApp/App.cs
index 996a504b..b87ed391 100644
--- a/Apps/AdvancedForwardingApp/App.cs
+++ b/Apps/AdvancedForwardingApp/App.cs
@@ -480,7 +480,7 @@ namespace AdvancedForwarding
                 return null;
             }
 
-            private bool IsDomainBlocked(string domain, out string matchedDomain)
+            private bool IsDomainMatching(string domain, out string matchedDomain)
             {
                 string parent;
 
@@ -494,7 +494,15 @@ namespace AdvancedForwarding
 
                     parent = GetParentZone(domain);
                     if (parent is null)
+                    {
+                        if (_domainMap.TryGetValue("*", out _))
+                        {
+                            matchedDomain = "*";
+                            return true;
+                        }
+
                         break;
+                    }
 
                     domain = "*." + parent;
 
@@ -514,7 +522,7 @@ namespace AdvancedForwarding
 
             private bool TryGetForwarderRecords(string domain, out IReadOnlyList<DnsForwarderRecordData> forwarderRecords, out string matchedDomain)
             {
-                if (IsDomainBlocked(domain, out matchedDomain))
+                if (IsDomainMatching(domain, out matchedDomain))
                 {
                     forwarderRecords = _forwarderRecords;
                     return true;