Skip to content

Commit 7896973

Browse files
committed
Updates for ssl bundles
1 parent b60f8db commit 7896973

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/filter/headers/ForwardedHeadersFilterTests.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
import org.junit.jupiter.api.Test;
3131

3232
import org.springframework.boot.autoconfigure.AutoConfigurations;
33+
import org.springframework.boot.autoconfigure.ssl.SslAutoConfiguration;
3334
import org.springframework.boot.autoconfigure.web.reactive.ReactiveWebServerFactoryAutoConfiguration;
3435
import org.springframework.boot.autoconfigure.web.reactive.WebFluxAutoConfiguration;
3536
import org.springframework.boot.test.context.runner.ReactiveWebApplicationContextRunner;
@@ -222,7 +223,7 @@ public void forwardedParsedCorrectly() {
222223
@Test
223224
public void trustedProxiesConditionMatches() {
224225
new ReactiveWebApplicationContextRunner()
225-
.withConfiguration(AutoConfigurations.of(WebFluxAutoConfiguration.class,
226+
.withConfiguration(AutoConfigurations.of(WebFluxAutoConfiguration.class, SslAutoConfiguration.class,
226227
ReactiveWebServerFactoryAutoConfiguration.class, GatewayAutoConfiguration.class))
227228
.withPropertyValues("spring.cloud.gateway.trusted-proxies=11\\.0\\.0\\..*")
228229
.run(context -> {
@@ -233,7 +234,7 @@ public void trustedProxiesConditionMatches() {
233234
@Test
234235
public void trustedProxiesConditionDoesNotMatch() {
235236
new ReactiveWebApplicationContextRunner()
236-
.withConfiguration(AutoConfigurations.of(WebFluxAutoConfiguration.class,
237+
.withConfiguration(AutoConfigurations.of(WebFluxAutoConfiguration.class, SslAutoConfiguration.class,
237238
ReactiveWebServerFactoryAutoConfiguration.class, GatewayAutoConfiguration.class))
238239
.run(context -> {
239240
assertThat(context).doesNotHaveBean(ForwardedHeadersFilter.class);

spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/filter/headers/XForwardedHeadersFilterTests.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import org.junit.jupiter.api.Test;
2626

2727
import org.springframework.boot.autoconfigure.AutoConfigurations;
28+
import org.springframework.boot.autoconfigure.ssl.SslAutoConfiguration;
2829
import org.springframework.boot.autoconfigure.web.reactive.ReactiveWebServerFactoryAutoConfiguration;
2930
import org.springframework.boot.autoconfigure.web.reactive.WebFluxAutoConfiguration;
3031
import org.springframework.boot.test.context.runner.ReactiveWebApplicationContextRunner;
@@ -339,7 +340,7 @@ public void nullValuesSkipped() throws Exception {
339340
@Test
340341
public void trustedProxiesConditionMatches() {
341342
new ReactiveWebApplicationContextRunner()
342-
.withConfiguration(AutoConfigurations.of(WebFluxAutoConfiguration.class,
343+
.withConfiguration(AutoConfigurations.of(WebFluxAutoConfiguration.class, SslAutoConfiguration.class,
343344
ReactiveWebServerFactoryAutoConfiguration.class, GatewayAutoConfiguration.class))
344345
.withPropertyValues(GatewayProperties.PREFIX + ".trusted-proxies=11\\.0\\.0\\..*")
345346
.run(context -> {
@@ -350,7 +351,7 @@ public void trustedProxiesConditionMatches() {
350351
@Test
351352
public void trustedProxiesConditionDoesNotMatch() {
352353
new ReactiveWebApplicationContextRunner()
353-
.withConfiguration(AutoConfigurations.of(WebFluxAutoConfiguration.class,
354+
.withConfiguration(AutoConfigurations.of(WebFluxAutoConfiguration.class, SslAutoConfiguration.class,
354355
ReactiveWebServerFactoryAutoConfiguration.class, GatewayAutoConfiguration.class))
355356
.run(context -> {
356357
assertThat(context).doesNotHaveBean(XForwardedHeadersFilter.class);

0 commit comments

Comments
 (0)