fergalmoran/DnsServer
1
0
Fork 0
mirror of https://github.com/fergalmoran/DnsServer.git synced 2026-01-03 15:24:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

DnsWebService: updated StartWebServiceAsync() to have safe mode to allow only http listening when required. Code refactoring changes done.

Browse Source
This commit is contained in:
Shreyas Zare
2023-02-25 13:12:06 +05:30
parent fa82a737e9
commit 7fb8e2730d
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
DnsServerCore/DnsWebService.cs
View File

@@ -203,7 +203,7 @@ namespace DnsServerCore
try
{
_webServiceLocalAddresses = DnsServer.GetValidKestralLocalAddresses(_webServiceLocalAddresses);
await StartWebServiceAsync();
await StartWebServiceAsync(false);
}
catch (Exception ex)
{
@@ -213,7 +213,7 @@ namespace DnsServerCore
try
{
_webServiceLocalAddresses = new IPAddress[] { IPAddress.Any };
await StartWebServiceAsync();
await StartWebServiceAsync(false);
}
catch (Exception ex2)
{
@@ -221,12 +221,12 @@ namespace DnsServerCore
_log.Write("Attempting to start Web Service on loopback (127.0.0.1) fallback address...");
_webServiceLocalAddresses = new IPAddress[] { IPAddress.Loopback };
await StartWebServiceAsync();
await StartWebServiceAsync(true);
}
}
}
private async Task StartWebServiceAsync()
private async Task StartWebServiceAsync(bool safeMode)
{
WebApplicationBuilder builder = WebApplication.CreateBuilder();
@@ -249,7 +249,7 @@ namespace DnsServerCore
serverOptions.Listen(webServiceLocalAddress, _webServiceHttpPort);
//https
if (_webServiceEnableTls && (_webServiceTlsCertificate is not null))
if (!safeMode && _webServiceEnableTls && (_webServiceTlsCertificate is not null))
{
serverOptions.ConfigureHttpsDefaults(delegate (HttpsConnectionAdapterOptions configureOptions)
{
@@ -277,7 +277,7 @@ namespace DnsServerCore
_webService = builder.Build();
if (_webServiceHttpToTlsRedirect)
if (_webServiceHttpToTlsRedirect && !safeMode && _webServiceEnableTls && (_webServiceTlsCertificate is not null))
_webService.UseHttpsRedirection();
_webService.UseDefaultFiles();
@@ -300,7 +300,7 @@ namespace DnsServerCore
{
_log?.Write(new IPEndPoint(webServiceLocalAddress, _webServiceHttpPort), "Http", "Web Service was bound successfully.");
if (_webServiceEnableTls && (_webServiceTlsCertificate is not null))
if (!safeMode && _webServiceEnableTls && (_webServiceTlsCertificate is not null))
_log?.Write(new IPEndPoint(webServiceLocalAddress, _webServiceHttpPort), "Https", "Web Service was bound successfully.");
}
}
@@ -312,7 +312,7 @@ namespace DnsServerCore
{
_log?.Write(new IPEndPoint(webServiceLocalAddress, _webServiceHttpPort), "Http", "Web Service failed to bind.");
if (_webServiceEnableTls && (_webServiceTlsCertificate is not null))
if (!safeMode && _webServiceEnableTls && (_webServiceTlsCertificate is not null))
_log?.Write(new IPEndPoint(webServiceLocalAddress, _webServiceHttpPort), "Https", "Web Service failed to bind.");
}
@@ -832,7 +832,7 @@ namespace DnsServerCore
foreach (string strBlockListUrl in strBlockListUrlList)
{
if (strBlockListUrl.StartsWith("!"))
if (strBlockListUrl.StartsWith('!'))
{
Uri allowListUrl = new Uri(strBlockListUrl.Substring(1));
@@ -1288,7 +1288,7 @@ namespace DnsServerCore
{
string listUrl = bR.ReadShortString();
if (listUrl.StartsWith("!"))
if (listUrl.StartsWith('!'))
_dnsServer.BlockListZoneManager.AllowListUrls.Add(new Uri(listUrl.Substring(1)));
else
_dnsServer.BlockListZoneManager.BlockListUrls.Add(new Uri(listUrl));
@@ -1710,7 +1710,7 @@ namespace DnsServerCore
{
string listUrl = bR.ReadShortString();
if (listUrl.StartsWith("!"))
if (listUrl.StartsWith('!'))
_dnsServer.BlockListZoneManager.AllowListUrls.Add(new Uri(listUrl.Substring(1)));
else
_dnsServer.BlockListZoneManager.BlockListUrls.Add(new Uri(listUrl));