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

Polish “Prevent reverse name lookup when configuring Jetty's address”

Browse Source 
Closes gh-11889
This commit is contained in:
Andy Wilkinson
2018-02-02 14:48:06 +00:00
committed by Stephane Nicoll
parent dc48a90184
commit dc1e1e8280
2 changed files with 9 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2017 the original author or authors.
* Copyright 2012-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.

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

@@ -36,7 +36,6 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.jasper.servlet.JspServlet;
import org.eclipse.jetty.server.AbstractNetworkConnector;
import org.eclipse.jetty.server.Connector;
import org.eclipse.jetty.server.Handler;
import org.eclipse.jetty.server.Server;
@@ -120,27 +119,14 @@ public class JettyEmbeddedServletContainerFactoryTests
@Test
public void specificIPAddressNotReverseResolved() throws Exception {
JettyEmbeddedServletContainerFactory factory = getFactory();
final String[] refAncHost = new String[1];
refAncHost[0] = "HostNotSetInAbstractNetworkConnector";
InetAddress lhAddress = InetAddress.getLocalHost();
InetAddress address = InetAddress.getByAddress(lhAddress.getAddress());
// the address should have no host name associated with ith
String expectedHost = address.getHostAddress();
factory.setAddress(address);
factory.addServerCustomizers(server -> {
for (Connector connector : server.getConnectors()) {
if (connector instanceof AbstractNetworkConnector) {
@SuppressWarnings("resource")
AbstractNetworkConnector anc = (AbstractNetworkConnector) connector;
String ancHost = anc.getHost();
refAncHost[0] = ancHost;
break;
}
}
});
this.container = factory
.getEmbeddedServletContainer(exampleServletRegistration());
assertThat(refAncHost[0]).isEqualTo(expectedHost);
InetAddress localhost = InetAddress.getLocalHost();
factory.setAddress(InetAddress.getByAddress(localhost.getAddress()));
this.container = factory.getEmbeddedServletContainer();
this.container.start();
Connector connector = ((JettyEmbeddedServletContainer) this.container).getServer()
.getConnectors()[0];
assertThat(((ServerConnector) connector).getHost())
.isEqualTo(localhost.getHostAddress());
}
@Test