fergalmoran/DnsServer
1
0
Fork 0
mirror of https://github.com/fergalmoran/DnsServer.git synced 2026-03-06 21:45:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

AuthZoneManager: Zone creation, loading and sync checks added.

Browse Source
This commit is contained in:
Shreyas Zare
2020-08-29 14:23:58 +05:30
parent dfb5cd054d
commit 3cfbec8883
1 changed files with 76 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,6 +25,7 @@ using System.IO;
using System.Net;
using System.Text;
using System.Threading;
using System.Threading.Tasks;
using TechnitiumLibrary.Net.Dns;
using TechnitiumLibrary.Net.Dns.ResourceRecords;
@@ -185,22 +186,37 @@ namespace DnsServerCore.Dns.ZoneManagers
if (_root.TryAdd(zone))
return zone;
if (_root.TryGet(zoneInfo.Name, out AuthZone existingZone) && (existingZone is SubDomainZone))
{
_root[zoneInfo.Name] = zone;
return zone;
}
throw new DnsServerException("Zone already exists: " + zoneInfo.Name);
}
private void LoadRecords(IReadOnlyList<DnsResourceRecord> records)
private void LoadRecords(AuthZone authZone, IReadOnlyList<DnsResourceRecord> records)
{
Dictionary<string, Dictionary<DnsResourceRecordType, List<DnsResourceRecord>>> groupedByDomainRecords = DnsResourceRecord.GroupRecords(records);
foreach (KeyValuePair<string, Dictionary<DnsResourceRecordType, List<DnsResourceRecord>>> groupedByTypeRecords in groupedByDomainRecords)
{
AuthZone zone = GetOrAddZone(groupedByTypeRecords.Key);
if (authZone.Name.Equals(groupedByTypeRecords.Key, StringComparison.OrdinalIgnoreCase))
{
foreach (KeyValuePair<DnsResourceRecordType, List<DnsResourceRecord>> groupedRecords in groupedByTypeRecords.Value)
authZone.LoadRecords(groupedRecords.Key, groupedRecords.Value);
}
else
{
AuthZone zone = GetOrAddZone(groupedByTypeRecords.Key);
if (zone is SubDomainZone)
{
foreach (KeyValuePair<DnsResourceRecordType, List<DnsResourceRecord>> groupedRecords in groupedByTypeRecords.Value)
zone.LoadRecords(groupedRecords.Key, groupedRecords.Value);
foreach (KeyValuePair<DnsResourceRecordType, List<DnsResourceRecord>> groupedRecords in groupedByTypeRecords.Value)
zone.LoadRecords(groupedRecords.Key, groupedRecords.Value);
if (zone is SubDomainZone)
(zone as SubDomainZone).AutoUpdateState();
(zone as SubDomainZone).AutoUpdateState();
}
}
}
}
@@ -383,17 +399,7 @@ namespace DnsServerCore.Dns.ZoneManagers
}
}
public AuthZoneInfo CreatePrimaryZone(string domain, string primaryNameServer, bool @internal)
{
AuthZone authZone = new PrimaryZone(_dnsServer, domain, primaryNameServer, @internal);
if (_root.TryAdd(authZone))
return new AuthZoneInfo(authZone);
return null;
}
internal AuthZoneInfo CreatePrimaryZone(string domain, DnsSOARecord soaRecord, DnsNSRecord ns)
internal AuthZoneInfo InternalCreatePrimaryZone(string domain, DnsSOARecord soaRecord, DnsNSRecord ns)
{
AuthZone authZone = new PrimaryZone(_dnsServer, domain, soaRecord, ns);
@@ -403,9 +409,25 @@ namespace DnsServerCore.Dns.ZoneManagers
return null;
}
public AuthZoneInfo CreateSecondaryZone(string domain, string primaryNameServerAddresses = null)
public AuthZoneInfo CreatePrimaryZone(string domain, string primaryNameServer, bool @internal)
{
AuthZone authZone = new SecondaryZone(_dnsServer, domain, primaryNameServerAddresses);
AuthZone authZone = new PrimaryZone(_dnsServer, domain, primaryNameServer, @internal);
if (_root.TryAdd(authZone))
return new AuthZoneInfo(authZone);
if (_root.TryGet(domain, out AuthZone existingZone) && (existingZone is SubDomainZone))
{
_root[domain] = authZone;
return new AuthZoneInfo(authZone);
}
return null;
}
public async Task<AuthZoneInfo> CreateSecondaryZoneAsync(string domain, string primaryNameServerAddresses = null)
{
AuthZone authZone = await SecondaryZone.CreateAsync(_dnsServer, domain, primaryNameServerAddresses);
if (_root.TryAdd(authZone))
{
@@ -413,12 +435,19 @@ namespace DnsServerCore.Dns.ZoneManagers
return new AuthZoneInfo(authZone);
}
if (_root.TryGet(domain, out AuthZone existingZone) && (existingZone is SubDomainZone))
{
_root[domain] = authZone;
(authZone as SecondaryZone).RefreshZone();
return new AuthZoneInfo(authZone);
}
return null;
}
public AuthZoneInfo CreateStubZone(string domain, string primaryNameServerAddresses = null)
public async Task<AuthZoneInfo> CreateStubZoneAsync(string domain, string primaryNameServerAddresses = null)
{
AuthZone authZone = new StubZone(_dnsServer, domain, primaryNameServerAddresses);
AuthZone authZone = await StubZone.CreateAsync(_dnsServer, domain, primaryNameServerAddresses);
if (_root.TryAdd(authZone))
{
@@ -426,6 +455,13 @@ namespace DnsServerCore.Dns.ZoneManagers
return new AuthZoneInfo(authZone);
}
if (_root.TryGet(domain, out AuthZone existingZone) && (existingZone is SubDomainZone))
{
_root[domain] = authZone;
(authZone as StubZone).RefreshZone();
return new AuthZoneInfo(authZone);
}
return null;
}
@@ -436,6 +472,12 @@ namespace DnsServerCore.Dns.ZoneManagers
if (_root.TryAdd(authZone))
return new AuthZoneInfo(authZone);
if (_root.TryGet(domain, out AuthZone existingZone) && (existingZone is SubDomainZone))
{
_root[domain] = authZone;
return new AuthZoneInfo(authZone);
}
return null;
}
@@ -541,7 +583,7 @@ namespace DnsServerCore.Dns.ZoneManagers
int i = 0;
if (syncRecords[0].Type == DnsResourceRecordType.SOA)
if ((syncRecords.Count > 1) && (syncRecords[0].Type == DnsResourceRecordType.SOA) && (syncRecords[syncRecords.Count - 1].Type == DnsResourceRecordType.SOA))
i = 1; //skip first SOA in AXFR
if (domain.Length == 0)
@@ -611,7 +653,11 @@ namespace DnsServerCore.Dns.ZoneManagers
foreach (KeyValuePair<string, Dictionary<DnsResourceRecordType, List<DnsResourceRecord>>> newEntries in newRecordsGroupedByDomain)
{
AuthZone zone = GetOrAddZone(newEntries.Key);
zone.SyncRecords(newEntries.Value, dontRemoveRecords);
if (zone.Name.Equals(domain, StringComparison.OrdinalIgnoreCase))
zone.SyncRecords(newEntries.Value, dontRemoveRecords);
else if (zone is SubDomainZone)
zone.SyncRecords(newEntries.Value, dontRemoveRecords);
}
}
@@ -909,12 +955,12 @@ namespace DnsServerCore.Dns.ZoneManagers
AuthZoneInfo zoneInfo = new AuthZoneInfo(records[0].Name, zoneType, false);
//create zone
Zone authZone = CreateEmptyZone(zoneInfo);
AuthZone authZone = CreateEmptyZone(zoneInfo);
try
{
//load records
LoadRecords(records);
LoadRecords(authZone, records);
}
catch
{
@@ -963,12 +1009,12 @@ namespace DnsServerCore.Dns.ZoneManagers
AuthZoneInfo zoneInfo = new AuthZoneInfo(records[0].Name, zoneType, zoneDisabled);
//create zone
Zone authZone = CreateEmptyZone(zoneInfo);
AuthZone authZone = CreateEmptyZone(zoneInfo);
try
{
//load records
LoadRecords(records);
LoadRecords(authZone, records);
}
catch
{
@@ -993,7 +1039,7 @@ namespace DnsServerCore.Dns.ZoneManagers
AuthZoneInfo zoneInfo = new AuthZoneInfo(bR);
//create zone
Zone authZone = CreateEmptyZone(zoneInfo);
AuthZone authZone = CreateEmptyZone(zoneInfo);
//read all zone records
DnsResourceRecord[] records = new DnsResourceRecord[bR.ReadInt32()];
@@ -1008,7 +1054,7 @@ namespace DnsServerCore.Dns.ZoneManagers
try
{
//load records
LoadRecords(records);
LoadRecords(authZone, records);
}
catch
{