fuhouyin/spring-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '2.0.x'

Browse Source
This commit is contained in:
Brian Clozel 2018-04-13 11:50:03 +02:00
commit 02b0b6ff9c
3 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot-dependencies/pom.xml
View File

@ -175,7 +175,7 @@
<thymeleaf-extras-java8time.version>3.0.1.RELEASE</thymeleaf-extras-java8time.version> <thymeleaf-extras-java8time.version>3.0.1.RELEASE</thymeleaf-extras-java8time.version>
<tomcat.version>8.5.29</tomcat.version> <tomcat.version>8.5.29</tomcat.version>
<unboundid-ldapsdk.version>4.0.5</unboundid-ldapsdk.version> <unboundid-ldapsdk.version>4.0.5</unboundid-ldapsdk.version>
<undertow.version>1.4.23.Final</undertow.version> <undertow.version>1.4.24.Final</undertow.version>
<webjars-hal-browser.version>3325375</webjars-hal-browser.version> <webjars-hal-browser.version>3325375</webjars-hal-browser.version>
<webjars-locator-core.version>0.35</webjars-locator-core.version> <webjars-locator-core.version>0.35</webjars-locator-core.version>
<wsdl4j.version>1.6.3</wsdl4j.version> <wsdl4j.version>1.6.3</wsdl4j.version>

5
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/undertow/UndertowServletWebServerFactoryTests.java
View File

@ -28,6 +28,7 @@ import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.concurrent.atomic.AtomicReference; import java.util.concurrent.atomic.AtomicReference;
import javax.net.ssl.SSLException;
import javax.net.ssl.SSLHandshakeException; import javax.net.ssl.SSLHandshakeException;
import io.undertow.Undertow.Builder; import io.undertow.Undertow.Builder;
@ -213,7 +214,7 @@ public class UndertowServletWebServerFactoryTests
new String[] { "TLS_EMPTY_RENEGOTIATION_INFO_SCSV" }); new String[] { "TLS_EMPTY_RENEGOTIATION_INFO_SCSV" });
} }
@Test(expected = SSLHandshakeException.class) @Test(expected = SSLException.class)
public void sslRestrictedProtocolsECDHETLS1Failure() throws Exception { public void sslRestrictedProtocolsECDHETLS1Failure() throws Exception {
testRestrictedSSLProtocolsAndCipherSuites(new String[] { "TLSv1" }, testRestrictedSSLProtocolsAndCipherSuites(new String[] { "TLSv1" },
new String[] { "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256" }); new String[] { "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256" });
@ -231,7 +232,7 @@ public class UndertowServletWebServerFactoryTests
new String[] { "TLS_RSA_WITH_AES_128_CBC_SHA256" }); new String[] { "TLS_RSA_WITH_AES_128_CBC_SHA256" });
} }
@Test(expected = SSLHandshakeException.class) @Test(expected = SSLException.class)
public void sslRestrictedProtocolsRSATLS11Failure() throws Exception { public void sslRestrictedProtocolsRSATLS11Failure() throws Exception {
testRestrictedSSLProtocolsAndCipherSuites(new String[] { "TLSv1.1" }, testRestrictedSSLProtocolsAndCipherSuites(new String[] { "TLSv1.1" },
new String[] { "TLS_RSA_WITH_AES_128_CBC_SHA256" }); new String[] { "TLS_RSA_WITH_AES_128_CBC_SHA256" });

11
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/reactive/server/AbstractReactiveWebServerFactoryTests.java
View File

@ -34,7 +34,6 @@ import io.netty.handler.codec.http.HttpHeaderNames;
import io.netty.handler.codec.http.HttpResponse; import io.netty.handler.codec.http.HttpResponse;
import io.netty.handler.ssl.SslProvider; import io.netty.handler.ssl.SslProvider;
import io.netty.handler.ssl.util.InsecureTrustManagerFactory; import io.netty.handler.ssl.util.InsecureTrustManagerFactory;
import org.assertj.core.api.Assumptions;
import org.junit.After; import org.junit.After;
import org.junit.Rule; import org.junit.Rule;
import org.junit.Test; import org.junit.Test;
@ -45,7 +44,6 @@ import reactor.ipc.netty.http.client.HttpClientOptions;
import reactor.test.StepVerifier; import reactor.test.StepVerifier;
import org.springframework.boot.testsupport.rule.OutputCapture; import org.springframework.boot.testsupport.rule.OutputCapture;
import org.springframework.boot.web.embedded.undertow.UndertowReactiveWebServerFactory;
import org.springframework.boot.web.server.Compression; import org.springframework.boot.web.server.Compression;
import org.springframework.boot.web.server.Ssl; import org.springframework.boot.web.server.Ssl;
import org.springframework.boot.web.server.WebServer; import org.springframework.boot.web.server.WebServer;
@ -154,8 +152,7 @@ public abstract class AbstractReactiveWebServerFactoryTests {
} }
@Test @Test
public void sslWantsClientAuthenticationSucceedsWithoutClientCertificate() public void sslWantsClientAuthenticationSucceedsWithoutClientCertificate() {
throws Exception {
Ssl ssl = new Ssl(); Ssl ssl = new Ssl();
ssl.setClientAuth(Ssl.ClientAuth.WANT); ssl.setClientAuth(Ssl.ClientAuth.WANT);
ssl.setKeyStore("classpath:test.jks"); ssl.setKeyStore("classpath:test.jks");
@ -205,11 +202,7 @@ public abstract class AbstractReactiveWebServerFactoryTests {
} }
@Test @Test
public void sslNeedsClientAuthenticationFailsWithoutClientCertificate() public void sslNeedsClientAuthenticationFailsWithoutClientCertificate() {
throws Exception {
// Ignored for Undertow, see https://github.com/reactor/reactor-netty/issues/257
Assumptions.assumeThat(getFactory())
.isNotInstanceOf(UndertowReactiveWebServerFactory.class);
Ssl ssl = new Ssl(); Ssl ssl = new Ssl();
ssl.setClientAuth(Ssl.ClientAuth.NEED); ssl.setClientAuth(Ssl.ClientAuth.NEED);
ssl.setKeyStore("classpath:test.jks"); ssl.setKeyStore("classpath:test.jks");