fergalmoran/DnsServer
1
0
Fork 0
mirror of https://github.com/fergalmoran/DnsServer.git synced 2025-12-22 09:29:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

WindowsService: moved firewall entry code from Program to DnsServiceWorker. Adding an extra default firewall rule for web console.

Browse Source
This commit is contained in:
Shreyas Zare
2021-11-06 13:27:44 +05:30
parent b77943b5dc
commit 11a64ecc14
2 changed files with 70 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
DnsServerWindowsService/DnsServiceWorker.cs
View File

@@ -20,8 +20,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
using DnsServerCore; using DnsServerCore;
using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Hosting;
using System; using System;
using System.Reflection;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using TechnitiumLibrary.Net.Firewall;
namespace DnsServerWindowsService namespace DnsServerWindowsService
{ {
@@ -36,7 +38,10 @@ namespace DnsServerWindowsService
public override Task StartAsync(CancellationToken cancellationToken) public override Task StartAsync(CancellationToken cancellationToken)
{ {
CheckFirewallEntries();
_service.Start(); _service.Start();
return Task.CompletedTask; return Task.CompletedTask;
} }
@@ -56,5 +61,70 @@ namespace DnsServerWindowsService
{ {
return Task.CompletedTask; return Task.CompletedTask;
} }
private void CheckFirewallEntries()
{
string appPath = Assembly.GetEntryAssembly().Location;
if (appPath.EndsWith(".dll", StringComparison.OrdinalIgnoreCase))
appPath = appPath.Substring(0, appPath.Length - 4) + ".exe";
if (!WindowsFirewallEntryExists(appPath))
AddWindowsFirewallEntry(appPath);
}
private bool WindowsFirewallEntryExists(string appPath)
{
try
{
return WindowsFirewall.RuleExistsVista("", appPath) == RuleStatus.Allowed;
}
catch
{
return false;
}
}
private bool AddWindowsFirewallEntry(string appPath)
{
try
{
RuleStatus status = WindowsFirewall.RuleExistsVista("", appPath);
switch (status)
{
case RuleStatus.Blocked:
case RuleStatus.Disabled:
WindowsFirewall.RemoveRuleVista("", appPath);
break;
case RuleStatus.Allowed:
return true;
}
WindowsFirewall.AddRuleVista("Technitium DNS Server", "Allows incoming connection request to the DNS server.", FirewallAction.Allow, appPath, Protocol.ANY, null, null, null, null, InterfaceTypeFlags.All, true, Direction.Inbound, true);
//add web console rule
try
{
WindowsFirewall.RemoveRuleVista("Technitium DNS Server Web Console", "");
}
catch
{ }
try
{
WindowsFirewall.AddRuleVista("Technitium DNS Server Web Console", "Allows access to the DNS server web console.", FirewallAction.Allow, null, Protocol.TCP, _service.WebServiceHttpPort + ", " + _service.WebServiceTlsPort, null, null, null, InterfaceTypeFlags.All, true, Direction.Inbound, true);
}
catch
{ }
return true;
}
catch
{
return false;
}
}
} }
} }

111
DnsServerWindowsService/Program.cs
View File

@@ -19,9 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Hosting;
using System;
using System.Reflection;
using TechnitiumLibrary.Net.Firewall;
namespace DnsServerWindowsService namespace DnsServerWindowsService
{ {
@@ -29,18 +26,6 @@ namespace DnsServerWindowsService
{ {
public static void Main(string[] args) public static void Main(string[] args)
{ {
#region check windows firewall entry
string appPath = Assembly.GetEntryAssembly().Location;
if (appPath.EndsWith(".dll", StringComparison.OrdinalIgnoreCase))
appPath = appPath.Substring(0, appPath.Length - 4) + ".exe";
if (!WindowsFirewallEntryExists(appPath))
AddWindowsFirewallEntry(appPath);
#endregion
CreateHostBuilder(args).Build().Run(); CreateHostBuilder(args).Build().Run();
} }
@@ -53,101 +38,5 @@ namespace DnsServerWindowsService
}) })
.UseWindowsService(); .UseWindowsService();
} }
#region private
private static bool WindowsFirewallEntryExists(string appPath)
{
switch (Environment.OSVersion.Platform)
{
case PlatformID.Win32NT:
if (Environment.OSVersion.Version.Major > 5)
{
//vista and above
try
{
return WindowsFirewall.RuleExistsVista("", appPath) == RuleStatus.Allowed;
}
catch
{
return false;
}
}
else
{
try
{
return WindowsFirewall.ApplicationExists(appPath) == RuleStatus.Allowed;
}
catch
{
return false;
}
}
default:
return false;
}
}
private static bool AddWindowsFirewallEntry(string appPath)
{
switch (Environment.OSVersion.Platform)
{
case PlatformID.Win32NT:
if (Environment.OSVersion.Version.Major > 5)
{
//vista and above
try
{
RuleStatus status = WindowsFirewall.RuleExistsVista("", appPath);
switch (status)
{
case RuleStatus.Blocked:
case RuleStatus.Disabled:
WindowsFirewall.RemoveRuleVista("", appPath);
break;
case RuleStatus.Allowed:
return true;
}
WindowsFirewall.AddRuleVista("Technitium DNS Server", "Allow incoming connection request to the DNS server.", FirewallAction.Allow, appPath, Protocol.ANY, null, null, null, null, InterfaceTypeFlags.All, true, Direction.Inbound, true);
return true;
}
catch
{ }
}
else
{
try
{
RuleStatus status = WindowsFirewall.ApplicationExists(appPath);
switch (status)
{
case RuleStatus.Disabled:
WindowsFirewall.RemoveApplication(appPath);
break;
case RuleStatus.Allowed:
return true;
}
WindowsFirewall.AddApplication("Technitium DNS Server", appPath);
return true;
}
catch
{ }
}
break;
}
return false;
}
#endregion
} }
} }