From d823d7b0b1f342694743e267e7ea6033d06029e4 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Fri, 7 Apr 2023 15:42:39 +0200 Subject: [PATCH] Upgrade to Undertow 2.2.24.Final Closes gh-34910 --- .../boot/autoconfigure/web/ServerProperties.java | 4 ++++ .../web/embedded/UndertowWebServerFactoryCustomizer.java | 1 + .../web/embedded/UndertowWebServerFactoryCustomizerTests.java | 1 + spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 4 files changed, 7 insertions(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ServerProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ServerProperties.java index 3a0bca45ae..49f160cbb7 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ServerProperties.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ServerProperties.java @@ -31,6 +31,7 @@ import java.util.Map; import io.undertow.UndertowOptions; import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.boot.context.properties.DeprecatedConfigurationProperty; import org.springframework.boot.context.properties.NestedConfigurationProperty; import org.springframework.boot.convert.DurationUnit; import org.springframework.boot.web.server.Compression; @@ -1576,10 +1577,13 @@ public class ServerProperties { this.maxCookies = maxCookies; } + @Deprecated + @DeprecatedConfigurationProperty(reason = "This option was interpreted improperly") public boolean isAllowEncodedSlash() { return this.allowEncodedSlash; } + @Deprecated public void setAllowEncodedSlash(boolean allowEncodedSlash) { this.allowEncodedSlash = allowEncodedSlash; } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/embedded/UndertowWebServerFactoryCustomizer.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/embedded/UndertowWebServerFactoryCustomizer.java index 95f0bb3afe..5a9abed8bd 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/embedded/UndertowWebServerFactoryCustomizer.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/embedded/UndertowWebServerFactoryCustomizer.java @@ -87,6 +87,7 @@ public class UndertowWebServerFactoryCustomizer map.from(this::getOrDeduceUseForwardHeaders).to(factory::setUseForwardHeaders); } + @SuppressWarnings("deprecation") private void mapUndertowProperties(ConfigurableUndertowWebServerFactory factory, ServerOptions serverOptions) { PropertyMapper map = PropertyMapper.get().alwaysApplyingWhenNonNull(); Undertow properties = this.serverProperties.getUndertow(); diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/embedded/UndertowWebServerFactoryCustomizerTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/embedded/UndertowWebServerFactoryCustomizerTests.java index 6897cb9d62..e13f3eb078 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/embedded/UndertowWebServerFactoryCustomizerTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/embedded/UndertowWebServerFactoryCustomizerTests.java @@ -150,6 +150,7 @@ class UndertowWebServerFactoryCustomizerTests { } @Test + @Deprecated void allowEncodedSlashes() { bind("server.undertow.allow-encoded-slash=true"); assertThat(boundServerOption(UndertowOptions.ALLOW_ENCODED_SLASH)).isTrue(); diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index 7770c0c5b1..ffce853bd0 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1955,7 +1955,7 @@ bom { ] } } - library("Undertow", "2.2.23.Final") { + library("Undertow", "2.2.24.Final") { group("io.undertow") { modules = [ "undertow-core",