From 789697336a15f1d30c33031f567bcf1ccfb2fa9f Mon Sep 17 00:00:00 2001 From: spencergibb Date: Wed, 28 May 2025 17:48:15 -0400 Subject: [PATCH] Updates for ssl bundles --- .../gateway/filter/headers/ForwardedHeadersFilterTests.java | 5 +++-- .../gateway/filter/headers/XForwardedHeadersFilterTests.java | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/filter/headers/ForwardedHeadersFilterTests.java b/spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/filter/headers/ForwardedHeadersFilterTests.java index ae24a969..35679dcb 100644 --- a/spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/filter/headers/ForwardedHeadersFilterTests.java +++ b/spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/filter/headers/ForwardedHeadersFilterTests.java @@ -30,6 +30,7 @@ import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; import org.springframework.boot.autoconfigure.AutoConfigurations; +import org.springframework.boot.autoconfigure.ssl.SslAutoConfiguration; import org.springframework.boot.autoconfigure.web.reactive.ReactiveWebServerFactoryAutoConfiguration; import org.springframework.boot.autoconfigure.web.reactive.WebFluxAutoConfiguration; import org.springframework.boot.test.context.runner.ReactiveWebApplicationContextRunner; @@ -222,7 +223,7 @@ public class ForwardedHeadersFilterTests { @Test public void trustedProxiesConditionMatches() { new ReactiveWebApplicationContextRunner() - .withConfiguration(AutoConfigurations.of(WebFluxAutoConfiguration.class, + .withConfiguration(AutoConfigurations.of(WebFluxAutoConfiguration.class, SslAutoConfiguration.class, ReactiveWebServerFactoryAutoConfiguration.class, GatewayAutoConfiguration.class)) .withPropertyValues("spring.cloud.gateway.trusted-proxies=11\\.0\\.0\\..*") .run(context -> { @@ -233,7 +234,7 @@ public class ForwardedHeadersFilterTests { @Test public void trustedProxiesConditionDoesNotMatch() { new ReactiveWebApplicationContextRunner() - .withConfiguration(AutoConfigurations.of(WebFluxAutoConfiguration.class, + .withConfiguration(AutoConfigurations.of(WebFluxAutoConfiguration.class, SslAutoConfiguration.class, ReactiveWebServerFactoryAutoConfiguration.class, GatewayAutoConfiguration.class)) .run(context -> { assertThat(context).doesNotHaveBean(ForwardedHeadersFilter.class); diff --git a/spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/filter/headers/XForwardedHeadersFilterTests.java b/spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/filter/headers/XForwardedHeadersFilterTests.java index 640b02e3..e90d5231 100644 --- a/spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/filter/headers/XForwardedHeadersFilterTests.java +++ b/spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/filter/headers/XForwardedHeadersFilterTests.java @@ -25,6 +25,7 @@ import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; import org.springframework.boot.autoconfigure.AutoConfigurations; +import org.springframework.boot.autoconfigure.ssl.SslAutoConfiguration; import org.springframework.boot.autoconfigure.web.reactive.ReactiveWebServerFactoryAutoConfiguration; import org.springframework.boot.autoconfigure.web.reactive.WebFluxAutoConfiguration; import org.springframework.boot.test.context.runner.ReactiveWebApplicationContextRunner; @@ -339,7 +340,7 @@ public class XForwardedHeadersFilterTests { @Test public void trustedProxiesConditionMatches() { new ReactiveWebApplicationContextRunner() - .withConfiguration(AutoConfigurations.of(WebFluxAutoConfiguration.class, + .withConfiguration(AutoConfigurations.of(WebFluxAutoConfiguration.class, SslAutoConfiguration.class, ReactiveWebServerFactoryAutoConfiguration.class, GatewayAutoConfiguration.class)) .withPropertyValues(GatewayProperties.PREFIX + ".trusted-proxies=11\\.0\\.0\\..*") .run(context -> { @@ -350,7 +351,7 @@ public class XForwardedHeadersFilterTests { @Test public void trustedProxiesConditionDoesNotMatch() { new ReactiveWebApplicationContextRunner() - .withConfiguration(AutoConfigurations.of(WebFluxAutoConfiguration.class, + .withConfiguration(AutoConfigurations.of(WebFluxAutoConfiguration.class, SslAutoConfiguration.class, ReactiveWebServerFactoryAutoConfiguration.class, GatewayAutoConfiguration.class)) .run(context -> { assertThat(context).doesNotHaveBean(XForwardedHeadersFilter.class);