fergalmoran/DnsServer
1
0
Fork 0
mirror of https://github.com/fergalmoran/DnsServer.git synced 2026-01-03 23:34:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

AuthZone: fixed AddRecord() implementation to correctly return the added and deleted records due to TTL changes.

Browse Source
This commit is contained in:
Shreyas Zare
2022-05-22 16:02:47 +05:30
parent a963845836
commit 1d22138e56
1 changed files with 55 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

89
DnsServerCore/Dns/Zones/AuthZone.cs
View File

@@ -281,6 +281,60 @@ namespace DnsServerCore.Dns.Zones
deletedRRSigRecords = deleted;
}
internal void AddRecord(DnsResourceRecord record, out IReadOnlyList<DnsResourceRecord> addedRecords, out IReadOnlyList<DnsResourceRecord> deletedRecords)
{
switch (record.Type)
{
case DnsResourceRecordType.CNAME:
case DnsResourceRecordType.DNAME:
case DnsResourceRecordType.SOA:
throw new InvalidOperationException("Cannot add record: use SetRecords() for " + record.Type.ToString() + " record");
}
List<DnsResourceRecord> added = new List<DnsResourceRecord>();
List<DnsResourceRecord> deleted = new List<DnsResourceRecord>();
addedRecords = added;
deletedRecords = deleted;
added.Add(record);
_entries.AddOrUpdate(record.Type, delegate (DnsResourceRecordType key)
{
return new DnsResourceRecord[] { record };
},
delegate (DnsResourceRecordType key, IReadOnlyList<DnsResourceRecord> existingRecords)
{
foreach (DnsResourceRecord existingRecord in existingRecords)
{
if (record.RDATA.Equals(existingRecord.RDATA))
return existingRecords;
}
List<DnsResourceRecord> updatedRecords = new List<DnsResourceRecord>(existingRecords.Count + 1);
foreach (DnsResourceRecord existingRecord in existingRecords)
{
if (existingRecord.OriginalTtlValue == record.OriginalTtlValue)
{
updatedRecords.Add(existingRecord);
}
else
{
DnsResourceRecord updatedExistingRecord = new DnsResourceRecord(existingRecord.Name, existingRecord.Type, existingRecord.Class, record.OriginalTtlValue, existingRecord.RDATA);
updatedRecords.Add(updatedExistingRecord);
added.Add(updatedExistingRecord);
deleted.Add(existingRecord);
}
}
updatedRecords.Add(record);
return updatedRecords;
});
}
#endregion
#region DNSSEC
@@ -710,40 +764,7 @@ namespace DnsServerCore.Dns.Zones
public virtual void AddRecord(DnsResourceRecord record)
{
switch (record.Type)
{
case DnsResourceRecordType.CNAME:
case DnsResourceRecordType.DNAME:
case DnsResourceRecordType.SOA:
throw new InvalidOperationException("Cannot add record: use SetRecords() for " + record.Type.ToString() + " record");
}
_entries.AddOrUpdate(record.Type, delegate (DnsResourceRecordType key)
{
return new DnsResourceRecord[] { record };
},
delegate (DnsResourceRecordType key, IReadOnlyList<DnsResourceRecord> existingRecords)
{
foreach (DnsResourceRecord existingRecord in existingRecords)
{
if (record.RDATA.Equals(existingRecord.RDATA))
return existingRecords;
}
List<DnsResourceRecord> updatedRecords = new List<DnsResourceRecord>(existingRecords.Count + 1);
foreach (DnsResourceRecord existingRecord in existingRecords)
{
if (existingRecord.OriginalTtlValue == record.OriginalTtlValue)
updatedRecords.Add(existingRecord);
else
updatedRecords.Add(new DnsResourceRecord(existingRecord.Name, existingRecord.Type, existingRecord.Class, record.OriginalTtlValue, existingRecord.RDATA));
}
updatedRecords.Add(record);
return updatedRecords;
});
AddRecord(record, out _, out _);
}
public virtual bool DeleteRecords(DnsResourceRecordType type)