From 499ec0666433572869b8c4d7054462a5e6a23717 Mon Sep 17 00:00:00 2001 From: Qstick Date: Sun, 28 Apr 2019 14:27:28 -0400 Subject: [PATCH] Fixed: Throw Startup Exception on Same Port for SSL --- .../Exceptions/LidarrStartupException.cs | 3 --- .../AccessControl/UrlAclAdapter.cs | 20 ++++++++++++++----- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/src/NzbDrone.Common/Exceptions/LidarrStartupException.cs b/src/NzbDrone.Common/Exceptions/LidarrStartupException.cs index 64e04de71..b43e12cf1 100644 --- a/src/NzbDrone.Common/Exceptions/LidarrStartupException.cs +++ b/src/NzbDrone.Common/Exceptions/LidarrStartupException.cs @@ -1,7 +1,4 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; namespace NzbDrone.Common.Exceptions { diff --git a/src/NzbDrone.Host/AccessControl/UrlAclAdapter.cs b/src/NzbDrone.Host/AccessControl/UrlAclAdapter.cs index 35c2dee83..1733baa93 100644 --- a/src/NzbDrone.Host/AccessControl/UrlAclAdapter.cs +++ b/src/NzbDrone.Host/AccessControl/UrlAclAdapter.cs @@ -4,6 +4,7 @@ using System.Linq; using System.Text.RegularExpressions; using NLog; using NzbDrone.Common.EnvironmentInfo; +using NzbDrone.Common.Exceptions; using NzbDrone.Common.Extensions; using NzbDrone.Core.Configuration; @@ -54,18 +55,27 @@ namespace NzbDrone.Host.AccessControl public void ConfigureUrls() { + var enableSsl = _configFileProvider.EnableSsl; + var port = _configFileProvider.Port; + var sslPort = _configFileProvider.SslPort; + + if (enableSsl && sslPort == port) + { + throw new LidarrStartupException("Cannot use the same port for HTTP and HTTPS. Port {0}", port); + } + if (RegisteredUrls.Empty()) { GetRegisteredUrls(); } - var localHostHttpUrls = BuildUrlAcls("http", "localhost", _configFileProvider.Port); - var interfaceHttpUrls = BuildUrlAcls("http", _configFileProvider.BindAddress, _configFileProvider.Port); + var localHostHttpUrls = BuildUrlAcls("http", "localhost", port); + var interfaceHttpUrls = BuildUrlAcls("http", _configFileProvider.BindAddress, port); - var localHostHttpsUrls = BuildUrlAcls("https", "localhost", _configFileProvider.SslPort); - var interfaceHttpsUrls = BuildUrlAcls("https", _configFileProvider.BindAddress, _configFileProvider.SslPort); + var localHostHttpsUrls = BuildUrlAcls("https", "localhost", sslPort); + var interfaceHttpsUrls = BuildUrlAcls("https", _configFileProvider.BindAddress, sslPort); - if (!_configFileProvider.EnableSsl) + if (!enableSsl) { localHostHttpsUrls.Clear(); interfaceHttpsUrls.Clear();