Apache
/
activemq-artemis
mirror of https://github.com/apache/activemq-artemis.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

This closes #2043

This commit is contained in:
Clebert Suconic 2018-04-26 09:39:38 -04:00
parent 27c0017dd9 e8a88c4be5
commit 5daa3769aa
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
artemis-web/src/main/java/org/apache/activemq/artemis/component/WebServerComponent.java
View File

@ -31,6 +31,7 @@ import org.apache.activemq.artemis.dto.ComponentDTO;
import org.apache.activemq.artemis.dto.WebServerDTO;
import org.apache.activemq.artemis.utils.FileUtil;
import org.apache.activemq.artemis.utils.TimeUtils;
import org.eclipse.jetty.server.ConnectionFactory;
import org.eclipse.jetty.server.Connector;
import org.eclipse.jetty.server.HttpConfiguration;
import org.eclipse.jetty.server.HttpConnectionFactory;
@ -81,12 +82,16 @@ public class WebServerComponent implements ExternalComponent {
HttpConfiguration https = new HttpConfiguration();
https.addCustomizer(new SecureRequestCustomizer());
https.setSendServerVersion(false);
HttpConnectionFactory httpFactory = new HttpConnectionFactory(https);
connector = new ServerConnector(server, sslConnectionFactory, httpFactory);
} else {
connector = new ServerConnector(server);
HttpConfiguration configuration = new HttpConfiguration();
configuration.setSendServerVersion(false);
ConnectionFactory connectionFactory = new HttpConnectionFactory(configuration);
connector = new ServerConnector(server, connectionFactory);
}
connector.setPort(uri.getPort());
connector.setHost(uri.getHost());

9
artemis-web/src/test/java/org/apache/activemq/cli/test/WebServerComponentTest.java
View File

@ -41,6 +41,7 @@ import io.netty.handler.codec.http.HttpHeaderNames;
import io.netty.handler.codec.http.HttpMethod;
import io.netty.handler.codec.http.HttpObject;
import io.netty.handler.codec.http.HttpRequest;
import io.netty.handler.codec.http.HttpResponse;
import io.netty.handler.codec.http.HttpVersion;
import io.netty.handler.ssl.SslHandler;
import io.netty.util.CharsetUtil;
@ -110,6 +111,7 @@ public class WebServerComponentTest extends Assert {
ch.writeAndFlush(request);
assertTrue(latch.await(5, TimeUnit.SECONDS));
assertEquals(clientHandler.body, "12345");
assertNull(clientHandler.serverHeader);
// Wait for the server to close the connection.
ch.close();
Assert.assertTrue(webServerComponent.isStarted());
@ -205,6 +207,7 @@ public class WebServerComponentTest extends Assert {
ch.writeAndFlush(request);
assertTrue(latch.await(5, TimeUnit.SECONDS));
assertEquals(clientHandler.body, "12345");
assertNull(clientHandler.serverHeader);
// Wait for the server to close the connection.
ch.close();
Assert.assertTrue(webServerComponent.isStarted());
@ -309,6 +312,7 @@ public class WebServerComponentTest extends Assert {
private CountDownLatch latch;
private String body;
private String serverHeader;
ClientHandler(CountDownLatch latch) {
this.latch = latch;
@ -316,7 +320,10 @@ public class WebServerComponentTest extends Assert {
@Override
public void channelRead0(ChannelHandlerContext ctx, HttpObject msg) {
if (msg instanceof HttpContent) {
if (msg instanceof HttpResponse) {
HttpResponse response = (HttpResponse) msg;
serverHeader = response.headers().get("Server");
} else if (msg instanceof HttpContent) {
HttpContent content = (HttpContent) msg;
body = content.content().toString(CharsetUtil.UTF_8);
latch.countDown();