You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rg...@apache.org on 2016/03/11 12:58:10 UTC
svn commit: r1734542 -
/qpid/java/trunk/broker-plugins/websocket/src/main/java/org/apache/qpid/server/transport/websocket/WebSocketProvider.java
Author: rgodfrey
Date: Fri Mar 11 11:58:10 2016
New Revision: 1734542
URL: http://svn.apache.org/viewvc?rev=1734542&view=rev
Log:
QPID-7113 : Also set cipher order on WebSocket provider
Modified:
qpid/java/trunk/broker-plugins/websocket/src/main/java/org/apache/qpid/server/transport/websocket/WebSocketProvider.java
Modified: qpid/java/trunk/broker-plugins/websocket/src/main/java/org/apache/qpid/server/transport/websocket/WebSocketProvider.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/websocket/src/main/java/org/apache/qpid/server/transport/websocket/WebSocketProvider.java?rev=1734542&r1=1734541&r2=1734542&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/websocket/src/main/java/org/apache/qpid/server/transport/websocket/WebSocketProvider.java (original)
+++ qpid/java/trunk/broker-plugins/websocket/src/main/java/org/apache/qpid/server/transport/websocket/WebSocketProvider.java Fri Mar 11 11:58:10 2016
@@ -35,6 +35,8 @@ import java.util.concurrent.ConcurrentLi
import java.util.concurrent.atomic.AtomicLong;
import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLEngine;
+import javax.net.ssl.SSLParameters;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -136,6 +138,22 @@ class WebSocketProvider implements Accep
_port.getTlsCipherSuiteWhiteList(),
_port.getTlsCipherSuiteBlackList());
}
+
+ @Override
+ public void customize(final SSLEngine sslEngine)
+ {
+ super.customize(sslEngine);
+ useCipherOrderIfPossible(sslEngine.getSSLParameters());
+ }
+
+ private void useCipherOrderIfPossible(final SSLParameters sslParameters)
+ {
+ if(_port.getTlsCipherSuiteWhiteList() != null
+ && !_port.getTlsCipherSuiteWhiteList().isEmpty())
+ {
+ SSLUtil.useCipherOrderIfPossible(sslParameters);
+ }
+ }
};
factory.setSslContext(_sslContext);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org