fergalmoran/DnsServer
1
0
Fork 0
mirror of https://github.com/fergalmoran/DnsServer.git synced 2025-12-31 05:49:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

AuthZoneTree: fixed issue in SubDomainExists() to prevent NXDOMAN rcode when wildcard ENT exists.

Browse Source
This commit is contained in:
Shreyas Zare
2024-01-14 17:12:15 +05:30
parent fa682e88f9
commit 63d7c55bb6
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
DnsServerCore/Dns/Trees/AuthZoneTree.cs
View File

@@ -1,6 +1,6 @@
/*
Technitium DNS Server
Copyright (C) 2023 Shreyas Zare (shreyas@technitium.com)
Copyright (C) 2024 Shreyas Zare (shreyas@technitium.com)
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -312,6 +312,14 @@ namespace DnsServerCore.Dns.Trees
private static bool SubDomainExists(byte[] key, Node currentNode)
{
Node[] children = currentNode.Children;
if (children is not null)
{
Node child = Volatile.Read(ref children[1]); //[*]
if (child is not null)
return true; //wildcard exists so subdomain name exists: RFC 4592 section 4.9
}
Node nextSubDomain = GetNextSubDomainZoneNode(key, currentNode, currentNode.Depth);
if (nextSubDomain is null)
return false;
@@ -642,7 +650,11 @@ namespace DnsServerCore.Dns.Trees
SubDomainZone subDomainZone = authZoneNode.ParentSideZone;
zone = subDomainZone;
closest = closestSubDomain;
if (zone == closestSubDomain)
closest = null;
else
closest = closestSubDomain;
if (closestDelegation is not null)
delegation = closestDelegation;
@@ -887,7 +899,7 @@ namespace DnsServerCore.Dns.Trees
AuthZoneNode authZoneNode = FindZoneNode(key, isWildcardAnswer, out _, out _, out _, out SubDomainZone closestSubDomain, out _, out ApexZone closestAuthority);
if (authZoneNode is not null)
{
if (isWildcardAnswer && (closestSubDomain is not null) && closestSubDomain.Name.Contains('*'))
if (isWildcardAnswer && (closestSubDomain is not null) && closestSubDomain.Name.StartsWith('*'))
{
closestEncloser = closestSubDomain.Name.TrimStart(new char[] { '*', '.' });
}