Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Set host when creating Jetty SSL connector

Browse Source 
See gh-12120
This commit is contained in:
mtrejo
2018-02-15 19:13:22 -05:00
committed by Andy Wilkinson
parent 14ff776f68
commit f0905ffaf6
2 changed files with 32 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
spring-boot/src/main/java/org/springframework/boot/context/embedded/jetty/JettyEmbeddedServletContainerFactory.java
View File

@@ -180,7 +180,7 @@ public class JettyEmbeddedServletContainerFactory
SslContextFactory sslContextFactory = new SslContextFactory();
configureSsl(sslContextFactory, getSsl());
AbstractConnector connector = getSslServerConnectorFactory()
.getConnector(server, sslContextFactory, port);
.createConnector(server, sslContextFactory, address);
server.setConnectors(new Connector[] { connector });
}
for (JettyServerCustomizer customizer : getServerCustomizers()) {
@@ -700,8 +700,8 @@ public class JettyEmbeddedServletContainerFactory
*/
private interface SslServerConnectorFactory {
AbstractConnector getConnector(Server server, SslContextFactory sslContextFactory,
int port);
AbstractConnector createConnector(Server server, SslContextFactory sslContextFactory,
InetSocketAddress address);
}
@@ -712,8 +712,8 @@ public class JettyEmbeddedServletContainerFactory
implements SslServerConnectorFactory {
@Override
public ServerConnector getConnector(Server server,
SslContextFactory sslContextFactory, int port) {
public ServerConnector createConnector(Server server,
SslContextFactory sslContextFactory, InetSocketAddress address) {
HttpConfiguration config = new HttpConfiguration();
config.setSendServerVersion(false);
config.addCustomizer(new SecureRequestCustomizer());
@@ -722,7 +722,8 @@ public class JettyEmbeddedServletContainerFactory
sslContextFactory, HttpVersion.HTTP_1_1.asString());
ServerConnector serverConnector = new ServerConnector(server,
sslConnectionFactory, connectionFactory);
serverConnector.setPort(port);
serverConnector.setPort(address.getPort());
serverConnector.setHost(address.getHostString());
return serverConnector;
}
@@ -735,8 +736,8 @@ public class JettyEmbeddedServletContainerFactory
implements SslServerConnectorFactory {
@Override
public AbstractConnector getConnector(Server server,
SslContextFactory sslContextFactory, int port) {
public AbstractConnector createConnector(Server server,
SslContextFactory sslContextFactory, InetSocketAddress address) {
try {
Class<?> connectorClass = Class
.forName("org.eclipse.jetty.server.ssl.SslSocketConnector");
@@ -744,7 +745,9 @@ public class JettyEmbeddedServletContainerFactory
.getConstructor(SslContextFactory.class)
.newInstance(sslContextFactory);
connector.getClass().getMethod("setPort", int.class).invoke(connector,
port);
address.getPort());
connector.getClass().getMethod("setHost", String.class).invoke(connector,
address.getHostString());
return connector;
}
catch (Exception ex) {

20
spring-boot/src/test/java/org/springframework/boot/context/embedded/jetty/JettyEmbeddedServletContainerFactoryTests.java
View File

@@ -244,6 +244,26 @@ public class JettyEmbeddedServletContainerFactoryTests
.isEqualTo(new String[] { "TLSv1.1" });
}
@Test
public void sslEnabledSpecificIPAddress() throws Exception {
Ssl ssl = new Ssl();
ssl.setKeyStore("src/test/resources/test.jks");
ssl.setKeyStorePassword("secret");
ssl.setKeyPassword("password");
JettyEmbeddedServletContainerFactory factory = getFactory();
factory.setSsl(ssl);
factory.setAddress(InetAddress.getByAddress(InetAddress.getLocalHost().getAddress()));
this.container = factory.getEmbeddedServletContainer();
this.container.start();
JettyEmbeddedServletContainer jettyContainer = (JettyEmbeddedServletContainer) this.container;
ServerConnector connector = (ServerConnector) jettyContainer.getServer()
.getConnectors()[0];
assertThat(connector.getHost()).isEqualTo(factory.getAddress().getHostAddress());
}
private void assertTimeout(JettyEmbeddedServletContainerFactory factory,
int expected) {
this.container = factory.getEmbeddedServletContainer();