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

Merge pull request #390 from coheigea/AMQ-7289 

AMQ-7289 - Fix failing HTTP tests
This commit is contained in:
Jean-Baptiste Onofré 2019-08-26 19:28:48 +02:00 committed by GitHub
parent 7955cb4d1d 3f11127567
commit 9ecb9750e5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
activemq-http/src/main/java/org/apache/activemq/transport/SecureSocketConnectorFactory.java
View File

@ -67,7 +67,7 @@ public class SecureSocketConnectorFactory extends SocketConnectorFactory {
SslContextFactory factory; SslContextFactory factory;
if (contextFactory == null) { if (contextFactory == null) {
factory = new SslContextFactory(); factory = new SslContextFactory.Server();
if (context != null) { if (context != null) {
// Should not be using this method since it does not use all of the values // Should not be using this method since it does not use all of the values
// from the passed SslContext instance..... // from the passed SslContext instance.....

3
activemq-http/src/main/java/org/apache/activemq/transport/WebTransportServerSupport.java
View File

@ -27,6 +27,7 @@ import org.eclipse.jetty.security.ConstraintMapping;
import org.eclipse.jetty.security.ConstraintSecurityHandler; import org.eclipse.jetty.security.ConstraintSecurityHandler;
import org.eclipse.jetty.server.Connector; import org.eclipse.jetty.server.Connector;
import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.util.resource.Resource;
import org.eclipse.jetty.util.security.Constraint; import org.eclipse.jetty.util.security.Constraint;
import org.eclipse.jetty.xml.XmlConfiguration; import org.eclipse.jetty.xml.XmlConfiguration;
import org.slf4j.Logger; import org.slf4j.Logger;
@ -61,7 +62,7 @@ abstract public class WebTransportServerSupport extends TransportServerSupport {
if (!file.exists()) { if (!file.exists()) {
throw new IllegalArgumentException("Jetty XML not found: " + file.getAbsolutePath()); 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(); server = (Server) xmlConfiguration.configure();
} catch (Throwable t) { } catch (Throwable t) {
throw new IllegalStateException("Jetty configuration can't be loaded", t); throw new IllegalStateException("Jetty configuration can't be loaded", t);

4
activemq-http/src/test/java/org/apache/activemq/transport/http/HttpTraceTestSupport.java
View File

@ -47,13 +47,13 @@ public class HttpTraceTestSupport {
} }
public static void testHttpTraceEnabled(final String uri, final int expectedStatus) throws Exception { 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 public static void testHttpTraceEnabled(final String uri, final int expectedStatus, SslContextFactory
sslContextFactory) throws Exception { sslContextFactory) throws Exception {
HttpClient httpClient = sslContextFactory != null ? new HttpClient(sslContextFactory) : HttpClient httpClient = sslContextFactory != null ? new HttpClient(sslContextFactory) :
new HttpClient(new SslContextFactory()); new HttpClient(new SslContextFactory.Client());
httpClient.start(); httpClient.start();
final CountDownLatch latch = new CountDownLatch(1); final CountDownLatch latch = new CountDownLatch(1);

2
activemq-http/src/test/java/org/apache/activemq/transport/ws/MQTTWSSubProtocolTest.java
View File

@ -39,7 +39,7 @@ public class MQTTWSSubProtocolTest extends WSTransportTestSupport {
public void setUp() throws Exception { public void setUp() throws Exception {
super.setUp(); super.setUp();
wsClient = new WebSocketClient(new SslContextFactory(true)); wsClient = new WebSocketClient(new SslContextFactory.Client(true));
wsClient.start(); wsClient.start();
} }

2
activemq-http/src/test/java/org/apache/activemq/transport/ws/MQTTWSTransportTest.java
View File

@ -68,7 +68,7 @@ public class MQTTWSTransportTest extends WSTransportTestSupport {
public void setUp() throws Exception { public void setUp() throws Exception {
super.setUp(); super.setUp();
wsClient = new WebSocketClient(new SslContextFactory(true)); wsClient = new WebSocketClient(new SslContextFactory.Client(true));
wsClient.start(); wsClient.start();
request = new ClientUpgradeRequest(); request = new ClientUpgradeRequest();

2
activemq-http/src/test/java/org/apache/activemq/transport/ws/MQTTWSTransportWillTest.java
View File

@ -78,7 +78,7 @@ public class MQTTWSTransportWillTest extends WSTransportTestSupport {
//turn off advisory support //turn off advisory support
broker = createBroker(true, false); broker = createBroker(true, false);
wsClient = new WebSocketClient(new SslContextFactory(true)); wsClient = new WebSocketClient(new SslContextFactory.Client(true));
wsClient.start(); wsClient.start();
request = new ClientUpgradeRequest(); request = new ClientUpgradeRequest();

2
activemq-http/src/test/java/org/apache/activemq/transport/ws/StompWSSubProtocolTest.java
View File

@ -150,7 +150,7 @@ public class StompWSSubProtocolTest extends WSTransportTestSupport {
request.setSubProtocols(subProtocol); request.setSubProtocols(subProtocol);
} }
wsClient = new WebSocketClient(new SslContextFactory(true)); wsClient = new WebSocketClient(new SslContextFactory.Client(true));
wsClient.start(); wsClient.start();
wsClient.connect(wsStompConnection, wsConnectUri, request); wsClient.connect(wsStompConnection, wsConnectUri, request);

2
activemq-http/src/test/java/org/apache/activemq/transport/ws/StompWSTransportTest.java
View File

@ -57,7 +57,7 @@ public class StompWSTransportTest extends WSTransportTestSupport {
ClientUpgradeRequest request = new ClientUpgradeRequest(); ClientUpgradeRequest request = new ClientUpgradeRequest();
request.setSubProtocols("v11.stomp"); request.setSubProtocols("v11.stomp");
wsClient = new WebSocketClient(new SslContextFactory(true)); wsClient = new WebSocketClient(new SslContextFactory.Client(true));
wsClient.start(); wsClient.start();
wsClient.connect(wsStompConnection, wsConnectUri, request); wsClient.connect(wsStompConnection, wsConnectUri, request);

2
activemq-http/src/test/java/org/apache/activemq/transport/ws/WSTransportTest.java
View File

@ -163,7 +163,7 @@ public class WSTransportTest extends WSTransportTestSupport {
protected void testGet(final String uri, SslContextFactory protected void testGet(final String uri, SslContextFactory
sslContextFactory) throws Exception { sslContextFactory) throws Exception {
HttpClient httpClient = sslContextFactory != null ? new HttpClient(sslContextFactory) : HttpClient httpClient = sslContextFactory != null ? new HttpClient(sslContextFactory) :
new HttpClient(new SslContextFactory()); new HttpClient(new SslContextFactory.Client());
httpClient.start(); httpClient.start();
final CountDownLatch latch = new CountDownLatch(1); final CountDownLatch latch = new CountDownLatch(1);

3
activemq-http/src/test/java/org/apache/activemq/transport/wss/WSSTransportHttpTraceTest.java
View File

@ -38,7 +38,8 @@ public class WSSTransportHttpTraceTest extends WSTransportHttpTraceTest {
@Override @Override
@Test(timeout=10000) @Test(timeout=10000)
public void testHttpTraceEnabled() throws Exception { 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()); factory.setSslContext(broker.getSslContext().getSSLContext());
HttpTraceTestSupport.testHttpTraceEnabled("https://127.0.0.1:61623", expectedStatus, factory); HttpTraceTestSupport.testHttpTraceEnabled("https://127.0.0.1:61623", expectedStatus, factory);

4
activemq-http/src/test/java/org/apache/activemq/transport/wss/WSSTransportNeedClientAuthTest.java
View File

@ -77,7 +77,7 @@ public class WSSTransportNeedClientAuthTest {
public void testStompNeedClientAuth() throws Exception { public void testStompNeedClientAuth() throws Exception {
StompWSConnection wsStompConnection = new StompWSConnection(); StompWSConnection wsStompConnection = new StompWSConnection();
System.out.println("starting connection"); System.out.println("starting connection");
SslContextFactory factory = new SslContextFactory(); SslContextFactory factory = new SslContextFactory.Client();
factory.setKeyStorePath(KEYSTORE); factory.setKeyStorePath(KEYSTORE);
factory.setKeyStorePassword(PASSWORD); factory.setKeyStorePassword(PASSWORD);
factory.setKeyStoreType(KEYSTORE_TYPE); factory.setKeyStoreType(KEYSTORE_TYPE);
@ -110,7 +110,7 @@ public class WSSTransportNeedClientAuthTest {
@Test @Test
public void testMQTTNeedClientAuth() throws Exception { public void testMQTTNeedClientAuth() throws Exception {
SslContextFactory factory = new SslContextFactory(); SslContextFactory factory = new SslContextFactory.Client();
factory.setKeyStorePath(KEYSTORE); factory.setKeyStorePath(KEYSTORE);
factory.setKeyStorePassword(PASSWORD); factory.setKeyStorePassword(PASSWORD);
factory.setKeyStoreType(KEYSTORE_TYPE); factory.setKeyStoreType(KEYSTORE_TYPE);

3
activemq-http/src/test/java/org/apache/activemq/transport/wss/WSSTransportTest.java
View File

@ -46,7 +46,8 @@ public class WSSTransportTest extends WSTransportTest {
@Override @Override
@Test(timeout=10000) @Test(timeout=10000)
public void testGet() throws Exception { 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()); factory.setSslContext(broker.getSslContext().getSSLContext());
testGet("https://127.0.0.1:" + port, factory); testGet("https://127.0.0.1:" + port, factory);