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

WebServiceZonesApi: Added support for split text option in TXT record and new NAPTR record.

Browse Source
This commit is contained in:
Shreyas Zare
2024-05-19 16:40:40 +05:30
parent 81b797485d
commit 9099bfde68
1 changed files with 171 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

176
DnsServerCore/WebServiceZonesApi.cs
View File

@@ -28,6 +28,7 @@ using System;
using System.Collections.Generic;
using System.IO;
using System.Net;
using System.Text;
using System.Text.Json;
using System.Threading.Tasks;
using TechnitiumLibrary;
@@ -44,6 +45,7 @@ namespace DnsServerCore
static readonly char[] _commaSeparator = new char[] { ',' };
static readonly char[] _pipeSeparator = new char[] { '|' };
static readonly char[] _commaSpaceSeparator = new char[] { ',', ' ' };
static readonly char[] _newLineSeparator = new char[] { '\r', '\n' };
readonly DnsWebService _dnsWebService;
@@ -278,7 +280,15 @@ namespace DnsServerCore
{
if (record.RDATA is DnsTXTRecordData rdata)
{
jsonWriter.WriteString("text", rdata.Text);
jsonWriter.WriteString("text", rdata.GetText());
jsonWriter.WriteBoolean("splitText", rdata.CharacterStrings.Count > 1);
jsonWriter.WriteStartArray("characterStrings");
foreach (string characterString in rdata.CharacterStrings)
jsonWriter.WriteStringValue(characterString);
jsonWriter.WriteEndArray();
}
else
{
@@ -322,6 +332,28 @@ namespace DnsServerCore
}
break;
case DnsResourceRecordType.NAPTR:
{
if (record.RDATA is DnsNAPTRRecordData rdata)
{
jsonWriter.WriteNumber("order", rdata.Order);
jsonWriter.WriteNumber("preference", rdata.Preference);
jsonWriter.WriteString("flags", rdata.Flags);
jsonWriter.WriteString("services", rdata.Services);
jsonWriter.WriteString("regexp", rdata.Regexp);
jsonWriter.WriteString("replacement", rdata.Replacement.Length == 0 ? "." : rdata.Replacement);
if (DnsClient.TryConvertDomainNameToUnicode(rdata.Replacement, out string replacementIdn))
jsonWriter.WriteString("replacementIdn", replacementIdn);
}
else
{
jsonWriter.WriteString("dataType", record.RDATA.GetType().Name);
jsonWriter.WriteString("data", record.RDATA.ToString());
}
}
break;
case DnsResourceRecordType.DNAME:
{
if (record.RDATA is DnsDNAMERecordData rdata)
@@ -840,6 +872,68 @@ namespace DnsServerCore
jsonWriter.WriteEndObject();
}
private static string[] DecodeCharacterStrings(string text)
{
string[] characterStrings = text.Split(_newLineSeparator, StringSplitOptions.RemoveEmptyEntries);
for (int i = 0; i < characterStrings.Length; i++)
characterStrings[i] = Unescape(characterStrings[i]);
return characterStrings;
}
private static string Unescape(string text)
{
StringBuilder sb = new StringBuilder(text.Length);
for (int i = 0, j; i < text.Length; i++)
{
char c = text[i];
if (c == '\\')
{
j = i + 1;
if (j == text.Length)
{
sb.Append(c);
break;
}
char next = text[j];
switch (next)
{
case 'n':
sb.Append('\n');
break;
case 'r':
sb.Append('\r');
break;
case 't':
sb.Append('\t');
break;
case '\\':
sb.Append('\\');
break;
default:
sb.Append(c).Append(next);
break;
}
i++;
}
else
{
sb.Append(c);
}
}
return sb.ToString();
}
#endregion
#region public
@@ -2474,8 +2568,9 @@ namespace DnsServerCore
case DnsResourceRecordType.TXT:
{
string text = request.GetQueryOrFormAlt("text", "value");
bool splitText = request.GetQueryOrForm("splitText", bool.Parse, false);
newRecord = new DnsResourceRecord(domain, type, DnsClass.IN, ttl, new DnsTXTRecordData(text));
newRecord = new DnsResourceRecord(domain, type, DnsClass.IN, ttl, splitText ? new DnsTXTRecordData(DecodeCharacterStrings(text)) : new DnsTXTRecordData(text));
if (!string.IsNullOrEmpty(comments))
newRecord.GetAuthRecordInfo().Comments = comments;
@@ -2506,6 +2601,27 @@ namespace DnsServerCore
}
break;
case DnsResourceRecordType.NAPTR:
{
ushort order = request.GetQueryOrForm("naptrOrder", ushort.Parse);
ushort preference = request.GetQueryOrForm("naptrPreference", ushort.Parse);
string flags = request.GetQueryOrForm("naptrFlags", "");
string services = request.GetQueryOrForm("naptrServices", "");
string regexp = request.GetQueryOrForm("naptrRegexp", "");
string replacement = request.GetQueryOrForm("naptrReplacement", "").TrimEnd('.');
newRecord = new DnsResourceRecord(domain, type, DnsClass.IN, ttl, new DnsNAPTRRecordData(order, preference, flags, services, regexp, replacement));
if (!string.IsNullOrEmpty(comments))
newRecord.GetAuthRecordInfo().Comments = comments;
if (overwrite)
_dnsWebService.DnsServer.AuthZoneManager.SetRecord(zoneInfo.Name, newRecord);
else
_dnsWebService.DnsServer.AuthZoneManager.AddRecord(zoneInfo.Name, newRecord);
}
break;
case DnsResourceRecordType.DNAME:
{
if (!overwrite)
@@ -2927,8 +3043,9 @@ namespace DnsServerCore
case DnsResourceRecordType.TXT:
{
string text = request.GetQueryOrFormAlt("text", "value");
bool splitText = request.GetQueryOrForm("splitText", bool.Parse, false);
_dnsWebService.DnsServer.AuthZoneManager.DeleteRecord(zoneInfo.Name, domain, type, new DnsTXTRecordData(text));
_dnsWebService.DnsServer.AuthZoneManager.DeleteRecord(zoneInfo.Name, domain, type, splitText ? new DnsTXTRecordData(DecodeCharacterStrings(text)) : new DnsTXTRecordData(text));
}
break;
@@ -2943,6 +3060,19 @@ namespace DnsServerCore
}
break;
case DnsResourceRecordType.NAPTR:
{
ushort order = request.GetQueryOrForm("naptrOrder", ushort.Parse);
ushort preference = request.GetQueryOrForm("naptrPreference", ushort.Parse);
string flags = request.GetQueryOrForm("naptrFlags", "");
string services = request.GetQueryOrForm("naptrServices", "");
string regexp = request.GetQueryOrForm("naptrRegexp", "");
string replacement = request.GetQueryOrForm("naptrReplacement", "").TrimEnd('.');
_dnsWebService.DnsServer.AuthZoneManager.DeleteRecord(zoneInfo.Name, domain, type, new DnsNAPTRRecordData(order, preference, flags, services, regexp, replacement));
}
break;
case DnsResourceRecordType.DNAME:
_dnsWebService.DnsServer.AuthZoneManager.DeleteRecords(zoneInfo.Name, domain, type);
break;
@@ -3361,8 +3491,11 @@ namespace DnsServerCore
string text = request.GetQueryOrFormAlt("text", "value");
string newText = request.GetQueryOrFormAlt("newText", "newValue", text);
oldRecord = new DnsResourceRecord(domain, type, DnsClass.IN, 0, new DnsTXTRecordData(text));
newRecord = new DnsResourceRecord(newDomain, type, DnsClass.IN, ttl, new DnsTXTRecordData(newText));
bool splitText = request.GetQueryOrForm("splitText", bool.Parse, false);
bool newSplitText = request.GetQueryOrForm("newSplitText", bool.Parse, splitText);
oldRecord = new DnsResourceRecord(domain, type, DnsClass.IN, 0, splitText ? new DnsTXTRecordData(DecodeCharacterStrings(text)) : new DnsTXTRecordData(text));
newRecord = new DnsResourceRecord(newDomain, type, DnsClass.IN, ttl, newSplitText ? new DnsTXTRecordData(DecodeCharacterStrings(newText)) : new DnsTXTRecordData(newText));
if (disable)
newRecord.GetAuthRecordInfo().Disabled = true;
@@ -3401,6 +3534,39 @@ namespace DnsServerCore
}
break;
case DnsResourceRecordType.NAPTR:
{
ushort order = request.GetQueryOrForm("naptrOrder", ushort.Parse);
ushort newOrder = request.GetQueryOrForm("naptrNewOrder", ushort.Parse, order);
ushort preference = request.GetQueryOrForm("naptrPreference", ushort.Parse);
ushort newPreference = request.GetQueryOrForm("naptrNewPreference", ushort.Parse, preference);
string flags = request.GetQueryOrForm("naptrFlags", "");
string newFlags = request.GetQueryOrForm("naptrNewFlags", flags);
string services = request.GetQueryOrForm("naptrServices", "");
string newServices = request.GetQueryOrForm("naptrNewServices", services);
string regexp = request.GetQueryOrForm("naptrRegexp", "");
string newRegexp = request.GetQueryOrForm("naptrNewRegexp", regexp);
string replacement = request.GetQueryOrForm("naptrReplacement", "").TrimEnd('.');
string newReplacement = request.GetQueryOrForm("naptrNewReplacement", replacement).TrimEnd('.');
oldRecord = new DnsResourceRecord(domain, type, DnsClass.IN, 0, new DnsNAPTRRecordData(order, preference, flags, services, regexp, replacement));
newRecord = new DnsResourceRecord(newDomain, type, DnsClass.IN, ttl, new DnsNAPTRRecordData(newOrder, newPreference, newFlags, newServices, newRegexp, newReplacement));
if (disable)
newRecord.GetAuthRecordInfo().Disabled = true;
if (!string.IsNullOrEmpty(comments))
newRecord.GetAuthRecordInfo().Comments = comments;
_dnsWebService.DnsServer.AuthZoneManager.UpdateRecord(zoneInfo.Name, oldRecord, newRecord);
}
break;
case DnsResourceRecordType.DNAME:
{
string dname = request.GetQueryOrFormAlt("dname", "value").TrimEnd('.');