fergalmoran/DnsServer
1
0
Fork 0
mirror of https://github.com/fergalmoran/DnsServer.git synced 2026-01-04 07:46:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

CacheZoneManager: updated ResolveCNAME() to detect CNAME loops.

Browse Source
This commit is contained in:
Shreyas Zare
2022-10-30 17:48:31 +05:30
parent 6338a5492a
commit d47ea907ff
1 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
DnsServerCore/Dns/ZoneManagers/CacheZoneManager.cs
View File

@@ -249,19 +249,34 @@ namespace DnsServerCore.Dns.ZoneManagers
do
{
if (!_root.TryGet((lastCNAME.RDATA as DnsCNAMERecordData).Domain, out CacheZone cacheZone))
string cnameDomain = (lastCNAME.RDATA as DnsCNAMERecordData).Domain;
if (lastCNAME.Name.Equals(cnameDomain, StringComparison.OrdinalIgnoreCase))
break; //loop detected
if (!_root.TryGet(cnameDomain, out CacheZone cacheZone))
break;
IReadOnlyList<DnsResourceRecord> records = cacheZone.QueryRecords(question.Type, serveStale, true);
if (records.Count < 1)
break;
answerRecords.AddRange(records);
DnsResourceRecord lastRR = records[records.Count - 1];
if (lastRR.Type != DnsResourceRecordType.CNAME)
{
answerRecords.AddRange(records);
break;
}
foreach (DnsResourceRecord answerRecord in answerRecords)
{
if (answerRecord.Type != DnsResourceRecordType.CNAME)
continue;
if (answerRecord.RDATA.Equals(lastRR.RDATA))
return; //loop detected
}
answerRecords.AddRange(records);
lastCNAME = lastRR;
}
@@ -567,7 +582,7 @@ namespace DnsServerCore.Dns.ZoneManagers
//answer found in cache
DnsResourceRecord firstRR = answer[0];
if (firstRR.RDATA is DnsSpecialCacheRecord dnsSpecialCacheRecord)
if (firstRR.RDATA is DnsSpecialCacheRecordData dnsSpecialCacheRecord)
{
if (request.DnssecOk)
{