From 93dbec4289155847feb3f63ea24623d824ac73df Mon Sep 17 00:00:00 2001 From: Robert Godfrey Date: Mon, 13 Jan 2014 17:32:17 +0000 Subject: QPID-5459 : [Java Broker] add secure websocket support to the broker, including ssl client auth git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1557782 13f79535-47bb-0310-9956-ffa450edef68 --- .../main/java/org/apache/qpid/server/model/adapter/AmqpPortAdapter.java | 2 +- .../src/main/java/org/apache/qpid/server/model/adapter/PortFactory.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'qpid/java/broker-core') diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AmqpPortAdapter.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AmqpPortAdapter.java index 5aab3db81a..c255ce2f4a 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AmqpPortAdapter.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AmqpPortAdapter.java @@ -82,7 +82,7 @@ public class AmqpPortAdapter extends PortAdapter } SSLContext sslContext = null; - if (transports.contains(Transport.SSL)) + if (transports.contains(Transport.SSL) || transports.contains(Transport.WSS)) { sslContext = createSslContext(); } diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/PortFactory.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/PortFactory.java index 8dc446e5b2..25a8cc93ad 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/PortFactory.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/PortFactory.java @@ -111,7 +111,7 @@ public class PortFactory throw new IllegalConfigurationException("Can't create port which requests SSL client certificates but has no trust stores configured."); } - if(useClientAuth && !port.getTransports().contains(Transport.SSL)) + if(useClientAuth && !(port.getTransports().contains(Transport.SSL) || port.getTransports().contains(Transport.WSS))) { throw new IllegalConfigurationException("Can't create port which requests SSL client certificates but doesn't use SSL transport."); } -- cgit v1.2.1