scrap custom code in favor of just setting FORWARDEDHEADERS_ENABLED

Author: TimHess

src/Configuration/src/CloudFoundry/CloudFoundryConfigurationProvider.cs

@@ -73,6 +73,10 @@ private void Process()
 
             LoadData("vcap:application", applicationData.GetChildren(), data);
             AddDiegoVariables(data);
+
+            // Enable evaluation of X-Forwarded headers so that ASP.NET Core works automatically behind Gorouter.
+            // Equivalent to setting ASPNETCORE_FORWARDEDHEADERS_ENABLED to true.
+            data["FORWARDEDHEADERS_ENABLED"] = "true";
         }
 
         string? servicesJson = _settingsReader.ServicesJson;

src/Configuration/src/CloudFoundry/CloudFoundryServiceCollectionExtensions.cs

@@ -2,8 +2,6 @@
 // The .NET Foundation licenses this file to you under the Apache 2.0 License.
 // See the LICENSE file in the project root for more information.
 
-using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.HttpOverrides;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Extensions.Options;
@@ -43,44 +41,4 @@ public static IServiceCollection AddCloudFoundryOptions(this IServiceCollection
 
         return services;
     }
-
-    /// <summary>
-    /// Configures <see cref="ForwardedHeadersOptions" /> to use forwarded headers as they are provided in Cloud Foundry. Includes
-    /// <see cref="ForwardedHeaders.XForwardedHost" /> and <see cref="ForwardedHeaders.XForwardedProto" />, and allows headers from proxy servers on any
-    /// network unless KnownNetworks is configured in
-    /// <c>
-    /// Steeltoe:ForwardedHeaders:KnownNetworks
-    /// </c>
-    /// or on <see cref="ForwardedHeadersOptions" />, or
-    /// <c>
-    /// Steeltoe:ForwardedHeaders:TrustAllNetworks
-    /// </c>
-    /// is set to <c>false</c>.
-    /// </summary>
-    /// <param name="services">
-    /// The <see cref="IServiceCollection" /> to configure.
-    /// </param>
-    /// <returns>
-    /// The same <see cref="IServiceCollection" /> instance, for chaining.
-    /// </returns>
-    /// <remarks>
-    /// IMPORTANT: <see cref="ForwardedHeadersExtensions.UseForwardedHeaders(IApplicationBuilder)" /> must be called separately to activate these options.
-    /// </remarks>
-    /// <exception cref="ArgumentNullException">
-    /// Thrown if <paramref name="services" /> is <c>null</c>.
-    /// </exception>
-    public static IServiceCollection ConfigureForwardedHeadersOptionsForCloudFoundry(this IServiceCollection services)
-    {
-        ArgumentNullException.ThrowIfNull(services);
-
-#pragma warning disable S4792 // Configuring loggers is security-sensitive
-        services.AddLogging();
-#pragma warning restore S4792 // Configuring loggers is security-sensitive
-
-        services.AddOptions<ForwardedHeadersSettings>().BindConfiguration(ForwardedHeadersSettings.ConfigurationKey);
-        services.AddOptions<ForwardedHeadersOptions>();
-        services.TryAddEnumerable(ServiceDescriptor.Singleton<IConfigureOptions<ForwardedHeadersOptions>, ConfigureForwardedHeadersOptions>());
-
-        return services;
-    }
 }

src/Configuration/src/CloudFoundry/ConfigureForwardedHeadersOptions.cs

@@ -11,4 +11,3 @@
 [assembly: InternalsVisibleTo("Steeltoe.Configuration.ConfigServer.Test")]
 [assembly: InternalsVisibleTo("Steeltoe.Connectors.Test")]
 [assembly: InternalsVisibleTo("Steeltoe.Discovery.HttpClients.Test")]
-[assembly: InternalsVisibleTo("Steeltoe.Security.Authorization.Certificate.Test")]

src/Configuration/src/CloudFoundry/ForwardedHeadersSettings.cs

