You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ta...@apache.org on 2013/07/26 17:08:52 UTC
svn commit: r1507346 - in
/activemq/trunk/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp:
DefaultTrustManager.java joram/ActiveMQSSLAdmin.java joram/JoramSslTest.java
Author: tabish
Date: Fri Jul 26 15:08:52 2013
New Revision: 1507346
URL: http://svn.apache.org/r1507346
Log:
apply patch for: https://issues.apache.org/jira/browse/AMQ-4655
Added:
activemq/trunk/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/DefaultTrustManager.java (with props)
activemq/trunk/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/joram/ActiveMQSSLAdmin.java (with props)
activemq/trunk/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/joram/JoramSslTest.java (with props)
Added: activemq/trunk/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/DefaultTrustManager.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/DefaultTrustManager.java?rev=1507346&view=auto
==============================================================================
--- activemq/trunk/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/DefaultTrustManager.java (added)
+++ activemq/trunk/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/DefaultTrustManager.java Fri Jul 26 15:08:52 2013
@@ -0,0 +1,43 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.transport.amqp;
+
+import java.security.cert.CertificateException;
+import java.security.cert.X509Certificate;
+
+import javax.net.ssl.X509TrustManager;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class DefaultTrustManager implements X509TrustManager {
+
+ protected static final Logger LOG = LoggerFactory.getLogger(DefaultTrustManager.class);
+
+ @Override
+ public void checkClientTrusted(X509Certificate[] x509Certificates, String s) throws CertificateException {
+ }
+
+ @Override
+ public void checkServerTrusted(X509Certificate[] x509Certificates, String s) throws CertificateException {
+ }
+
+ @Override
+ public X509Certificate[] getAcceptedIssuers() {
+ return new X509Certificate[0];
+ }
+}
Propchange: activemq/trunk/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/DefaultTrustManager.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: activemq/trunk/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/joram/ActiveMQSSLAdmin.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/joram/ActiveMQSSLAdmin.java?rev=1507346&view=auto
==============================================================================
--- activemq/trunk/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/joram/ActiveMQSSLAdmin.java (added)
+++ activemq/trunk/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/joram/ActiveMQSSLAdmin.java Fri Jul 26 15:08:52 2013
@@ -0,0 +1,93 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.transport.amqp.joram;
+
+import java.io.File;
+import java.security.SecureRandom;
+
+import javax.jms.ConnectionFactory;
+import javax.naming.NamingException;
+import javax.net.ssl.KeyManager;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.TrustManager;
+
+import org.apache.activemq.broker.TransportConnector;
+import org.apache.activemq.spring.SpringSslContext;
+import org.apache.activemq.transport.amqp.DefaultTrustManager;
+import org.apache.qpid.amqp_1_0.jms.impl.ConnectionFactoryImpl;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ */
+public class ActiveMQSSLAdmin extends ActiveMQAdmin {
+
+ private static final String AMQP_SSL_URI = "amqp+ssl://localhost:0";
+ protected static final Logger LOG = LoggerFactory.getLogger(ActiveMQSSLAdmin.class);
+
+ @Override
+ public void startServer() throws Exception {
+ SSLContext ctx = SSLContext.getInstance("TLS");
+ ctx.init(new KeyManager[0], new TrustManager[]{new DefaultTrustManager()}, new SecureRandom());
+ SSLContext.setDefault(ctx);
+
+ // Setup SSL context...
+ final File classesDir = new File(ActiveMQSSLAdmin.class.getProtectionDomain().getCodeSource().getLocation().getFile());
+ File keystore = new File(classesDir, "../../src/test/resources/keystore");
+ final SpringSslContext sslContext = new SpringSslContext();
+ sslContext.setKeyStore(keystore.getCanonicalPath());
+ sslContext.setKeyStorePassword("password");
+ sslContext.setTrustStore(keystore.getCanonicalPath());
+ sslContext.setTrustStorePassword("password");
+ sslContext.afterPropertiesSet();
+
+ if (broker != null) {
+ stopServer();
+ }
+ if (System.getProperty("basedir") == null) {
+ File file = new File(".");
+ System.setProperty("basedir", file.getAbsolutePath());
+ }
+ broker = createBroker();
+ broker.setSslContext(sslContext);
+
+ String connectorURI = getConnectorURI();
+ TransportConnector connector = broker.addConnector(connectorURI);
+ port = connector.getConnectUri().getPort();
+ LOG.info("ssl port is " + port);
+
+ broker.start();
+ //broker.
+ //super.startServer();
+ }
+
+ @Override
+ protected String getConnectorURI() {
+ return AMQP_SSL_URI;
+ }
+
+ @Override
+ public void createConnectionFactory(String name) {
+ try {
+ LOG.debug("Creating a connection factory using port " + port);
+ final ConnectionFactory factory = new ConnectionFactoryImpl("localhost", port, null, null, null, true);
+ context.bind(name, factory);
+ } catch (NamingException e) {
+ throw new RuntimeException(e);
+ }
+ }
+}
Propchange: activemq/trunk/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/joram/ActiveMQSSLAdmin.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: activemq/trunk/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/joram/JoramSslTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/joram/JoramSslTest.java?rev=1507346&view=auto
==============================================================================
--- activemq/trunk/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/joram/JoramSslTest.java (added)
+++ activemq/trunk/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/joram/JoramSslTest.java Fri Jul 26 15:08:52 2013
@@ -0,0 +1,93 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.transport.amqp.joram;
+
+import java.security.SecureRandom;
+
+import javax.net.ssl.KeyManager;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.TrustManager;
+
+import junit.framework.TestCase;
+
+import org.apache.activemq.transport.amqp.DefaultTrustManager;
+import org.junit.BeforeClass;
+import org.junit.Rule;
+import org.junit.rules.Timeout;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+import org.objectweb.jtests.jms.conform.connection.ConnectionTest;
+import org.objectweb.jtests.jms.conform.message.MessageBodyTest;
+import org.objectweb.jtests.jms.conform.message.MessageDefaultTest;
+import org.objectweb.jtests.jms.conform.message.MessageTypeTest;
+import org.objectweb.jtests.jms.conform.message.headers.MessageHeaderTest;
+import org.objectweb.jtests.jms.conform.message.properties.JMSXPropertyTest;
+import org.objectweb.jtests.jms.conform.message.properties.MessagePropertyConversionTest;
+import org.objectweb.jtests.jms.conform.message.properties.MessagePropertyTest;
+import org.objectweb.jtests.jms.conform.queue.QueueBrowserTest;
+import org.objectweb.jtests.jms.conform.queue.TemporaryQueueTest;
+import org.objectweb.jtests.jms.conform.selector.SelectorSyntaxTest;
+import org.objectweb.jtests.jms.conform.selector.SelectorTest;
+import org.objectweb.jtests.jms.conform.session.QueueSessionTest;
+import org.objectweb.jtests.jms.conform.session.SessionTest;
+import org.objectweb.jtests.jms.conform.topic.TemporaryTopicTest;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+@RunWith(Suite.class)
+@Suite.SuiteClasses({
+ // TopicSessionTest.class, // Hangs, see https://issues.apache.org/jira/browse/PROTON-154
+ MessageHeaderTest.class,
+ QueueBrowserTest.class,
+ JMSXPropertyTest.class,
+ MessageTypeTest.class,
+ //,UnifiedSessionTest.class // https://issues.apache.org/jira/browse/AMQ-4375
+ TemporaryTopicTest.class,
+ //,TopicConnectionTest.class // https://issues.apache.org/jira/browse/AMQ-4654
+ SelectorSyntaxTest.class,
+ QueueSessionTest.class,
+ SelectorTest.class,
+ TemporaryQueueTest.class,
+ ConnectionTest.class,
+ SessionTest.class,
+ JMSXPropertyTest.class,
+ MessageBodyTest.class,
+ MessageDefaultTest.class,
+ MessagePropertyConversionTest.class,
+ MessagePropertyTest.class
+})
+
+public class JoramSslTest extends TestCase {
+
+ protected static final Logger LOG = LoggerFactory.getLogger(JoramSslTest.class);
+
+ @Rule
+ public Timeout to = new Timeout(10 * 1000);
+
+ @BeforeClass
+ public static void beforeClass() throws Exception {
+ System.setProperty("joram.jms.test.file", getJmsTestFileName());
+
+ SSLContext ctx = SSLContext.getInstance("TLS");
+ ctx.init(new KeyManager[0], new TrustManager[]{new DefaultTrustManager()}, new SecureRandom());
+ SSLContext.setDefault(ctx);
+ }
+
+ public static String getJmsTestFileName() {
+ return "providerSSL.properties";
+ }
+}
Propchange: activemq/trunk/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/joram/JoramSslTest.java
------------------------------------------------------------------------------
svn:eol-style = native