mirror
/
Radarr
mirror of https://github.com/Radarr/Radarr
1
0
Fork 0
Code Issues Releases Wiki Activity

New: Added check to ensure FW is enabled before opening and closing ports.

This commit is contained in:
Mark McDowall 2012-01-25 18:00:17 -08:00
parent 340f05aef4
commit ab7d3ebcc5
2 changed files with 32 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
NzbDrone.Common/SecurityProvider.cs
View File

@ -37,18 +37,23 @@ namespace NzbDrone.Common
return;
}
if (IsNzbDronePortOpen())
int port = 0;
if (IsFirewallEnabled())
{
Logger.Trace("NzbDrone port is already open, skipping.");
return;
if(IsNzbDronePortOpen())
{
Logger.Trace("NzbDrone port is already open, skipping.");
return;
}
//Close any old ports
port = CloseFirewallPort();
//Open the new port
OpenFirewallPort(_configFileProvider.Port);
}
//Close any old ports
var port = CloseFirewallPort();
//Open the new port
OpenFirewallPort(_configFileProvider.Port);
//Skip Url Register if not Vista or 7
if (_enviromentProvider.GetOsVersion().Major < 6)
return;
@ -123,7 +128,7 @@ namespace NzbDrone.Common
}
catch(Exception ex)
{
Logger.WarnException("Failed to open port in firewall for NzbDrone" + portNumber, ex);
Logger.WarnException("Failed to open port in firewall for NzbDrone " + portNumber, ex);
return false;
}
}
@ -161,6 +166,22 @@ namespace NzbDrone.Common
return 0;
}
private bool IsFirewallEnabled()
{
try
{
var netFwMgrType = Type.GetTypeFromProgID("HNetCfg.FwMgr", false);
var mgr = (INetFwMgr)Activator.CreateInstance(netFwMgrType);
return mgr.LocalPolicy.CurrentProfile.FirewallEnabled;
}
catch(Exception ex)
{
Logger.WarnException("Failed to check if the firewall is enabled", ex);
return false;
}
}
private bool RegisterUrl(int portNumber)
{
try

2
NzbDrone.Web/Models/SeriesModel.cs
View File

@ -45,7 +45,7 @@ namespace NzbDrone.Web.Models
public bool Monitored { get; set; }
[DisplayName("Backlog Setting")]
[Description("Should NzbDrone download past missing episodes?")]
[Description("Should NzbDrone search for missing episodes every 30 days?")]
public int BacklogSetting { get; set; }
}
}