You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by jb...@apache.org on 2019/08/26 17:28:53 UTC
[activemq] branch master updated: AMQ-7289 - Fix failing HTTP tests
This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq.git
The following commit(s) were added to refs/heads/master by this push:
new 3f11127 AMQ-7289 - Fix failing HTTP tests
new 9ecb975 Merge pull request #390 from coheigea/AMQ-7289
3f11127 is described below
commit 3f11127567a590065d76021ab09216752922cae8
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Mon Aug 26 15:42:03 2019 +0100
AMQ-7289 - Fix failing HTTP tests
---
.../org/apache/activemq/transport/SecureSocketConnectorFactory.java | 2 +-
.../java/org/apache/activemq/transport/WebTransportServerSupport.java | 3 ++-
.../java/org/apache/activemq/transport/http/HttpTraceTestSupport.java | 4 ++--
.../java/org/apache/activemq/transport/ws/MQTTWSSubProtocolTest.java | 2 +-
.../java/org/apache/activemq/transport/ws/MQTTWSTransportTest.java | 2 +-
.../org/apache/activemq/transport/ws/MQTTWSTransportWillTest.java | 2 +-
.../java/org/apache/activemq/transport/ws/StompWSSubProtocolTest.java | 2 +-
.../java/org/apache/activemq/transport/ws/StompWSTransportTest.java | 2 +-
.../test/java/org/apache/activemq/transport/ws/WSTransportTest.java | 2 +-
.../org/apache/activemq/transport/wss/WSSTransportHttpTraceTest.java | 3 ++-
.../apache/activemq/transport/wss/WSSTransportNeedClientAuthTest.java | 4 ++--
.../test/java/org/apache/activemq/transport/wss/WSSTransportTest.java | 3 ++-
12 files changed, 17 insertions(+), 14 deletions(-)
diff --git a/activemq-http/src/main/java/org/apache/activemq/transport/SecureSocketConnectorFactory.java b/activemq-http/src/main/java/org/apache/activemq/transport/SecureSocketConnectorFactory.java
index 1999c8f..b99f549 100644
--- a/activemq-http/src/main/java/org/apache/activemq/transport/SecureSocketConnectorFactory.java
+++ b/activemq-http/src/main/java/org/apache/activemq/transport/SecureSocketConnectorFactory.java
@@ -67,7 +67,7 @@ public class SecureSocketConnectorFactory extends SocketConnectorFactory {
SslContextFactory factory;
if (contextFactory == null) {
- factory = new SslContextFactory();
+ factory = new SslContextFactory.Server();
if (context != null) {
// Should not be using this method since it does not use all of the values
// from the passed SslContext instance.....
diff --git a/activemq-http/src/main/java/org/apache/activemq/transport/WebTransportServerSupport.java b/activemq-http/src/main/java/org/apache/activemq/transport/WebTransportServerSupport.java
index eba63ab..86d784e 100644
--- a/activemq-http/src/main/java/org/apache/activemq/transport/WebTransportServerSupport.java
+++ b/activemq-http/src/main/java/org/apache/activemq/transport/WebTransportServerSupport.java
@@ -27,6 +27,7 @@ import org.eclipse.jetty.security.ConstraintMapping;
import org.eclipse.jetty.security.ConstraintSecurityHandler;
import org.eclipse.jetty.server.Connector;
import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.util.resource.Resource;
import org.eclipse.jetty.util.security.Constraint;
import org.eclipse.jetty.xml.XmlConfiguration;
import org.slf4j.Logger;
@@ -61,7 +62,7 @@ abstract public class WebTransportServerSupport extends TransportServerSupport {
if (!file.exists()) {
throw new IllegalArgumentException("Jetty XML not found: " + file.getAbsolutePath());
}
- XmlConfiguration xmlConfiguration = new XmlConfiguration(file.toURI().toURL());
+ XmlConfiguration xmlConfiguration = new XmlConfiguration(Resource.newResource(file));
server = (Server) xmlConfiguration.configure();
} catch (Throwable t) {
throw new IllegalStateException("Jetty configuration can't be loaded", t);
diff --git a/activemq-http/src/test/java/org/apache/activemq/transport/http/HttpTraceTestSupport.java b/activemq-http/src/test/java/org/apache/activemq/transport/http/HttpTraceTestSupport.java
index a313ba6..cde0e05 100644
--- a/activemq-http/src/test/java/org/apache/activemq/transport/http/HttpTraceTestSupport.java
+++ b/activemq-http/src/test/java/org/apache/activemq/transport/http/HttpTraceTestSupport.java
@@ -47,13 +47,13 @@ public class HttpTraceTestSupport {
}
public static void testHttpTraceEnabled(final String uri, final int expectedStatus) throws Exception {
- testHttpTraceEnabled(uri, expectedStatus, new SslContextFactory());
+ testHttpTraceEnabled(uri, expectedStatus, new SslContextFactory.Client());
}
public static void testHttpTraceEnabled(final String uri, final int expectedStatus, SslContextFactory
sslContextFactory) throws Exception {
HttpClient httpClient = sslContextFactory != null ? new HttpClient(sslContextFactory) :
- new HttpClient(new SslContextFactory());
+ new HttpClient(new SslContextFactory.Client());
httpClient.start();
final CountDownLatch latch = new CountDownLatch(1);
diff --git a/activemq-http/src/test/java/org/apache/activemq/transport/ws/MQTTWSSubProtocolTest.java b/activemq-http/src/test/java/org/apache/activemq/transport/ws/MQTTWSSubProtocolTest.java
index ea8c262..8030ed8 100644
--- a/activemq-http/src/test/java/org/apache/activemq/transport/ws/MQTTWSSubProtocolTest.java
+++ b/activemq-http/src/test/java/org/apache/activemq/transport/ws/MQTTWSSubProtocolTest.java
@@ -39,7 +39,7 @@ public class MQTTWSSubProtocolTest extends WSTransportTestSupport {
public void setUp() throws Exception {
super.setUp();
- wsClient = new WebSocketClient(new SslContextFactory(true));
+ wsClient = new WebSocketClient(new SslContextFactory.Client(true));
wsClient.start();
}
diff --git a/activemq-http/src/test/java/org/apache/activemq/transport/ws/MQTTWSTransportTest.java b/activemq-http/src/test/java/org/apache/activemq/transport/ws/MQTTWSTransportTest.java
index 7465245..ddaac6b 100644
--- a/activemq-http/src/test/java/org/apache/activemq/transport/ws/MQTTWSTransportTest.java
+++ b/activemq-http/src/test/java/org/apache/activemq/transport/ws/MQTTWSTransportTest.java
@@ -68,7 +68,7 @@ public class MQTTWSTransportTest extends WSTransportTestSupport {
public void setUp() throws Exception {
super.setUp();
- wsClient = new WebSocketClient(new SslContextFactory(true));
+ wsClient = new WebSocketClient(new SslContextFactory.Client(true));
wsClient.start();
request = new ClientUpgradeRequest();
diff --git a/activemq-http/src/test/java/org/apache/activemq/transport/ws/MQTTWSTransportWillTest.java b/activemq-http/src/test/java/org/apache/activemq/transport/ws/MQTTWSTransportWillTest.java
index 6d05ab8..b78f152 100644
--- a/activemq-http/src/test/java/org/apache/activemq/transport/ws/MQTTWSTransportWillTest.java
+++ b/activemq-http/src/test/java/org/apache/activemq/transport/ws/MQTTWSTransportWillTest.java
@@ -78,7 +78,7 @@ public class MQTTWSTransportWillTest extends WSTransportTestSupport {
//turn off advisory support
broker = createBroker(true, false);
- wsClient = new WebSocketClient(new SslContextFactory(true));
+ wsClient = new WebSocketClient(new SslContextFactory.Client(true));
wsClient.start();
request = new ClientUpgradeRequest();
diff --git a/activemq-http/src/test/java/org/apache/activemq/transport/ws/StompWSSubProtocolTest.java b/activemq-http/src/test/java/org/apache/activemq/transport/ws/StompWSSubProtocolTest.java
index 492428e..1858224 100644
--- a/activemq-http/src/test/java/org/apache/activemq/transport/ws/StompWSSubProtocolTest.java
+++ b/activemq-http/src/test/java/org/apache/activemq/transport/ws/StompWSSubProtocolTest.java
@@ -150,7 +150,7 @@ public class StompWSSubProtocolTest extends WSTransportTestSupport {
request.setSubProtocols(subProtocol);
}
- wsClient = new WebSocketClient(new SslContextFactory(true));
+ wsClient = new WebSocketClient(new SslContextFactory.Client(true));
wsClient.start();
wsClient.connect(wsStompConnection, wsConnectUri, request);
diff --git a/activemq-http/src/test/java/org/apache/activemq/transport/ws/StompWSTransportTest.java b/activemq-http/src/test/java/org/apache/activemq/transport/ws/StompWSTransportTest.java
index 0381808..c1b5069 100644
--- a/activemq-http/src/test/java/org/apache/activemq/transport/ws/StompWSTransportTest.java
+++ b/activemq-http/src/test/java/org/apache/activemq/transport/ws/StompWSTransportTest.java
@@ -57,7 +57,7 @@ public class StompWSTransportTest extends WSTransportTestSupport {
ClientUpgradeRequest request = new ClientUpgradeRequest();
request.setSubProtocols("v11.stomp");
- wsClient = new WebSocketClient(new SslContextFactory(true));
+ wsClient = new WebSocketClient(new SslContextFactory.Client(true));
wsClient.start();
wsClient.connect(wsStompConnection, wsConnectUri, request);
diff --git a/activemq-http/src/test/java/org/apache/activemq/transport/ws/WSTransportTest.java b/activemq-http/src/test/java/org/apache/activemq/transport/ws/WSTransportTest.java
index ca11876..0b53e34 100644
--- a/activemq-http/src/test/java/org/apache/activemq/transport/ws/WSTransportTest.java
+++ b/activemq-http/src/test/java/org/apache/activemq/transport/ws/WSTransportTest.java
@@ -163,7 +163,7 @@ public class WSTransportTest extends WSTransportTestSupport {
protected void testGet(final String uri, SslContextFactory
sslContextFactory) throws Exception {
HttpClient httpClient = sslContextFactory != null ? new HttpClient(sslContextFactory) :
- new HttpClient(new SslContextFactory());
+ new HttpClient(new SslContextFactory.Client());
httpClient.start();
final CountDownLatch latch = new CountDownLatch(1);
diff --git a/activemq-http/src/test/java/org/apache/activemq/transport/wss/WSSTransportHttpTraceTest.java b/activemq-http/src/test/java/org/apache/activemq/transport/wss/WSSTransportHttpTraceTest.java
index a21ff4d..f225c24 100644
--- a/activemq-http/src/test/java/org/apache/activemq/transport/wss/WSSTransportHttpTraceTest.java
+++ b/activemq-http/src/test/java/org/apache/activemq/transport/wss/WSSTransportHttpTraceTest.java
@@ -38,7 +38,8 @@ public class WSSTransportHttpTraceTest extends WSTransportHttpTraceTest {
@Override
@Test(timeout=10000)
public void testHttpTraceEnabled() throws Exception {
- SslContextFactory factory = new SslContextFactory();
+ SslContextFactory factory = new SslContextFactory.Client();
+ factory.setEndpointIdentificationAlgorithm(null); // service cert does not contain a SAN
factory.setSslContext(broker.getSslContext().getSSLContext());
HttpTraceTestSupport.testHttpTraceEnabled("https://127.0.0.1:61623", expectedStatus, factory);
diff --git a/activemq-http/src/test/java/org/apache/activemq/transport/wss/WSSTransportNeedClientAuthTest.java b/activemq-http/src/test/java/org/apache/activemq/transport/wss/WSSTransportNeedClientAuthTest.java
index 793edd5..2fdef40 100644
--- a/activemq-http/src/test/java/org/apache/activemq/transport/wss/WSSTransportNeedClientAuthTest.java
+++ b/activemq-http/src/test/java/org/apache/activemq/transport/wss/WSSTransportNeedClientAuthTest.java
@@ -77,7 +77,7 @@ public class WSSTransportNeedClientAuthTest {
public void testStompNeedClientAuth() throws Exception {
StompWSConnection wsStompConnection = new StompWSConnection();
System.out.println("starting connection");
- SslContextFactory factory = new SslContextFactory();
+ SslContextFactory factory = new SslContextFactory.Client();
factory.setKeyStorePath(KEYSTORE);
factory.setKeyStorePassword(PASSWORD);
factory.setKeyStoreType(KEYSTORE_TYPE);
@@ -110,7 +110,7 @@ public class WSSTransportNeedClientAuthTest {
@Test
public void testMQTTNeedClientAuth() throws Exception {
- SslContextFactory factory = new SslContextFactory();
+ SslContextFactory factory = new SslContextFactory.Client();
factory.setKeyStorePath(KEYSTORE);
factory.setKeyStorePassword(PASSWORD);
factory.setKeyStoreType(KEYSTORE_TYPE);
diff --git a/activemq-http/src/test/java/org/apache/activemq/transport/wss/WSSTransportTest.java b/activemq-http/src/test/java/org/apache/activemq/transport/wss/WSSTransportTest.java
index a3722c2..78494fc 100644
--- a/activemq-http/src/test/java/org/apache/activemq/transport/wss/WSSTransportTest.java
+++ b/activemq-http/src/test/java/org/apache/activemq/transport/wss/WSSTransportTest.java
@@ -46,7 +46,8 @@ public class WSSTransportTest extends WSTransportTest {
@Override
@Test(timeout=10000)
public void testGet() throws Exception {
- SslContextFactory factory = new SslContextFactory();
+ SslContextFactory factory = new SslContextFactory.Client();
+ factory.setEndpointIdentificationAlgorithm(null); // service cert does not contain a SAN
factory.setSslContext(broker.getSslContext().getSSLContext());
testGet("https://127.0.0.1:" + port, factory);