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

DnsWebService: updated SetDnsSettings() to detect server domain name change to regenerate new self signed cert for web service.

Browse Source
This commit is contained in:
Shreyas Zare
2022-04-24 18:10:10 +05:30
parent 317310579c
commit 279feebbbf
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
DnsServerCore/DnsWebService.cs
View File

@@ -1580,12 +1580,16 @@ namespace DnsServerCore
private void SetDnsSettings(HttpListenerRequest request, JsonTextWriter jsonWriter)
{
bool serverDomainChanged = false;
bool restartDnsService = false;
bool restartWebService = false;
string strDnsServerDomain = request.QueryString["dnsServerDomain"];
if (!string.IsNullOrEmpty(strDnsServerDomain))
{
serverDomainChanged = !_dnsServer.ServerDomain.Equals(strDnsServerDomain, StringComparison.OrdinalIgnoreCase);
_dnsServer.ServerDomain = strDnsServerDomain;
}
string strDnsServerLocalEndPoints = request.QueryString["dnsServerLocalEndPoints"];
if (strDnsServerLocalEndPoints != null)
@@ -2241,7 +2245,7 @@ namespace DnsServerCore
if ((_webServiceTlsCertificatePath == null) && (_dnsTlsCertificatePath == null))
StopTlsCertificateUpdateTimer();
SelfSignedCertCheck(true);
SelfSignedCertCheck(serverDomainChanged, true);
if (_webServiceEnableTls && string.IsNullOrEmpty(_webServiceTlsCertificatePath) && !_webServiceUseSelfSignedTlsCertificate)
{
@@ -2260,13 +2264,13 @@ namespace DnsServerCore
RestartService(restartDnsService, restartWebService);
}
private void SelfSignedCertCheck(bool throwException)
private void SelfSignedCertCheck(bool generateNew, bool throwException)
{
string selfSignedCertificateFilePath = Path.Combine(_configFolder, "cert.pfx");
if (_webServiceUseSelfSignedTlsCertificate)
{
if (!File.Exists(selfSignedCertificateFilePath))
if (generateNew || !File.Exists(selfSignedCertificateFilePath))
{
RSA rsa = RSA.Create(2048);
CertificateRequest req = new CertificateRequest("cn=" + _dnsServer.ServerDomain, rsa, HashAlgorithmName.SHA256, RSASignaturePadding.Pkcs1);
@@ -3907,7 +3911,7 @@ namespace DnsServerCore
{
_webServiceUseSelfSignedTlsCertificate = bR.ReadBoolean();
SelfSignedCertCheck(false);
SelfSignedCertCheck(false, false);
}
else
{