fergalmoran/DnsServer
1
0
Fork 0
mirror of https://github.com/fergalmoran/DnsServer.git synced 2025-12-27 03:49:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

WebServiceZonesApi: updated zone options api implementation as per implementation changes.

Browse Source
This commit is contained in:
Shreyas Zare
2024-09-21 12:55:52 +05:30
parent 618d2577b1
commit 1fa35e6ace
1 changed files with 43 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
DnsServerCore/WebServiceZonesApi.cs
View File

@@ -2327,11 +2327,10 @@ namespace DnsServerCore
throw new DnsWebServiceException("Access was denied."); throw new DnsWebServiceException("Access was denied.");
zoneInfo.Disabled = false; zoneInfo.Disabled = false;
_dnsWebService.DnsServer.AuthZoneManager.SaveZoneFile(zoneInfo.Name);
_dnsWebService._log.Write(context.GetRemoteEndPoint(), "[" + session.User.Username + "] " + zoneInfo.TypeName + " zone was enabled: " + zoneInfo.DisplayName); _dnsWebService._log.Write(context.GetRemoteEndPoint(), "[" + session.User.Username + "] " + zoneInfo.TypeName + " zone was enabled: " + zoneInfo.DisplayName);
_dnsWebService.DnsServer.AuthZoneManager.SaveZoneFile(zoneInfo.Name);
//delete cache for this zone to allow rebuilding cache data as needed by stub or forwarder zones //delete cache for this zone to allow rebuilding cache data as needed by stub or forwarder zones
_dnsWebService.DnsServer.CacheZoneManager.DeleteZone(zoneInfo.Name); _dnsWebService.DnsServer.CacheZoneManager.DeleteZone(zoneInfo.Name);
} }
@@ -2359,10 +2358,9 @@ namespace DnsServerCore
throw new DnsWebServiceException("Access was denied."); throw new DnsWebServiceException("Access was denied.");
zoneInfo.Disabled = true; zoneInfo.Disabled = true;
_dnsWebService.DnsServer.AuthZoneManager.SaveZoneFile(zoneInfo.Name);
_dnsWebService._log.Write(context.GetRemoteEndPoint(), "[" + session.User.Username + "] " + zoneInfo.TypeName + " zone was disabled: " + zoneInfo.DisplayName); _dnsWebService._log.Write(context.GetRemoteEndPoint(), "[" + session.User.Username + "] " + zoneInfo.TypeName + " zone was disabled: " + zoneInfo.DisplayName);
_dnsWebService.DnsServer.AuthZoneManager.SaveZoneFile(zoneInfo.Name);
} }
public void GetZoneOptions(HttpContext context) public void GetZoneOptions(HttpContext context)
@@ -2458,15 +2456,8 @@ namespace DnsServerCore
if (zoneInfo.CatalogZoneName is not null) if (zoneInfo.CatalogZoneName is not null)
{ {
if (zoneInfo.ApexZone.CatalogZone is null) jsonWriter.WriteBoolean("isSecondaryCatalogMember", zoneInfo.ApexZone.SecondaryCatalogZone is not null);
{ jsonWriter.WriteBoolean("overrideCatalogQueryAccess", zoneInfo.OverrideCatalogQueryAccess);
jsonWriter.WriteBoolean("isSecondaryCatalogMember", true);
}
else
{
jsonWriter.WriteBoolean("isSecondaryCatalogMember", false);
jsonWriter.WriteBoolean("overrideCatalogQueryAccess", zoneInfo.OverrideCatalogQueryAccess);
}
} }
break; break;
@@ -2474,12 +2465,19 @@ namespace DnsServerCore
jsonWriter.WriteString("catalog", zoneInfo.CatalogZoneName); jsonWriter.WriteString("catalog", zoneInfo.CatalogZoneName);
if (zoneInfo.CatalogZoneName is not null) if (zoneInfo.CatalogZoneName is not null)
{
jsonWriter.WriteBoolean("overrideCatalogQueryAccess", zoneInfo.OverrideCatalogQueryAccess);
jsonWriter.WriteBoolean("overrideCatalogZoneTransfer", zoneInfo.OverrideCatalogZoneTransfer);
jsonWriter.WriteBoolean("overrideCatalogPrimaryNameServers", zoneInfo.OverrideCatalogPrimaryNameServers); jsonWriter.WriteBoolean("overrideCatalogPrimaryNameServers", zoneInfo.OverrideCatalogPrimaryNameServers);
}
break; break;
case AuthZoneType.SecondaryForwarder: case AuthZoneType.SecondaryForwarder:
jsonWriter.WriteString("catalog", zoneInfo.CatalogZoneName); jsonWriter.WriteString("catalog", zoneInfo.CatalogZoneName);
if (zoneInfo.CatalogZoneName is not null)
jsonWriter.WriteBoolean("overrideCatalogQueryAccess", zoneInfo.OverrideCatalogQueryAccess);
break; break;
} }
@@ -2521,34 +2519,27 @@ namespace DnsServerCore
jsonWriter.WriteBoolean("validateZone", zoneInfo.ValidateZone); jsonWriter.WriteBoolean("validateZone", zoneInfo.ValidateZone);
//query access //query access
switch (zoneInfo.Type)
{ {
case AuthZoneType.Primary: jsonWriter.WriteString("queryAccess", zoneInfo.QueryAccess.ToString());
case AuthZoneType.Secondary: jsonWriter.WriteStartArray("queryAccessNetworkACL");
case AuthZoneType.Stub:
case AuthZoneType.Forwarder:
case AuthZoneType.SecondaryForwarder:
case AuthZoneType.Catalog:
jsonWriter.WriteString("queryAccess", zoneInfo.QueryAccess.ToString());
jsonWriter.WriteStartArray("queryAccessNetworkACL");
if (zoneInfo.QueryAccessNetworkACL is not null) if (zoneInfo.QueryAccessNetworkACL is not null)
{ {
foreach (NetworkAccessControl nac in zoneInfo.QueryAccessNetworkACL) foreach (NetworkAccessControl nac in zoneInfo.QueryAccessNetworkACL)
jsonWriter.WriteStringValue(nac.ToString()); jsonWriter.WriteStringValue(nac.ToString());
} }
jsonWriter.WriteEndArray(); jsonWriter.WriteEndArray();
break;
} }
//zone transfer & notify //zone transfer
switch (zoneInfo.Type) switch (zoneInfo.Type)
{ {
case AuthZoneType.Primary: case AuthZoneType.Primary:
case AuthZoneType.Secondary: case AuthZoneType.Secondary:
case AuthZoneType.Forwarder: case AuthZoneType.Forwarder:
case AuthZoneType.Catalog: case AuthZoneType.Catalog:
case AuthZoneType.SecondaryCatalog:
jsonWriter.WriteString("zoneTransfer", zoneInfo.ZoneTransfer.ToString()); jsonWriter.WriteString("zoneTransfer", zoneInfo.ZoneTransfer.ToString());
jsonWriter.WritePropertyName("zoneTransferNetworkACL"); jsonWriter.WritePropertyName("zoneTransferNetworkACL");
@@ -2577,6 +2568,16 @@ namespace DnsServerCore
jsonWriter.WriteEndArray(); jsonWriter.WriteEndArray();
} }
break;
}
//notify
switch (zoneInfo.Type)
{
case AuthZoneType.Primary:
case AuthZoneType.Secondary:
case AuthZoneType.Forwarder:
case AuthZoneType.Catalog:
jsonWriter.WriteString("notify", zoneInfo.Notify.ToString()); jsonWriter.WriteString("notify", zoneInfo.Notify.ToString());
jsonWriter.WritePropertyName("notifyNameServers"); jsonWriter.WritePropertyName("notifyNameServers");
@@ -2740,7 +2741,7 @@ namespace DnsServerCore
case AuthZoneType.Stub: case AuthZoneType.Stub:
{ {
if ((zoneInfo.CatalogZoneName is not null) && (zoneInfo.ApexZone.CatalogZone is null)) if (zoneInfo.ApexZone.SecondaryCatalogZone is not null)
break; //cannot set option for Stub zone that is a member of Secondary Catalog Zone break; //cannot set option for Stub zone that is a member of Secondary Catalog Zone
if (request.TryGetQueryOrForm("overrideCatalogQueryAccess", bool.Parse, out bool overrideCatalogQueryAccess)) if (request.TryGetQueryOrForm("overrideCatalogQueryAccess", bool.Parse, out bool overrideCatalogQueryAccess))
@@ -2756,8 +2757,8 @@ namespace DnsServerCore
case AuthZoneType.SecondaryForwarder: case AuthZoneType.SecondaryForwarder:
case AuthZoneType.SecondaryCatalog: case AuthZoneType.SecondaryCatalog:
{ {
if ((zoneInfo.CatalogZoneName is not null) && (zoneInfo.ApexZone.CatalogZone is null)) if (zoneInfo.ApexZone.SecondaryCatalogZone is not null)
break; //cannot set option for Stub zone that is a member of Secondary Catalog Zone break; //cannot set option for zone that is a member of Secondary Catalog Zone
if (request.TryGetQueryOrFormEnum("primaryZoneTransferProtocol", out DnsTransportProtocol primaryZoneTransferProtocol)) if (request.TryGetQueryOrFormEnum("primaryZoneTransferProtocol", out DnsTransportProtocol primaryZoneTransferProtocol))
{ {
@@ -2801,7 +2802,7 @@ namespace DnsServerCore
case AuthZoneType.Stub: case AuthZoneType.Stub:
{ {
if ((zoneInfo.CatalogZoneName is not null) && (zoneInfo.ApexZone.CatalogZone is null)) if (zoneInfo.ApexZone.SecondaryCatalogZone is not null)
break; //cannot set option for Stub zone that is a member of Secondary Catalog Zone break; //cannot set option for Stub zone that is a member of Secondary Catalog Zone
string primaryNameServerAddresses = request.QueryOrForm("primaryNameServerAddresses"); string primaryNameServerAddresses = request.QueryOrForm("primaryNameServerAddresses");
@@ -2830,7 +2831,7 @@ namespace DnsServerCore
if (zoneInfo.Type == AuthZoneType.Secondary) if (zoneInfo.Type == AuthZoneType.Secondary)
{ {
if ((zoneInfo.CatalogZoneName is not null) && (zoneInfo.ApexZone.CatalogZone is null)) if (zoneInfo.ApexZone.SecondaryCatalogZone is not null)
{ {
//cannot set option for zone that is a member of Secondary Catalog Zone //cannot set option for zone that is a member of Secondary Catalog Zone
} }
@@ -2849,7 +2850,7 @@ namespace DnsServerCore
case AuthZoneType.Forwarder: case AuthZoneType.Forwarder:
case AuthZoneType.SecondaryForwarder: case AuthZoneType.SecondaryForwarder:
case AuthZoneType.Catalog: case AuthZoneType.Catalog:
if ((zoneInfo.CatalogZoneName is not null) && (zoneInfo.ApexZone.CatalogZone is null)) if (zoneInfo.ApexZone.SecondaryCatalogZone is not null)
break; //cannot set option for zone that is a member of Secondary Catalog Zone break; //cannot set option for zone that is a member of Secondary Catalog Zone
string queryAccessNetworkACL = request.QueryOrForm("queryAccessNetworkACL"); string queryAccessNetworkACL = request.QueryOrForm("queryAccessNetworkACL");
@@ -2874,7 +2875,7 @@ namespace DnsServerCore
case AuthZoneType.Secondary: case AuthZoneType.Secondary:
case AuthZoneType.Forwarder: case AuthZoneType.Forwarder:
case AuthZoneType.Catalog: case AuthZoneType.Catalog:
if ((zoneInfo.CatalogZoneName is not null) && (zoneInfo.ApexZone.CatalogZone is null)) if (zoneInfo.ApexZone.SecondaryCatalogZone is not null)
break; //cannot set option for zone that is a member of Secondary Catalog Zone break; //cannot set option for zone that is a member of Secondary Catalog Zone
string strZoneTransferNetworkACL = request.QueryOrForm("zoneTransferNetworkACL"); string strZoneTransferNetworkACL = request.QueryOrForm("zoneTransferNetworkACL");
@@ -3007,7 +3008,7 @@ namespace DnsServerCore
case AuthZoneType.Primary: case AuthZoneType.Primary:
case AuthZoneType.Stub: case AuthZoneType.Stub:
case AuthZoneType.Forwarder: case AuthZoneType.Forwarder:
if ((zoneInfo.Type == AuthZoneType.Stub) && (zoneInfo.CatalogZoneName is not null) && (zoneInfo.ApexZone.CatalogZone is null)) if (zoneInfo.ApexZone.SecondaryCatalogZone is not null)
break; //cannot set option for Stub zone that is a member of Secondary Catalog Zone break; //cannot set option for Stub zone that is a member of Secondary Catalog Zone
string catalogZoneName = request.QueryOrForm("catalog"); string catalogZoneName = request.QueryOrForm("catalog");
@@ -3029,6 +3030,9 @@ namespace DnsServerCore
} }
} }
if (zoneInfo.ApexZone.CatalogZone is not null)
_dnsWebService.DnsServer.AuthZoneManager.SaveZoneFile(zoneInfo.ApexZone.CatalogZoneName);
break; break;
} }