You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by or...@apache.org on 2018/12/19 15:03:58 UTC
[qpid-broker-j] branch 7.0.x updated: QPID-8259: [Broker-J] Fix
tests failing on IBM JDK due to jetty default cipher suites excludes
excluding valid IBM JDK cipher suites
This is an automated email from the ASF dual-hosted git repository.
orudyy pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git
The following commit(s) were added to refs/heads/7.0.x by this push:
new 09278a5 QPID-8259: [Broker-J] Fix tests failing on IBM JDK due to jetty default cipher suites excludes excluding valid IBM JDK cipher suites
09278a5 is described below
commit 09278a522e3fee521b90c06671e4baac1cb71929
Author: Alex Rudyy <or...@apache.org>
AuthorDate: Wed Dec 19 15:01:33 2018 +0000
QPID-8259: [Broker-J] Fix tests failing on IBM JDK due to jetty default cipher suites excludes excluding valid IBM JDK cipher suites
(cherry picked from commit 1cc83b38dc2bdb295ffbf7eb4d832cfae68dfdb2)
---
.../security/auth/manager/oauth2/OAuth2MockEndpointHolder.java | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/oauth2/OAuth2MockEndpointHolder.java b/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/oauth2/OAuth2MockEndpointHolder.java
index 2706fe9..4c4aa0a 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/oauth2/OAuth2MockEndpointHolder.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/oauth2/OAuth2MockEndpointHolder.java
@@ -84,6 +84,15 @@ class OAuth2MockEndpointHolder
};
sslContextFactory.setKeyStorePassword(KEYSTORE_PASSWORD);
sslContextFactory.setKeyStoreResource(Resource.newClassPathResource(KEYSTORE_RESOURCE));
+
+ // override default jetty excludes as valid IBM JDK are excluded
+ // causing SSL handshake failure (due to default exclude '^SSL_.*$')
+ sslContextFactory.setExcludeCipherSuites("^.*_(MD5|SHA|SHA1)$",
+ "^TLS_RSA_.*$",
+ "^SSL_RSA_.*$",
+ "^.*_NULL_.*$",
+ "^.*_anon_.*$");
+
_connector = new ServerConnector(_server, sslContextFactory);
_connector.setPort(0);
_connector.setReuseAddress(true);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org