fergalmoran/DnsServer
1
0
Fork 0
mirror of https://github.com/fergalmoran/DnsServer.git synced 2025-12-26 11:28:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

WebServiceZonesApi: Updated api for response metadata feature. Updated Zone options api for secondary zone dynamic update permissions. Fixed bug in fwd record update.

Browse Source
This commit is contained in:
Shreyas Zare
2024-03-16 15:46:55 +05:30
parent 775fca0f54
commit ee38acfef1
1 changed files with 29 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
DnsServerCore/WebServiceZonesApi.cs
View File

@@ -749,6 +749,20 @@ namespace DnsServerCore
if (eDnsClientSubnet is not null) if (eDnsClientSubnet is not null)
jsonWriter.WriteString("eDnsClientSubnet", eDnsClientSubnet.ToString()); jsonWriter.WriteString("eDnsClientSubnet", eDnsClientSubnet.ToString());
DnsDatagramMetadata responseMetadata = cacheRecordInfo.ResponseMetadata;
if (responseMetadata is not null)
{
jsonWriter.WritePropertyName("responseMetadata");
jsonWriter.WriteStartObject();
jsonWriter.WriteString("nameServer", responseMetadata.NameServer?.ToString());
jsonWriter.WriteString("protocol", (responseMetadata.NameServer is null ? DnsTransportProtocol.Udp : responseMetadata.NameServer.Protocol).ToString());
jsonWriter.WriteString("datagramSize", responseMetadata.DatagramSize + " bytes");
jsonWriter.WriteString("roundTripTime", Math.Round(responseMetadata.RoundTripTime, 2) + " ms");
jsonWriter.WriteEndObject();
}
jsonWriter.WriteString("lastUsedOn", cacheRecordInfo.LastUsedOn); jsonWriter.WriteString("lastUsedOn", cacheRecordInfo.LastUsedOn);
} }
@@ -2027,6 +2041,7 @@ namespace DnsServerCore
switch (zoneInfo.Type) switch (zoneInfo.Type)
{ {
case AuthZoneType.Primary: case AuthZoneType.Primary:
case AuthZoneType.Secondary:
case AuthZoneType.Forwarder: case AuthZoneType.Forwarder:
jsonWriter.WriteString("update", zoneInfo.Update.ToString()); jsonWriter.WriteString("update", zoneInfo.Update.ToString());
@@ -2042,7 +2057,13 @@ namespace DnsServerCore
jsonWriter.WriteEndArray(); jsonWriter.WriteEndArray();
} }
break;
}
switch (zoneInfo.Type)
{
case AuthZoneType.Primary:
case AuthZoneType.Forwarder:
jsonWriter.WritePropertyName("updateSecurityPolicies"); jsonWriter.WritePropertyName("updateSecurityPolicies");
{ {
jsonWriter.WriteStartArray(); jsonWriter.WriteStartArray();
@@ -2172,6 +2193,7 @@ namespace DnsServerCore
switch (zoneInfo.Type) switch (zoneInfo.Type)
{ {
case AuthZoneType.Primary: case AuthZoneType.Primary:
case AuthZoneType.Secondary:
case AuthZoneType.Forwarder: case AuthZoneType.Forwarder:
if (request.TryGetQueryOrFormEnum("update", out AuthZoneUpdate update)) if (request.TryGetQueryOrFormEnum("update", out AuthZoneUpdate update))
zoneInfo.Update = update; zoneInfo.Update = update;
@@ -2184,7 +2206,13 @@ namespace DnsServerCore
else else
zoneInfo.UpdateIpAddresses = strUpdateIpAddresses.Split(NetworkAddress.Parse, ','); zoneInfo.UpdateIpAddresses = strUpdateIpAddresses.Split(NetworkAddress.Parse, ',');
} }
break;
}
switch (zoneInfo.Type)
{
case AuthZoneType.Primary:
case AuthZoneType.Forwarder:
string strUpdateSecurityPolicies = request.QueryOrForm("updateSecurityPolicies"); string strUpdateSecurityPolicies = request.QueryOrForm("updateSecurityPolicies");
if (strUpdateSecurityPolicies is not null) if (strUpdateSecurityPolicies is not null)
{ {
@@ -3658,7 +3686,7 @@ namespace DnsServerCore
} }
oldRecord = new DnsResourceRecord(domain, type, DnsClass.IN, 0, new DnsForwarderRecordData(protocol, forwarder)); oldRecord = new DnsResourceRecord(domain, type, DnsClass.IN, 0, new DnsForwarderRecordData(protocol, forwarder));
newRecord = new DnsResourceRecord(domain, type, DnsClass.IN, 0, new DnsForwarderRecordData(newProtocol, newForwarder, dnssecValidation, proxyType, proxyAddress, proxyPort, proxyUsername, proxyPassword)); newRecord = new DnsResourceRecord(newDomain, type, DnsClass.IN, 0, new DnsForwarderRecordData(newProtocol, newForwarder, dnssecValidation, proxyType, proxyAddress, proxyPort, proxyUsername, proxyPassword));
if (disable) if (disable)
newRecord.GetAuthRecordInfo().Disabled = true; newRecord.GetAuthRecordInfo().Disabled = true;