fergalmoran/DnsServer
1
0
Fork 0
mirror of https://github.com/fergalmoran/DnsServer.git synced 2026-01-06 16:53:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

ZoneTree: fixed issue with wildcard matching conditions with ENT entries.

Browse Source
This commit is contained in:
Shreyas Zare
2024-02-08 19:07:51 +05:30
parent 874e712d2b
commit 7ed733e8aa
1 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
DnsServerCore/Dns/Trees/ZoneTree.cs
View File

@@ -102,7 +102,7 @@ namespace DnsServerCore.Dns.Trees
while ((i < mainKey.Length) && (j < testKey.Length))
{
if (mainKey[i] == 1) //[*]
if ((mainKey[i] == 1) && (testKey[j] != 1)) //[*] wildcard match only when test key does not have '*' as literal char: RFC 4592 section 2.3
{
if (i == mainKey.Length - 2)
return true; //last label, valid wildcard
@@ -173,7 +173,7 @@ namespace DnsServerCore.Dns.Trees
while ((i < mainKey.Length) && (j < testKey.Length))
{
if (mainKey[i] == 1) //[*]
if ((mainKey[i] == 1) && (testKey[j] != 1)) //[*] wildcard match only when test key does not have '*' as literal char: RFC 4592 section 2.3
{
//skip j to next label
while (j < testKey.Length)
@@ -297,7 +297,7 @@ namespace DnsServerCore.Dns.Trees
if (value is not null)
{
//match exact only
if (KeysMatch(value.Key, key, false))
if (KeysMatch(value.Key, key, matchWildcard))
{
//find closest values since the matched zone may be apex zone
TNode zoneNode = value.Value;
@@ -306,6 +306,24 @@ namespace DnsServerCore.Dns.Trees
return value.Value; //found matching value
}
if (wildcardNode is not null)
{
NodeValue wildcardValue = wildcardNode.Value;
if (wildcardValue is not null)
{
if (IsKeySubDomain(wildcardValue.Key, value.Key, matchWildcard))
{
//value is a subdomain of an ENT so wildcard is not valid
wildcardNode = null;
}
}
}
}
else if ((wildcardNode is not null) && (currentNode.K == 0) && currentNode.HasChildren)
{
//ENT node with children so wildcard is not valid
wildcardNode = null;
}
}