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

Zone: added DomainEquals() method for correct wild card domain name matching.

Browse Source
This commit is contained in:
Shreyas Zare
2019-02-02 14:32:04 +05:30
parent e94b1ea0b6
commit 03ad45c3b1
1 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
DnsServerCore/Zone.cs
View File

@@ -107,6 +107,23 @@ namespace DnsServerCore
return path;
}
private static bool DomainEquals(string domain1, string domain2)
{
string[] path1 = ConvertDomainToPath(domain1);
string[] path2 = ConvertDomainToPath(domain2);
if (path1.Length != path2.Length)
return false;
for (int i = 0; i < path1.Length; i++)
{
if ((path1[i] != path2[i]) && (path1[i] != "*") && (path2[i] != "*"))
return false;
}
return true;
}
private static Zone CreateZone(Zone rootZone, string domain)
{
Zone currentZone = rootZone;
@@ -528,7 +545,7 @@ namespace DnsServerCore
if (closestAuthority[0].Type == DnsResourceRecordType.SOA)
{
//zone is hosted on this server
if (closestZone._zoneName.Equals(domain) || (closestZone._zoneLabel == "*"))
if (DomainEquals(closestZone._zoneName, domain))
{
//zone found
DnsResourceRecord[] records = closestZone.QueryRecords(question.Type, false);
@@ -540,7 +557,7 @@ namespace DnsServerCore
else
{
//record type found
if (closestZone._zoneLabel == "*")
if (closestZone._zoneName.Contains("*"))
{
DnsResourceRecord[] wildcardRecords = new DnsResourceRecord[records.Length];