Skip to content

Setting hostname on Jetty SSL connectors #12120

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Setting hostname on Jetty SSL connectors #12120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 12 additions & 9 deletions ...org/springframework/boot/context/embedded/jetty/JettyEmbeddedServletContainerFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ public EmbeddedServletContainer getEmbeddedServletContainer(
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()) {
Expand Down Expand Up @@ -700,8 +700,8 @@ private void addJettyErrorPages(ErrorHandler errorHandler,
*/
private interface SslServerConnectorFactory {

AbstractConnector getConnector(Server server, SslContextFactory sslContextFactory,
int port);
AbstractConnector createConnector(Server server, SslContextFactory sslContextFactory,
InetSocketAddress address);

}

Expand All @@ -712,8 +712,8 @@ private static class Jetty9SslServerConnectorFactory
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());
Expand All @@ -722,7 +722,8 @@ public ServerConnector getConnector(Server server,
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;
}

Expand All @@ -735,16 +736,18 @@ private static class Jetty8SslServerConnectorFactory
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");
AbstractConnector connector = (AbstractConnector) connectorClass
.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) {
Expand Down
20 changes: 20 additions & 0 deletions ...pringframework/boot/context/embedded/jetty/JettyEmbeddedServletContainerFactoryTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,6 +244,26 @@ public void sslEnabledProtocolsConfiguration() throws Exception {
.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();
Expand Down