fergalmoran/DnsServer
1
0
Fork 0
mirror of https://github.com/fergalmoran/DnsServer.git synced 2026-01-08 17:54:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

WebServiceOtherZonesApi: added IDN support.

Browse Source
This commit is contained in:
Shreyas Zare
2023-04-23 16:30:49 +05:30
parent c924ec6188
commit c3d550e5a6
1 changed files with 71 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
DnsServerCore/WebServiceOtherZonesApi.cs
View File

@@ -20,12 +20,14 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
using DnsServerCore.Auth;
using DnsServerCore.Dns.Zones;
using Microsoft.AspNetCore.Http;
using System;
using System.Collections.Generic;
using System.IO;
using System.Net;
using System.Text.Json;
using System.Threading.Tasks;
using TechnitiumLibrary.Net;
using TechnitiumLibrary.Net.Dns;
using TechnitiumLibrary.Net.Dns.ResourceRecords;
namespace DnsServerCore
@@ -74,6 +76,9 @@ namespace DnsServerCore
string domain = request.GetQueryOrForm("domain", "");
if (DnsClient.IsDomainNameUnicode(domain))
domain = DnsClient.ConvertDomainNameToAscii(domain);
string direction = request.QueryOrForm("direction");
if (direction is not null)
direction = direction.ToLower();
@@ -122,6 +127,9 @@ namespace DnsServerCore
jsonWriter.WriteString("domain", domain);
if (domain.Contains("xn--", StringComparison.OrdinalIgnoreCase))
jsonWriter.WriteString("domainIdn", DnsClient.ConvertDomainNameToUnicode(domain));
jsonWriter.WritePropertyName("zones");
jsonWriter.WriteStartArray();
@@ -129,7 +137,14 @@ namespace DnsServerCore
domain = "." + domain;
foreach (string subZone in subZones)
jsonWriter.WriteStringValue(subZone + domain);
{
string zone = subZone + domain;
if (zone.Contains("xn--", StringComparison.OrdinalIgnoreCase))
zone = DnsClient.ConvertDomainNameToUnicode(zone);
jsonWriter.WriteStringValue(zone);
}
jsonWriter.WriteEndArray();
@@ -145,6 +160,9 @@ namespace DnsServerCore
string domain = context.Request.GetQueryOrForm("domain");
if (DnsClient.IsDomainNameUnicode(domain))
domain = DnsClient.ConvertDomainNameToAscii(domain);
if (_dnsWebService.DnsServer.CacheZoneManager.DeleteZone(domain))
_dnsWebService._log.Write(context.GetRemoteEndPoint(), "[" + session.User.Username + "] Cached zone was deleted: " + domain);
}
@@ -164,6 +182,9 @@ namespace DnsServerCore
string domain = request.GetQueryOrForm("domain", "");
if (DnsClient.IsDomainNameUnicode(domain))
domain = DnsClient.ConvertDomainNameToAscii(domain);
string direction = request.QueryOrForm("direction");
if (direction is not null)
direction = direction.ToLower();
@@ -212,6 +233,9 @@ namespace DnsServerCore
jsonWriter.WriteString("domain", domain);
if (domain.Contains("xn--", StringComparison.OrdinalIgnoreCase))
jsonWriter.WriteString("domainIdn", DnsClient.ConvertDomainNameToUnicode(domain));
jsonWriter.WritePropertyName("zones");
jsonWriter.WriteStartArray();
@@ -219,7 +243,14 @@ namespace DnsServerCore
domain = "." + domain;
foreach (string subZone in subZones)
jsonWriter.WriteStringValue(subZone + domain);
{
string zone = subZone + domain;
if (zone.Contains("xn--", StringComparison.OrdinalIgnoreCase))
zone = DnsClient.ConvertDomainNameToUnicode(zone);
jsonWriter.WriteStringValue(zone);
}
jsonWriter.WriteEndArray();
@@ -238,6 +269,12 @@ namespace DnsServerCore
string allowedZones = request.GetQueryOrForm("allowedZones");
string[] allowedZonesList = allowedZones.Split(',');
for (int i = 0; i < allowedZonesList.Length; i++)
{
if (DnsClient.IsDomainNameUnicode(allowedZonesList[i]))
allowedZonesList[i] = DnsClient.ConvertDomainNameToAscii(allowedZonesList[i]);
}
_dnsWebService.DnsServer.AllowedZoneManager.ImportZones(allowedZonesList);
_dnsWebService._log.Write(context.GetRemoteEndPoint(), "[" + session.User.Username + "] Total " + allowedZonesList.Length + " zones were imported into allowed zone successfully.");
@@ -274,6 +311,9 @@ namespace DnsServerCore
string domain = context.Request.GetQueryOrForm("domain");
if (DnsClient.IsDomainNameUnicode(domain))
domain = DnsClient.ConvertDomainNameToAscii(domain);
if (_dnsWebService.DnsServer.AllowedZoneManager.DeleteZone(domain))
{
_dnsWebService._log.Write(context.GetRemoteEndPoint(), "[" + session.User.Username + "] Allowed zone was deleted: " + domain);
@@ -303,6 +343,9 @@ namespace DnsServerCore
string domain = context.Request.GetQueryOrForm("domain");
if (DnsClient.IsDomainNameUnicode(domain))
domain = DnsClient.ConvertDomainNameToAscii(domain);
if (IPAddress.TryParse(domain, out IPAddress ipAddress))
domain = ipAddress.GetReverseDomain();
@@ -328,6 +371,9 @@ namespace DnsServerCore
string domain = request.GetQueryOrForm("domain", "");
if (DnsClient.IsDomainNameUnicode(domain))
domain = DnsClient.ConvertDomainNameToAscii(domain);
string direction = request.QueryOrForm("direction");
if (direction is not null)
direction = direction.ToLower();
@@ -376,6 +422,9 @@ namespace DnsServerCore
jsonWriter.WriteString("domain", domain);
if (domain.Contains("xn--", StringComparison.OrdinalIgnoreCase))
jsonWriter.WriteString("domainIdn", DnsClient.ConvertDomainNameToUnicode(domain));
jsonWriter.WritePropertyName("zones");
jsonWriter.WriteStartArray();
@@ -383,7 +432,14 @@ namespace DnsServerCore
domain = "." + domain;
foreach (string subZone in subZones)
jsonWriter.WriteStringValue(subZone + domain);
{
string zone = subZone + domain;
if (zone.Contains("xn--", StringComparison.OrdinalIgnoreCase))
zone = DnsClient.ConvertDomainNameToUnicode(zone);
jsonWriter.WriteStringValue(zone);
}
jsonWriter.WriteEndArray();
@@ -402,6 +458,12 @@ namespace DnsServerCore
string blockedZones = request.GetQueryOrForm("blockedZones");
string[] blockedZonesList = blockedZones.Split(',');
for (int i = 0; i < blockedZonesList.Length; i++)
{
if (DnsClient.IsDomainNameUnicode(blockedZonesList[i]))
blockedZonesList[i] = DnsClient.ConvertDomainNameToAscii(blockedZonesList[i]);
}
_dnsWebService.DnsServer.BlockedZoneManager.ImportZones(blockedZonesList);
_dnsWebService._log.Write(context.GetRemoteEndPoint(), "[" + session.User.Username + "] Total " + blockedZonesList.Length + " zones were imported into blocked zone successfully.");
@@ -438,6 +500,9 @@ namespace DnsServerCore
string domain = context.Request.GetQueryOrForm("domain");
if (DnsClient.IsDomainNameUnicode(domain))
domain = DnsClient.ConvertDomainNameToAscii(domain);
if (_dnsWebService.DnsServer.BlockedZoneManager.DeleteZone(domain))
{
_dnsWebService._log.Write(context.GetRemoteEndPoint(), "[" + session.User.Username + "] Blocked zone was deleted: " + domain);
@@ -467,6 +532,9 @@ namespace DnsServerCore
string domain = context.Request.GetQueryOrForm("domain");
if (DnsClient.IsDomainNameUnicode(domain))
domain = DnsClient.ConvertDomainNameToAscii(domain);
if (IPAddress.TryParse(domain, out IPAddress ipAddress))
domain = ipAddress.GetReverseDomain();