Open SSL port in firewall when SSL is enabled

This commit is contained in:
Mark McDowall 2013-09-26 14:57:36 -07:00
parent dbc0c2021e
commit 74ac67eab1
2 changed files with 11 additions and 10 deletions

View File

@ -26,18 +26,21 @@ namespace NzbDrone.Host.AccessControl
{ {
if (IsFirewallEnabled()) if (IsFirewallEnabled())
{ {
if (IsNzbDronePortOpen()) if (!IsNzbDronePortOpen(_configFileProvider.Port))
{ {
_logger.Trace("NzbDrone port is already open, skipping."); _logger.Trace("Opening Port for NzbDrone: {0}", _configFileProvider.Port);
return; OpenFirewallPort(_configFileProvider.Port);
} }
OpenFirewallPort(_configFileProvider.Port); if (_configFileProvider.EnableSsl && !IsNzbDronePortOpen(_configFileProvider.SslPort))
{
_logger.Trace("Opening SSL Port for NzbDrone: {0}", _configFileProvider.SslPort);
OpenFirewallPort(_configFileProvider.SslPort);
}
} }
} }
private bool IsNzbDronePortOpen(int port)
private bool IsNzbDronePortOpen()
{ {
try try
{ {
@ -52,7 +55,7 @@ namespace NzbDrone.Host.AccessControl
foreach (INetFwOpenPort p in ports) foreach (INetFwOpenPort p in ports)
{ {
if (p.Port == _configFileProvider.Port) if (p.Port == port)
return true; return true;
} }
} }
@ -63,8 +66,6 @@ namespace NzbDrone.Host.AccessControl
return false; return false;
} }
private void OpenFirewallPort(int portNumber) private void OpenFirewallPort(int portNumber)
{ {
try try

View File

@ -47,7 +47,7 @@
<label class="control-label">SSL Cert Hash</label> <label class="control-label">SSL Cert Hash</label>
<div class="controls"> <div class="controls">
<input type="number" name="sslCertHash"/> <input type="text" name="sslCertHash"/>
</div> </div>
</div> </div>
</div> </div>