diff --git a/src/OrchardCore.Modules/OrchardCore.ReverseProxy/Configuration/ForwardedHeadersOptionsConfiguration.cs b/src/OrchardCore.Modules/OrchardCore.ReverseProxy/Configuration/ForwardedHeadersOptionsConfiguration.cs index ad62150bcbc..e3341490a88 100644 --- a/src/OrchardCore.Modules/OrchardCore.ReverseProxy/Configuration/ForwardedHeadersOptionsConfiguration.cs +++ b/src/OrchardCore.Modules/OrchardCore.ReverseProxy/Configuration/ForwardedHeadersOptionsConfiguration.cs @@ -2,31 +2,34 @@ using Microsoft.AspNetCore.Builder; using Microsoft.Extensions.Options; using OrchardCore.ReverseProxy.Settings; +using OrchardCore.Settings; namespace OrchardCore.ReverseProxy.Configuration; internal sealed class ForwardedHeadersOptionsConfiguration : IConfigureOptions { - private readonly ReverseProxySettings _reverseProxySettings; + private readonly ISiteService _siteService; - public ForwardedHeadersOptionsConfiguration(IOptions reverseProxySettingsOptions) + public ForwardedHeadersOptionsConfiguration(ISiteService siteService) { - _reverseProxySettings = reverseProxySettingsOptions.Value; + _siteService = siteService; } public void Configure(ForwardedHeadersOptions options) { - options.ForwardedHeaders = _reverseProxySettings.ForwardedHeaders; + var settings = _siteService.GetSettings(); + + options.ForwardedHeaders = settings.ForwardedHeaders; options.KnownIPNetworks.Clear(); options.KnownProxies.Clear(); - foreach (var network in _reverseProxySettings.KnownNetworks) + foreach (var network in settings.KnownNetworks) { options.KnownIPNetworks.Add(IPNetwork.Parse(network)); } - foreach (var proxy in _reverseProxySettings.KnownProxies) + foreach (var proxy in settings.KnownProxies) { options.KnownProxies.Add(IPAddress.Parse(proxy)); } diff --git a/src/OrchardCore.Modules/OrchardCore.ReverseProxy/Configuration/ReverseProxySettingsConfiguration.cs b/src/OrchardCore.Modules/OrchardCore.ReverseProxy/Configuration/ReverseProxySettingsConfiguration.cs deleted file mode 100644 index 83fb77d3912..00000000000 --- a/src/OrchardCore.Modules/OrchardCore.ReverseProxy/Configuration/ReverseProxySettingsConfiguration.cs +++ /dev/null @@ -1,22 +0,0 @@ -using Microsoft.Extensions.Options; -using OrchardCore.ReverseProxy.Settings; -using OrchardCore.Settings; - -namespace OrchardCore.ReverseProxy.Configuration; - -internal sealed class ReverseProxySettingsConfiguration : IConfigureOptions -{ - private readonly ISiteService _siteService; - - public ReverseProxySettingsConfiguration(ISiteService siteService) - => _siteService = siteService; - - public void Configure(ReverseProxySettings options) - { - var settings = _siteService.GetSettings(); - - options.ForwardedHeaders = settings.ForwardedHeaders; - options.KnownNetworks = settings.KnownNetworks; - options.KnownProxies = settings.KnownProxies; - } -} diff --git a/src/OrchardCore.Modules/OrchardCore.ReverseProxy/Startup.cs b/src/OrchardCore.Modules/OrchardCore.ReverseProxy/Startup.cs index bbf4da8dceb..0a31c4ba32c 100644 --- a/src/OrchardCore.Modules/OrchardCore.ReverseProxy/Startup.cs +++ b/src/OrchardCore.Modules/OrchardCore.ReverseProxy/Startup.cs @@ -29,7 +29,6 @@ public override void ConfigureServices(IServiceCollection services) services.AddPermissionProvider(); services.AddSiteDisplayDriver(); - services.AddTransient, ReverseProxySettingsConfiguration>(); services.AddTransient, ForwardedHeadersOptionsConfiguration>(); } }