fergalmoran/DnsServer
1
0
Fork 0
mirror of https://github.com/fergalmoran/DnsServer.git synced 2026-02-19 22:36:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

WebServiceZonesApi: Updated API code for rollover feature implementation changes. Minor refactoring done.

Browse Source
This commit is contained in:
Shreyas Zare
2022-03-26 12:11:10 +05:30
parent 4a4119ac9e
commit 7699dd7ce8
1 changed files with 43 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
DnsServerCore/WebServiceZonesApi.cs
View File

@@ -235,7 +235,7 @@ namespace DnsServerCore
proxyPassword = request.QueryString["proxyPassword"];
}
if (_dnsWebService.DnsServer.AuthZoneManager.CreateForwarderZone(zoneName, forwarderProtocol, strForwarder, dnssecValidation, proxyType, proxyAddress, proxyPort, proxyUsername, proxyPassword) is null)
if (_dnsWebService.DnsServer.AuthZoneManager.CreateForwarderZone(zoneName, forwarderProtocol, strForwarder, dnssecValidation, proxyType, proxyAddress, proxyPort, proxyUsername, proxyPassword, null) is null)
throw new DnsWebServiceException("Zone already exists: " + zoneName);
_dnsWebService.Log.Write(DnsWebService.GetRequestRemoteEndPoint(request), "[" + _dnsWebService.GetSession(request).Username + "] Forwarder zone was created: " + zoneName);
@@ -274,11 +274,11 @@ namespace DnsServerCore
dnsKeyTtl = uint.Parse(strDnsKeyTtl);
ushort zskRolloverDays;
string strZskDays = request.QueryString["zskRolloverDays"];
if (string.IsNullOrEmpty(strZskDays))
string strZskRolloverDays = request.QueryString["zskRolloverDays"];
if (string.IsNullOrEmpty(strZskRolloverDays))
zskRolloverDays = 90;
else
zskRolloverDays = ushort.Parse(strZskDays);
zskRolloverDays = ushort.Parse(strZskRolloverDays);
bool useNSEC3 = false;
string strNxProof = request.QueryString["nxProof"];
@@ -422,9 +422,6 @@ namespace DnsServerCore
jsonWriter.WritePropertyName("dnsKeyTtl");
jsonWriter.WriteValue(zoneInfo.DnsKeyTtl);
jsonWriter.WritePropertyName("zskRolloverDays");
jsonWriter.WriteValue(zoneInfo.ZskRolloverDays);
jsonWriter.WritePropertyName("dnssecPrivateKeys");
jsonWriter.WriteStartArray();
@@ -477,6 +474,9 @@ namespace DnsServerCore
jsonWriter.WritePropertyName("isRetiring");
jsonWriter.WriteValue(dnssecPrivateKey.IsRetiring);
jsonWriter.WritePropertyName("rolloverDays");
jsonWriter.WriteValue(dnssecPrivateKey.RolloverDays);
jsonWriter.WriteEndObject();
}
}
@@ -570,27 +570,6 @@ 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"];
@@ -605,6 +584,13 @@ namespace DnsServerCore
DnssecPrivateKeyType keyType = Enum.Parse<DnssecPrivateKeyType>(strKeyType, true);
ushort rolloverDays;
string strRolloverDays = request.QueryString["rolloverDays"];
if (string.IsNullOrEmpty(strRolloverDays))
rolloverDays = (ushort)(keyType == DnssecPrivateKeyType.ZoneSigningKey ? 90 : 0);
else
rolloverDays = ushort.Parse(strRolloverDays);
string algorithm = request.QueryString["algorithm"];
if (string.IsNullOrEmpty(algorithm))
throw new DnsWebServiceException("Parameter 'algorithm' missing.");
@@ -622,7 +608,7 @@ namespace DnsServerCore
int keySize = int.Parse(strKeySize);
_dnsWebService.DnsServer.AuthZoneManager.GenerateAndAddPrimaryZoneDnssecRsaPrivateKey(zoneName, keyType, hashAlgorithm, keySize);
_dnsWebService.DnsServer.AuthZoneManager.GenerateAndAddPrimaryZoneDnssecRsaPrivateKey(zoneName, keyType, hashAlgorithm, keySize, rolloverDays);
break;
case "ECDSA":
@@ -630,7 +616,7 @@ namespace DnsServerCore
if (string.IsNullOrEmpty(curve))
throw new DnsWebServiceException("Parameter 'curve' missing.");
_dnsWebService.DnsServer.AuthZoneManager.GenerateAndAddPrimaryZoneDnssecEcdsaPrivateKey(zoneName, keyType, curve);
_dnsWebService.DnsServer.AuthZoneManager.GenerateAndAddPrimaryZoneDnssecEcdsaPrivateKey(zoneName, keyType, curve, rolloverDays);
break;
default:
@@ -642,6 +628,33 @@ namespace DnsServerCore
_dnsWebService.DnsServer.AuthZoneManager.SaveZoneFile(zoneName);
}
public void UpdatePrimaryZoneDnssecPrivateKey(HttpListenerRequest request)
{
string zoneName = request.QueryString["zone"];
if (string.IsNullOrEmpty(zoneName))
throw new DnsWebServiceException("Parameter 'zone' missing.");
zoneName = zoneName.TrimEnd('.');
string strKeyTag = request.QueryString["keyTag"];
if (string.IsNullOrEmpty(strKeyTag))
throw new DnsWebServiceException("Parameter 'keyTag' missing.");
ushort keyTag = ushort.Parse(strKeyTag);
string strRolloverDays = request.QueryString["rolloverDays"];
if (string.IsNullOrEmpty(strRolloverDays))
throw new DnsWebServiceException("Parameter 'rolloverDays' missing.");
ushort rolloverDays = ushort.Parse(strRolloverDays);
_dnsWebService.DnsServer.AuthZoneManager.UpdatePrimaryZoneDnssecPrivateKey(zoneName, keyTag, rolloverDays);
_dnsWebService.Log.Write(DnsWebService.GetRequestRemoteEndPoint(request), "[" + _dnsWebService.GetSession(request).Username + "] Primary zone DNSSEC private key config was updated successfully: " + zoneName);
_dnsWebService.DnsServer.AuthZoneManager.SaveZoneFile(zoneName);
}
public void DeletePrimaryZoneDnssecPrivateKey(HttpListenerRequest request)
{
string zoneName = request.QueryString["zone"];