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

WebServiceZonesApi: Updated API for zsk auto rollover option. Updated API to allow adding FWD records with this-server option to also use DNSSEC validation option. Minor fixes done.

Browse Source
This commit is contained in:
Shreyas Zare
2022-03-12 15:53:15 +05:30
parent a60f1d5f9b
commit 2d974cb647
1 changed files with 55 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
DnsServerCore/WebServiceZonesApi.cs
View File

@@ -273,6 +273,13 @@ namespace DnsServerCore
else
dnsKeyTtl = uint.Parse(strDnsKeyTtl);
ushort zskRolloverDays;
string strZskDays = request.QueryString["zskRolloverDays"];
if (string.IsNullOrEmpty(strZskDays))
zskRolloverDays = 90;
else
zskRolloverDays = ushort.Parse(strZskDays);
bool useNSEC3 = false;
string strNxProof = request.QueryString["nxProof"];
if (!string.IsNullOrEmpty(strNxProof))
@@ -325,9 +332,9 @@ namespace DnsServerCore
int zskKeySize = int.Parse(strZSKKeySize);
if (useNSEC3)
_dnsWebService.DnsServer.AuthZoneManager.SignPrimaryZoneWithRsaNSEC3(zoneName, hashAlgorithm, kskKeySize, zskKeySize, iterations, saltLength, dnsKeyTtl);
_dnsWebService.DnsServer.AuthZoneManager.SignPrimaryZoneWithRsaNSEC3(zoneName, hashAlgorithm, kskKeySize, zskKeySize, iterations, saltLength, dnsKeyTtl, zskRolloverDays);
else
_dnsWebService.DnsServer.AuthZoneManager.SignPrimaryZoneWithRsaNSEC(zoneName, hashAlgorithm, kskKeySize, zskKeySize, dnsKeyTtl);
_dnsWebService.DnsServer.AuthZoneManager.SignPrimaryZoneWithRsaNSEC(zoneName, hashAlgorithm, kskKeySize, zskKeySize, dnsKeyTtl, zskRolloverDays);
break;
@@ -337,9 +344,9 @@ namespace DnsServerCore
throw new DnsWebServiceException("Parameter 'curve' missing.");
if (useNSEC3)
_dnsWebService.DnsServer.AuthZoneManager.SignPrimaryZoneWithEcdsaNSEC3(zoneName, curve, iterations, saltLength, dnsKeyTtl);
_dnsWebService.DnsServer.AuthZoneManager.SignPrimaryZoneWithEcdsaNSEC3(zoneName, curve, iterations, saltLength, dnsKeyTtl, zskRolloverDays);
else
_dnsWebService.DnsServer.AuthZoneManager.SignPrimaryZoneWithEcdsaNSEC(zoneName, curve, dnsKeyTtl);
_dnsWebService.DnsServer.AuthZoneManager.SignPrimaryZoneWithEcdsaNSEC(zoneName, curve, dnsKeyTtl, zskRolloverDays);
break;
@@ -415,6 +422,9 @@ namespace DnsServerCore
jsonWriter.WritePropertyName("dnsKeyTtl");
jsonWriter.WriteValue(zoneInfo.DnsKeyTtl);
jsonWriter.WritePropertyName("zskRolloverDays");
jsonWriter.WriteValue(zoneInfo.ZskRolloverDays);
jsonWriter.WritePropertyName("dnssecPrivateKeys");
jsonWriter.WriteStartArray();
@@ -560,6 +570,27 @@ namespace DnsServerCore
_dnsWebService.DnsServer.AuthZoneManager.SaveZoneFile(zoneName);
}
public void UpdatePrimaryZoneDnssecDnsKeyRollover(HttpListenerRequest request)
{
string zoneName = request.QueryString["zone"];
if (string.IsNullOrEmpty(zoneName))
throw new DnsWebServiceException("Parameter 'zone' missing.");
zoneName = zoneName.TrimEnd('.');
string strZskRolloverDays = request.QueryString["zskRolloverDays"];
if (string.IsNullOrEmpty(strZskRolloverDays))
throw new DnsWebServiceException("Parameter 'zskRolloverDays' missing.");
ushort zskRolloverDays = ushort.Parse(strZskRolloverDays);
_dnsWebService.DnsServer.AuthZoneManager.UpdatePrimaryZoneDnssecDnsKeyRollover(zoneName, zskRolloverDays);
_dnsWebService.Log.Write(DnsWebService.GetRequestRemoteEndPoint(request), "[" + _dnsWebService.GetSession(request).Username + "] Primary zone DNSKEY automatic rollover config was updated successfully: " + zoneName);
_dnsWebService.DnsServer.AuthZoneManager.SaveZoneFile(zoneName);
}
public void GenerateAndAddPrimaryZoneDnssecPrivateKey(HttpListenerRequest request)
{
string zoneName = request.QueryString["zone"];
@@ -998,8 +1029,11 @@ namespace DnsServerCore
domain = domain.TrimEnd('.');
string zoneName = request.QueryString["zone"];
if (zoneName is not null)
zoneName = zoneName.TrimEnd('.');
AuthZoneInfo zoneInfo = _dnsWebService.DnsServer.AuthZoneManager.FindAuthZoneInfo(string.IsNullOrEmpty(zoneName) ? domain : zoneName);
if (zoneInfo == null)
if (zoneInfo is null)
throw new DnsWebServiceException("No authoritative zone was not found for domain: " + domain);
if (zoneInfo.Internal)
@@ -1397,6 +1431,10 @@ namespace DnsServerCore
}
bool dnssecValidation = false;
string strDnssecValidation = request.QueryString["dnssecValidation"];
if (!string.IsNullOrEmpty(strDnssecValidation))
dnssecValidation = bool.Parse(strDnssecValidation);
NetProxyType proxyType = NetProxyType.None;
string proxyAddress = null;
ushort proxyPort = 0;
@@ -1405,10 +1443,6 @@ namespace DnsServerCore
if (!forwarder.Equals("this-server"))
{
string strDnssecValidation = request.QueryString["dnssecValidation"];
if (!string.IsNullOrEmpty(strDnssecValidation))
dnssecValidation = bool.Parse(strDnssecValidation);
string strProxyType = request.QueryString["proxyType"];
if (!string.IsNullOrEmpty(strProxyType))
proxyType = Enum.Parse<NetProxyType>(strProxyType, true);
@@ -2280,8 +2314,11 @@ namespace DnsServerCore
domain = domain.TrimEnd('.');
string zoneName = request.QueryString["zone"];
if (zoneName is not null)
zoneName = zoneName.TrimEnd('.');
AuthZoneInfo zoneInfo = _dnsWebService.DnsServer.AuthZoneManager.FindAuthZoneInfo(string.IsNullOrEmpty(zoneName) ? domain : zoneName);
if (zoneInfo == null)
if (zoneInfo is null)
throw new DnsWebServiceException("No authoritative zone was not found for domain: " + domain);
if (zoneInfo.Internal)
@@ -2534,8 +2571,11 @@ namespace DnsServerCore
domain = domain.TrimEnd('.');
string zoneName = request.QueryString["zone"];
if (zoneName is not null)
zoneName = zoneName.TrimEnd('.');
AuthZoneInfo zoneInfo = _dnsWebService.DnsServer.AuthZoneManager.FindAuthZoneInfo(string.IsNullOrEmpty(zoneName) ? domain : zoneName);
if (zoneInfo == null)
if (zoneInfo is null)
throw new DnsWebServiceException("No authoritative zone was not found for domain: " + domain);
if (zoneInfo.Internal)
@@ -3126,6 +3166,10 @@ namespace DnsServerCore
}
bool dnssecValidation = false;
string strDnssecValidation = request.QueryString["dnssecValidation"];
if (!string.IsNullOrEmpty(strDnssecValidation))
dnssecValidation = bool.Parse(strDnssecValidation);
NetProxyType proxyType = NetProxyType.None;
string proxyAddress = null;
ushort proxyPort = 0;
@@ -3134,10 +3178,6 @@ namespace DnsServerCore
if (!newForwarder.Equals("this-server"))
{
string strDnssecValidation = request.QueryString["dnssecValidation"];
if (!string.IsNullOrEmpty(strDnssecValidation))
dnssecValidation = bool.Parse(strDnssecValidation);
string strProxyType = request.QueryString["proxyType"];
if (!string.IsNullOrEmpty(strProxyType))
proxyType = Enum.Parse<NetProxyType>(strProxyType, true);