@@ -11,7 +11,6 @@ static Steeltoe.Configuration.CloudFoundry.CloudFoundryHostBuilderExtensions.Add
 static Steeltoe.Configuration.CloudFoundry.CloudFoundryHostBuilderExtensions.AddCloudFoundryConfiguration(this Microsoft.Extensions.Hosting.IHostBuilder! builder) -> Microsoft.Extensions.Hosting.IHostBuilder!
 static Steeltoe.Configuration.CloudFoundry.CloudFoundryHostBuilderExtensions.AddCloudFoundryConfiguration(this Microsoft.Extensions.Hosting.IHostBuilder! builder, Microsoft.Extensions.Logging.ILoggerFactory! loggerFactory) -> Microsoft.Extensions.Hosting.IHostBuilder!
 static Steeltoe.Configuration.CloudFoundry.CloudFoundryServiceCollectionExtensions.AddCloudFoundryOptions(this Microsoft.Extensions.DependencyInjection.IServiceCollection! services) -> Microsoft.Extensions.DependencyInjection.IServiceCollection!
-static Steeltoe.Configuration.CloudFoundry.CloudFoundryServiceCollectionExtensions.ConfigureForwardedHeadersOptionsForCloudFoundry(this Microsoft.Extensions.DependencyInjection.IServiceCollection! services) -> Microsoft.Extensions.DependencyInjection.IServiceCollection!
 static Steeltoe.Configuration.CloudFoundry.ServiceBindings.ConfigurationBuilderExtensions.AddCloudFoundryServiceBindings(this Microsoft.Extensions.Configuration.IConfigurationBuilder! builder) -> Microsoft.Extensions.Configuration.IConfigurationBuilder!
 static Steeltoe.Configuration.CloudFoundry.ServiceBindings.ConfigurationBuilderExtensions.AddCloudFoundryServiceBindings(this Microsoft.Extensions.Configuration.IConfigurationBuilder! builder, Steeltoe.Configuration.CloudFoundry.ServiceBindings.IServiceBindingsReader! serviceBindingsReader) -> Microsoft.Extensions.Configuration.IConfigurationBuilder!
 static Steeltoe.Configuration.CloudFoundry.ServiceBindings.ConfigurationBuilderExtensions.AddCloudFoundryServiceBindings(this Microsoft.Extensions.Configuration.IConfigurationBuilder! builder, System.Predicate<string!>! ignoreKeyPredicate, Steeltoe.Configuration.CloudFoundry.ServiceBindings.IServiceBindingsReader! serviceBindingsReader, Microsoft.Extensions.Logging.ILoggerFactory! loggerFactory) -> Microsoft.Extensions.Configuration.IConfigurationBuilder!
@@ -82,12 +81,6 @@ Steeltoe.Configuration.CloudFoundry.CloudFoundryServicesOptions.CloudFoundryServ
 Steeltoe.Configuration.CloudFoundry.CloudFoundryServicesOptions.GetAllServices() -> System.Collections.Generic.IList<Steeltoe.Configuration.CloudFoundry.CloudFoundryService!>!
 Steeltoe.Configuration.CloudFoundry.CloudFoundryServicesOptions.GetServicesOfType(string! serviceType) -> System.Collections.Generic.IList<Steeltoe.Configuration.CloudFoundry.CloudFoundryService!>!
 Steeltoe.Configuration.CloudFoundry.CloudFoundryServicesOptions.Services.get -> System.Collections.Generic.IDictionary<string!, System.Collections.Generic.IList<Steeltoe.Configuration.CloudFoundry.CloudFoundryService!>!>!
-Steeltoe.Configuration.CloudFoundry.ForwardedHeadersSettings
-Steeltoe.Configuration.CloudFoundry.ForwardedHeadersSettings.ForwardedHeadersSettings() -> void
-Steeltoe.Configuration.CloudFoundry.ForwardedHeadersSettings.KnownNetworks.get -> string?
-Steeltoe.Configuration.CloudFoundry.ForwardedHeadersSettings.KnownNetworks.set -> void
-Steeltoe.Configuration.CloudFoundry.ForwardedHeadersSettings.TrustAllNetworks.get -> bool
-Steeltoe.Configuration.CloudFoundry.ForwardedHeadersSettings.TrustAllNetworks.set -> void
 Steeltoe.Configuration.CloudFoundry.ICloudFoundrySettingsReader
 Steeltoe.Configuration.CloudFoundry.ICloudFoundrySettingsReader.ApplicationJson.get -> string?
 Steeltoe.Configuration.CloudFoundry.ICloudFoundrySettingsReader.InstanceId.get -> string?