diff --git a/DnsServerCore/DnsWebService.cs b/DnsServerCore/DnsWebService.cs index ff20f45c..d80fa24b 100644 --- a/DnsServerCore/DnsWebService.cs +++ b/DnsServerCore/DnsWebService.cs @@ -948,7 +948,7 @@ namespace DnsServerCore } //add missing admin permissions - List zones = _dnsServer.AuthZoneManager.ListZones(); + List zones = _dnsServer.AuthZoneManager.GetAllZones(); Group admins = _authManager.GetGroup(Group.ADMINISTRATORS); Group dnsAdmins = _authManager.GetGroup(Group.DNS_ADMINISTRATORS); @@ -1009,7 +1009,7 @@ namespace DnsServerCore IPAddress[] localAddresses = new IPAddress[count]; for (int i = 0; i < count; i++) - localAddresses[i] = IPAddressExtension.ReadFrom(bR); + localAddresses[i] = IPAddressExtensions.ReadFrom(bR); _webServiceLocalAddresses = localAddresses; } @@ -1054,7 +1054,7 @@ namespace DnsServerCore IPEndPoint[] localEndPoints = new IPEndPoint[count]; for (int i = 0; i < count; i++) - localEndPoints[i] = (IPEndPoint)EndPointExtension.ReadFrom(bR); + localEndPoints[i] = (IPEndPoint)EndPointExtensions.ReadFrom(bR); _dnsServer.LocalEndPoints = localEndPoints; } @@ -1239,7 +1239,7 @@ namespace DnsServerCore for (int i = 0; i < count; i++) { - IPAddress customAddress = IPAddressExtension.ReadFrom(bR); + IPAddress customAddress = IPAddressExtensions.ReadFrom(bR); switch (customAddress.AddressFamily) { @@ -1351,7 +1351,7 @@ namespace DnsServerCore IPAddress[] localAddresses = new IPAddress[count]; for (int i = 0; i < count; i++) - localAddresses[i] = IPAddressExtension.ReadFrom(bR); + localAddresses[i] = IPAddressExtensions.ReadFrom(bR); _webServiceLocalAddresses = localAddresses; } @@ -1655,7 +1655,7 @@ namespace DnsServerCore for (int i = 0; i < count; i++) { - IPAddress customAddress = IPAddressExtension.ReadFrom(bR); + IPAddress customAddress = IPAddressExtensions.ReadFrom(bR); switch (customAddress.AddressFamily) { @@ -1715,7 +1715,7 @@ namespace DnsServerCore IPEndPoint[] localEndPoints = new IPEndPoint[count]; for (int i = 0; i < count; i++) - localEndPoints[i] = (IPEndPoint)EndPointExtension.ReadFrom(bR); + localEndPoints[i] = (IPEndPoint)EndPointExtensions.ReadFrom(bR); _dnsServer.LocalEndPoints = localEndPoints; } @@ -1728,7 +1728,7 @@ namespace DnsServerCore IPEndPoint[] localEndPoints = new IPEndPoint[count]; for (int i = 0; i < count; i++) - localEndPoints[i] = new IPEndPoint(IPAddressExtension.ReadFrom(bR), 53); + localEndPoints[i] = new IPEndPoint(IPAddressExtensions.ReadFrom(bR), 53); _dnsServer.LocalEndPoints = localEndPoints; } diff --git a/DnsServerCore/Extensions.cs b/DnsServerCore/Extensions.cs index 9bd1b403..630bbfef 100644 --- a/DnsServerCore/Extensions.cs +++ b/DnsServerCore/Extensions.cs @@ -120,7 +120,7 @@ namespace DnsServerCore return parse(value); } - public static T GetQueryOrForm(this HttpRequest request, string parameter) where T : struct + public static T GetQueryOrFormEnum(this HttpRequest request, string parameter) where T : struct { string value = request.QueryOrForm(parameter); if (string.IsNullOrEmpty(value)) @@ -138,7 +138,7 @@ namespace DnsServerCore return parse(value); } - public static T GetQueryOrForm(this HttpRequest request, string parameter, T defaultValue) where T : struct + public static T GetQueryOrFormEnum(this HttpRequest request, string parameter, T defaultValue) where T : struct { string value = request.QueryOrForm(parameter); if (string.IsNullOrEmpty(value)) @@ -169,7 +169,7 @@ namespace DnsServerCore return true; } - public static bool TryGetQueryOrForm(this HttpRequest request, string parameter, out T value) where T : struct + public static bool TryGetQueryOrFormEnum(this HttpRequest request, string parameter, out T value) where T : struct { string strValue = request.QueryOrForm(parameter); if (string.IsNullOrEmpty(strValue)) diff --git a/DnsServerCore/WebServiceApi.cs b/DnsServerCore/WebServiceApi.cs index 2ba8eea9..7c940cc1 100644 --- a/DnsServerCore/WebServiceApi.cs +++ b/DnsServerCore/WebServiceApi.cs @@ -161,8 +161,8 @@ namespace DnsServerCore string server = request.GetQueryOrForm("server"); string domain = request.GetQueryOrForm("domain").Trim(new char[] { '\t', ' ', '.' }); - DnsResourceRecordType type = request.GetQueryOrForm("type"); - DnsTransportProtocol protocol = request.GetQueryOrForm("protocol", DnsTransportProtocol.Udp); + DnsResourceRecordType type = request.GetQueryOrFormEnum("type"); + DnsTransportProtocol protocol = request.GetQueryOrFormEnum("protocol", DnsTransportProtocol.Udp); bool dnssecValidation = request.GetQueryOrForm("dnssec", bool.Parse, false); bool importResponse = request.GetQueryOrForm("import", bool.Parse, false); NetProxy proxy = _dnsWebService.DnsServer.Proxy; diff --git a/DnsServerCore/WebServiceAuthApi.cs b/DnsServerCore/WebServiceAuthApi.cs index 89638001..acc0088f 100644 --- a/DnsServerCore/WebServiceAuthApi.cs +++ b/DnsServerCore/WebServiceAuthApi.cs @@ -829,7 +829,7 @@ namespace DnsServerCore if (!_dnsWebService._authManager.IsPermitted(PermissionSection.Administration, session.User, PermissionFlag.View)) throw new DnsWebServiceException("Access was denied."); - section = request.GetQueryOrForm("section"); + section = request.GetQueryOrFormEnum("section"); break; case PermissionSection.Zones: @@ -877,7 +877,7 @@ namespace DnsServerCore if (!_dnsWebService._authManager.IsPermitted(PermissionSection.Administration, session.User, PermissionFlag.Delete)) throw new DnsWebServiceException("Access was denied."); - section = request.GetQueryOrForm("section"); + section = request.GetQueryOrFormEnum("section"); break; case PermissionSection.Zones: diff --git a/DnsServerCore/WebServiceDashboardApi.cs b/DnsServerCore/WebServiceDashboardApi.cs index c54443b2..f15ab21d 100644 --- a/DnsServerCore/WebServiceDashboardApi.cs +++ b/DnsServerCore/WebServiceDashboardApi.cs @@ -497,7 +497,7 @@ namespace DnsServerCore HttpRequest request = context.Request; string strType = request.GetQueryOrForm("type", "lastHour"); - TopStatsType statsType = request.GetQueryOrForm("statsType"); + TopStatsType statsType = request.GetQueryOrFormEnum("statsType"); int limit = request.GetQueryOrForm("limit", int.Parse, 1000); List> topStatsData; diff --git a/DnsServerCore/WebServiceOtherZonesApi.cs b/DnsServerCore/WebServiceOtherZonesApi.cs index 46e918d0..40de4077 100644 --- a/DnsServerCore/WebServiceOtherZonesApi.cs +++ b/DnsServerCore/WebServiceOtherZonesApi.cs @@ -223,7 +223,7 @@ namespace DnsServerCore jsonWriter.WriteEndArray(); - WebServiceZonesApi.WriteRecordsAsJson(new List(records), jsonWriter, false); + WebServiceZonesApi.WriteRecordsAsJson(records, jsonWriter, true); } public void ImportAllowedZones(HttpContext context) @@ -395,7 +395,7 @@ namespace DnsServerCore jsonWriter.WriteEndArray(); - WebServiceZonesApi.WriteRecordsAsJson(new List(records), jsonWriter, false); + WebServiceZonesApi.WriteRecordsAsJson(records, jsonWriter, true); } public void ImportBlockedZones(HttpContext context) diff --git a/DnsServerCore/WebServiceSettingsApi.cs b/DnsServerCore/WebServiceSettingsApi.cs index 11580da8..6e1ab973 100644 --- a/DnsServerCore/WebServiceSettingsApi.cs +++ b/DnsServerCore/WebServiceSettingsApi.cs @@ -872,7 +872,7 @@ namespace DnsServerCore } //recursion - if (request.TryGetQueryOrForm("recursion", out DnsServerRecursion recursion)) + if (request.TryGetQueryOrFormEnum("recursion", out DnsServerRecursion recursion)) _dnsWebService.DnsServer.Recursion = recursion; string recursionDeniedNetworks = request.QueryOrForm("recursionDeniedNetworks"); @@ -967,7 +967,7 @@ namespace DnsServerCore if (request.TryGetQueryOrForm("allowTxtBlockingReport", bool.Parse, out bool allowTxtBlockingReport)) _dnsWebService.DnsServer.AllowTxtBlockingReport = allowTxtBlockingReport; - if (request.TryGetQueryOrForm("blockingType", out DnsServerBlockingType blockingType)) + if (request.TryGetQueryOrFormEnum("blockingType", out DnsServerBlockingType blockingType)) _dnsWebService.DnsServer.BlockingType = blockingType; string customBlockingAddresses = request.QueryOrForm("customBlockingAddresses"); @@ -1100,7 +1100,7 @@ namespace DnsServerCore } //proxy & forwarders - if (request.TryGetQueryOrForm("proxyType", out NetProxyType proxyType)) + if (request.TryGetQueryOrFormEnum("proxyType", out NetProxyType proxyType)) { if (proxyType == NetProxyType.None) { @@ -1129,7 +1129,7 @@ namespace DnsServerCore } else { - DnsTransportProtocol forwarderProtocol = request.GetQueryOrForm("forwarderProtocol", DnsTransportProtocol.Udp); + DnsTransportProtocol forwarderProtocol = request.GetQueryOrFormEnum("forwarderProtocol", DnsTransportProtocol.Udp); switch (forwarderProtocol) {