fergalmoran/DnsServer
1
0
Fork 0
mirror of https://github.com/fergalmoran/DnsServer.git synced 2026-04-04 19:59:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

WebServiceZonesApi: Updated WriteRecordsAsJson() to removed SHA1 computed digests for DNSKEY and add lastUsedOn value. Updated enum parsing to ignore case.

Browse Source
This commit is contained in:
Shreyas Zare
2022-04-23 18:03:17 +05:30
parent ac81c5c327
commit 58c3af71f8
1 changed files with 10 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
DnsServerCore/WebServiceZonesApi.cs
View File

@@ -1059,7 +1059,7 @@ namespace DnsServerCore
if (string.IsNullOrEmpty(strType))
throw new DnsWebServiceException("Parameter 'type' missing.");
DnsResourceRecordType type = (DnsResourceRecordType)Enum.Parse(typeof(DnsResourceRecordType), strType);
DnsResourceRecordType type = Enum.Parse<DnsResourceRecordType>(strType, true);
string value = request.QueryString["value"];
@@ -1367,7 +1367,7 @@ namespace DnsServerCore
digest = value;
}
DnsResourceRecord newRecord = new DnsResourceRecord(domain, type, DnsClass.IN, ttl, new DnsDSRecordData(ushort.Parse(strKeyTag), Enum.Parse<DnssecAlgorithm>(strAlgorithm), Enum.Parse<DnssecDigestType>(strDigestType), Convert.FromHexString(digest)));
DnsResourceRecord newRecord = new DnsResourceRecord(domain, type, DnsClass.IN, ttl, new DnsDSRecordData(ushort.Parse(strKeyTag), Enum.Parse<DnssecAlgorithm>(strAlgorithm, true), Enum.Parse<DnssecDigestType>(strDigestType, true), Convert.FromHexString(digest)));
if (!string.IsNullOrEmpty(comments))
newRecord.SetComments(comments);
@@ -2032,18 +2032,6 @@ namespace DnsServerCore
jsonWriter.WritePropertyName("computedDigests");
jsonWriter.WriteStartArray();
{
jsonWriter.WriteStartObject();
jsonWriter.WritePropertyName("digestType");
jsonWriter.WriteValue("SHA1");
jsonWriter.WritePropertyName("digest");
jsonWriter.WriteValue(rdata.CreateDS(record.Name, DnssecDigestType.SHA1).Digest);
jsonWriter.WriteEndObject();
}
{
jsonWriter.WriteStartObject();
@@ -2310,6 +2298,9 @@ namespace DnsServerCore
jsonWriter.WritePropertyName("dnssecStatus");
jsonWriter.WriteValue(record.DnssecStatus.ToString());
jsonWriter.WritePropertyName("lastUsedOn");
jsonWriter.WriteValue(recordInfo.LastUsedOn);
jsonWriter.WriteEndObject();
}
}
@@ -2344,7 +2335,7 @@ namespace DnsServerCore
if (string.IsNullOrEmpty(strType))
throw new DnsWebServiceException("Parameter 'type' missing.");
DnsResourceRecordType type = (DnsResourceRecordType)Enum.Parse(typeof(DnsResourceRecordType), strType);
DnsResourceRecordType type = Enum.Parse<DnsResourceRecordType>(strType, true);
string value = request.QueryString["value"];
@@ -2501,7 +2492,7 @@ namespace DnsServerCore
digest = value;
}
_dnsWebService.DnsServer.AuthZoneManager.DeleteRecord(zoneName, domain, type, new DnsDSRecordData(ushort.Parse(strKeyTag), Enum.Parse<DnssecAlgorithm>(strAlgorithm), Enum.Parse<DnssecDigestType>(strDigestType), Convert.FromHexString(digest)));
_dnsWebService.DnsServer.AuthZoneManager.DeleteRecord(zoneName, domain, type, new DnsDSRecordData(ushort.Parse(strKeyTag), Enum.Parse<DnssecAlgorithm>(strAlgorithm, true), Enum.Parse<DnssecDigestType>(strDigestType, true), Convert.FromHexString(digest)));
}
break;
@@ -2575,7 +2566,7 @@ namespace DnsServerCore
if (string.IsNullOrEmpty(strType))
throw new DnsWebServiceException("Parameter 'type' missing.");
DnsResourceRecordType type = (DnsResourceRecordType)Enum.Parse(typeof(DnsResourceRecordType), strType);
DnsResourceRecordType type = Enum.Parse<DnsResourceRecordType>(strType, true);
string domain = request.QueryString["domain"];
if (string.IsNullOrEmpty(domain))
@@ -3065,8 +3056,8 @@ namespace DnsServerCore
newDigest = newValue;
}
DnsResourceRecord oldRecord = new DnsResourceRecord(domain, type, DnsClass.IN, 0, new DnsDSRecordData(ushort.Parse(strKeyTag), Enum.Parse<DnssecAlgorithm>(strAlgorithm), Enum.Parse<DnssecDigestType>(strDigestType), Convert.FromHexString(digest)));
DnsResourceRecord newRecord = new DnsResourceRecord(newDomain, type, DnsClass.IN, ttl, new DnsDSRecordData(ushort.Parse(strNewKeyTag), Enum.Parse<DnssecAlgorithm>(strNewAlgorithm), Enum.Parse<DnssecDigestType>(strNewDigestType), Convert.FromHexString(newDigest)));
DnsResourceRecord oldRecord = new DnsResourceRecord(domain, type, DnsClass.IN, 0, new DnsDSRecordData(ushort.Parse(strKeyTag), Enum.Parse<DnssecAlgorithm>(strAlgorithm, true), Enum.Parse<DnssecDigestType>(strDigestType, true), Convert.FromHexString(digest)));
DnsResourceRecord newRecord = new DnsResourceRecord(newDomain, type, DnsClass.IN, ttl, new DnsDSRecordData(ushort.Parse(strNewKeyTag), Enum.Parse<DnssecAlgorithm>(strNewAlgorithm, true), Enum.Parse<DnssecDigestType>(strNewDigestType, true), Convert.FromHexString(newDigest)));
if (disable)
newRecord.Disable();