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

WebServiceZonesApi: Updated API code to support ZONEMD validation feature. Fixed minor issues with calling UpdateSvcbAutoHints() method.

Browse Source
This commit is contained in:
Shreyas Zare
2024-06-22 13:57:25 +05:30
parent a64a24ca61
commit fc23a43fde
1 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
DnsServerCore/WebServiceZonesApi.cs
View File

@@ -213,8 +213,19 @@ namespace DnsServerCore
{
SOARecordInfo authRecordInfo = record.GetAuthSOARecordInfo();
if ((zoneInfo is not null) && (zoneInfo.Type == AuthZoneType.Primary))
jsonWriter.WriteBoolean("useSerialDateScheme", authRecordInfo.UseSoaSerialDateScheme);
if (zoneInfo is not null)
{
switch (zoneInfo.Type)
{
case AuthZoneType.Primary:
jsonWriter.WriteBoolean("useSerialDateScheme", authRecordInfo.UseSoaSerialDateScheme);
break;
case AuthZoneType.Secondary:
jsonWriter.WriteBoolean("validateZone", authRecordInfo.ValidateZone);
break;
}
}
IReadOnlyList<NameServerAddress> primaryNameServers = authRecordInfo.PrimaryNameServers;
if (primaryNameServers is not null)
@@ -868,6 +879,7 @@ namespace DnsServerCore
jsonWriter.WriteNumber("soaSerial", (zoneInfo.GetApexRecords(DnsResourceRecordType.SOA)[0].RDATA as DnsSOARecordData).Serial);
jsonWriter.WriteString("expiry", zoneInfo.Expiry);
jsonWriter.WriteBoolean("isExpired", zoneInfo.IsExpired);
jsonWriter.WriteBoolean("validationFailed", zoneInfo.ValidationFailed);
jsonWriter.WriteBoolean("syncFailed", zoneInfo.SyncFailed);
{
@@ -1191,11 +1203,12 @@ namespace DnsServerCore
string primaryNameServerAddresses = request.GetQueryOrForm("primaryNameServerAddresses", null);
DnsTransportProtocol zoneTransferProtocol = request.GetQueryOrFormEnum("zoneTransferProtocol", DnsTransportProtocol.Tcp);
string tsigKeyName = request.GetQueryOrForm("tsigKeyName", null);
bool validateZone = request.GetQueryOrForm("validateZone", bool.Parse, false);
if (zoneTransferProtocol == DnsTransportProtocol.Quic)
DnsWebService.ValidateQuicSupport();
zoneInfo = await _dnsWebService.DnsServer.AuthZoneManager.CreateSecondaryZoneAsync(zoneName, primaryNameServerAddresses, zoneTransferProtocol, tsigKeyName);
zoneInfo = await _dnsWebService.DnsServer.AuthZoneManager.CreateSecondaryZoneAsync(zoneName, primaryNameServerAddresses, zoneTransferProtocol, tsigKeyName, validateZone);
if (zoneInfo is null)
throw new DnsWebServiceException("Zone already exists: " + zoneName);
@@ -2693,7 +2706,7 @@ namespace DnsServerCore
bool updateSvcbHints = request.GetQueryOrForm("updateSvcbHints", bool.Parse, false);
if (updateSvcbHints)
UpdateSvcbAutoHints(zoneName, domain, type == DnsResourceRecordType.A, type == DnsResourceRecordType.AAAA);
UpdateSvcbAutoHints(zoneInfo.Name, domain, type == DnsResourceRecordType.A, type == DnsResourceRecordType.AAAA);
}
break;
@@ -3221,7 +3234,7 @@ namespace DnsServerCore
bool updateSvcbHints = request.GetQueryOrForm("updateSvcbHints", bool.Parse, false);
if (updateSvcbHints)
UpdateSvcbAutoHints(zoneName, domain, type == DnsResourceRecordType.A, type == DnsResourceRecordType.AAAA);
UpdateSvcbAutoHints(zoneInfo.Name, domain, type == DnsResourceRecordType.A, type == DnsResourceRecordType.AAAA);
}
break;
@@ -3531,7 +3544,7 @@ namespace DnsServerCore
bool updateSvcbHints = request.GetQueryOrForm("updateSvcbHints", bool.Parse, false);
if (updateSvcbHints)
UpdateSvcbAutoHints(zoneName, newDomain, type == DnsResourceRecordType.A, type == DnsResourceRecordType.AAAA);
UpdateSvcbAutoHints(zoneInfo.Name, newDomain, type == DnsResourceRecordType.A, type == DnsResourceRecordType.AAAA);
}
break;
@@ -3603,6 +3616,9 @@ namespace DnsServerCore
{
SOARecordInfo recordInfo = newSOARecord.GetAuthSOARecordInfo();
if (request.TryGetQueryOrForm("validateZone", bool.Parse, out bool validateZone))
recordInfo.ValidateZone = validateZone;
if (request.TryGetQueryOrFormEnum("zoneTransferProtocol", out DnsTransportProtocol zoneTransferProtocol))
{
if (zoneTransferProtocol == DnsTransportProtocol.Quic)