fergalmoran/DnsServer
1
0
Fork 0
mirror of https://github.com/fergalmoran/DnsServer.git synced 2026-02-17 05:18:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

AuthZoneManager: added isRecursionAllowed parameter to return response with correct flag set.

Browse Source
This commit is contained in:
Shreyas Zare
2021-03-21 16:41:15 +05:30
parent 5ef9d83a49
commit 2f56309b2f
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
DnsServerCore/Dns/ZoneManagers/AuthZoneManager.cs
View File

@@ -286,7 +286,7 @@ namespace DnsServerCore.Dns.ZoneManagers
}
}
private DnsDatagram GetReferralResponse(DnsDatagram request, AuthZone delegationZone)
private DnsDatagram GetReferralResponse(DnsDatagram request, AuthZone delegationZone, bool isRecursionAllowed)
{
IReadOnlyList<DnsResourceRecord> authority;
@@ -297,10 +297,10 @@ namespace DnsServerCore.Dns.ZoneManagers
IReadOnlyList<DnsResourceRecord> additional = GetAdditionalRecords(authority);
return new DnsDatagram(request.Identifier, true, DnsOpcode.StandardQuery, false, false, request.RecursionDesired, false, false, false, DnsResponseCode.NoError, request.Question, null, authority, additional);
return new DnsDatagram(request.Identifier, true, DnsOpcode.StandardQuery, false, false, request.RecursionDesired, isRecursionAllowed, false, false, DnsResponseCode.NoError, request.Question, null, authority, additional);
}
private static DnsDatagram GetForwarderResponse(DnsDatagram request, AuthZone zone, AuthZone forwarderZone)
private static DnsDatagram GetForwarderResponse(DnsDatagram request, AuthZone zone, AuthZone forwarderZone, bool isRecursionAllowed)
{
IReadOnlyList<DnsResourceRecord> authority = null;
@@ -310,7 +310,7 @@ namespace DnsServerCore.Dns.ZoneManagers
if ((authority == null) || (authority.Count == 0))
authority = forwarderZone.QueryRecords(DnsResourceRecordType.FWD);
return new DnsDatagram(request.Identifier, true, DnsOpcode.StandardQuery, false, false, request.RecursionDesired, false, false, false, DnsResponseCode.NoError, request.Question, null, authority);
return new DnsDatagram(request.Identifier, true, DnsOpcode.StandardQuery, false, false, request.RecursionDesired, isRecursionAllowed, false, false, DnsResponseCode.NoError, request.Question, null, authority);
}
internal void Flush()
@@ -881,23 +881,23 @@ namespace DnsServerCore.Dns.ZoneManagers
return _root.ListSubDomains(domain);
}
public DnsDatagram Query(DnsDatagram request)
public DnsDatagram Query(DnsDatagram request, bool isRecursionAllowed)
{
AuthZone zone = _root.FindZone(request.Question[0].Name, out AuthZone delegation, out AuthZone authZone, out bool hasSubDomains);
if ((authZone == null) || !authZone.IsActive) //no authority for requested zone
return new DnsDatagram(request.Identifier, true, DnsOpcode.StandardQuery, false, false, request.RecursionDesired, false, false, false, DnsResponseCode.Refused, request.Question);
return new DnsDatagram(request.Identifier, true, DnsOpcode.StandardQuery, false, false, request.RecursionDesired, isRecursionAllowed, false, false, DnsResponseCode.Refused, request.Question);
if ((delegation != null) && delegation.IsActive)
return GetReferralResponse(request, delegation);
return GetReferralResponse(request, delegation, isRecursionAllowed);
if ((zone == null) || !zone.IsActive)
{
//zone not found
if (authZone is StubZone)
return GetReferralResponse(request, authZone);
return GetReferralResponse(request, authZone, isRecursionAllowed);
else if (authZone is ForwarderZone)
return GetForwarderResponse(request, null, authZone);
return GetForwarderResponse(request, null, authZone, isRecursionAllowed);
DnsResponseCode rCode = DnsResponseCode.NoError;
IReadOnlyList<DnsResourceRecord> authority = authZone.QueryRecords(DnsResourceRecordType.APP);
@@ -909,7 +909,7 @@ namespace DnsServerCore.Dns.ZoneManagers
authority = authZone.GetRecords(DnsResourceRecordType.SOA);
}
return new DnsDatagram(request.Identifier, true, DnsOpcode.StandardQuery, true, false, request.RecursionDesired, false, false, false, rCode, request.Question, null, authority);
return new DnsDatagram(request.Identifier, true, DnsOpcode.StandardQuery, true, false, request.RecursionDesired, isRecursionAllowed, false, false, rCode, request.Question, null, authority);
}
else
{
@@ -922,9 +922,9 @@ namespace DnsServerCore.Dns.ZoneManagers
{
//record type not found
if (authZone is StubZone)
return GetReferralResponse(request, authZone);
return GetReferralResponse(request, authZone, isRecursionAllowed);
else if (authZone is ForwarderZone)
return GetForwarderResponse(request, zone, authZone);
return GetForwarderResponse(request, zone, authZone, isRecursionAllowed);
authority = zone.QueryRecords(DnsResourceRecordType.APP);
if (authority.Count == 0)
@@ -971,7 +971,7 @@ namespace DnsServerCore.Dns.ZoneManagers
}
}
return new DnsDatagram(request.Identifier, true, DnsOpcode.StandardQuery, true, false, request.RecursionDesired, false, false, false, DnsResponseCode.NoError, request.Question, answers, authority, additional);
return new DnsDatagram(request.Identifier, true, DnsOpcode.StandardQuery, true, false, request.RecursionDesired, isRecursionAllowed, false, false, DnsResponseCode.NoError, request.Question, answers, authority, additional);
}
}