Modified: qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagedObjectRegistry.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagedObjectRegistry.java?rev=1613068&r1=1613067&r2=1613068&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagedObjectRegistry.java (original) +++ qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagedObjectRegistry.java Thu Jul 24 11:27:03 2014 @@ -20,28 +20,6 @@ */ package org.apache.qpid.server.jmx; -import org.apache.log4j.Logger; -import org.apache.qpid.server.configuration.BrokerProperties; -import org.apache.qpid.server.logging.EventLogger; -import org.apache.qpid.server.logging.messages.ManagementConsoleMessages; -import org.apache.qpid.server.model.Broker; -import org.apache.qpid.server.model.KeyStore; -import org.apache.qpid.server.model.Port; -import org.apache.qpid.server.model.Transport; - -import org.apache.qpid.server.security.auth.jmx.JMXPasswordAuthenticator; -import org.apache.qpid.server.util.ServerScopedRuntimeException; - -import javax.management.JMException; -import javax.management.MBeanServer; -import javax.management.MBeanServerFactory; -import javax.management.ObjectName; -import javax.management.remote.JMXConnectorServer; -import javax.management.remote.JMXServiceURL; -import javax.management.remote.MBeanServerForwarder; -import javax.management.remote.rmi.RMIConnectorServer; -import javax.net.ssl.SSLContext; -import javax.rmi.ssl.SslRMIClientSocketFactory; import java.io.IOException; import java.lang.management.ManagementFactory; import java.net.InetAddress; @@ -59,6 +37,29 @@ import java.rmi.server.UnicastRemoteObje import java.security.GeneralSecurityException; import java.util.HashMap; +import javax.management.JMException; +import javax.management.MBeanServer; +import javax.management.MBeanServerFactory; +import javax.management.ObjectName; +import javax.management.remote.JMXConnectorServer; +import javax.management.remote.JMXServiceURL; +import javax.management.remote.MBeanServerForwarder; +import javax.management.remote.rmi.RMIConnectorServer; +import javax.net.ssl.SSLContext; +import javax.rmi.ssl.SslRMIClientSocketFactory; + +import org.apache.log4j.Logger; + +import org.apache.qpid.server.configuration.BrokerProperties; +import org.apache.qpid.server.logging.EventLogger; +import org.apache.qpid.server.logging.messages.ManagementConsoleMessages; +import org.apache.qpid.server.model.Broker; +import org.apache.qpid.server.model.KeyStore; +import org.apache.qpid.server.model.Port; +import org.apache.qpid.server.model.Transport; +import org.apache.qpid.server.security.auth.jmx.JMXPasswordAuthenticator; +import org.apache.qpid.server.util.ServerScopedRuntimeException; + /** * This class starts up an MBeanserver. If out of the box agent has been enabled then there are no * security features implemented like user authentication and authorisation. @@ -157,7 +158,7 @@ public class JMXManagedObjectRegistry im int jmxPortConnectorServer = _connectorPort.getPort(); //add a JMXAuthenticator implementation the env map to authenticate the RMI based JMX connector server - JMXPasswordAuthenticator rmipa = new JMXPasswordAuthenticator(_broker, new InetSocketAddress(jmxPortConnectorServer)); + JMXPasswordAuthenticator rmipa = new JMXPasswordAuthenticator(_broker, new InetSocketAddress(jmxPortConnectorServer), connectorSslEnabled); HashMap<String,Object> connectorEnv = new HashMap<String,Object>(); connectorEnv.put(JMXConnectorServer.AUTHENTICATOR, rmipa);
Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/ra/QpidRAConnectionTest.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/ra/QpidRAConnectionTest.java?rev=1613068&r1=1613067&r2=1613068&view=diff ============================================================================== --- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/ra/QpidRAConnectionTest.java (original) +++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/ra/QpidRAConnectionTest.java Thu Jul 24 11:27:03 2014 @@ -20,17 +20,14 @@ */ package org.apache.qpid.ra; -import org.apache.log4j.Logger; -import org.apache.qpid.test.utils.QpidBrokerTestCase; - import javax.jms.Connection; import javax.jms.ConnectionFactory; import javax.jms.Message; import javax.jms.Session; -import org.apache.qpid.ra.QpidRAConnectionFactoryImpl; -import org.apache.qpid.ra.QpidRAManagedConnectionFactory; -import org.apache.qpid.ra.QpidResourceAdapter; +import org.apache.log4j.Logger; + +import org.apache.qpid.test.utils.QpidBrokerTestCase; public class QpidRAConnectionTest extends QpidBrokerTestCase { @@ -38,7 +35,7 @@ public class QpidRAConnectionTest extend private static final String BROKER_PORT = "15672"; - private static final String URL = "amqp://guest:guest@client/test?brokerlist='tcp://localhost:" + BROKER_PORT + "?sasl_mechs='PLAIN''"; + private static final String URL = "amqp://guest:guest@client/test?brokerlist='tcp://localhost:" + BROKER_PORT + "?sasl_mechs='PLAIN%25252520CRAM-MD5''"; public void testSessionCommitOnClosedConnectionThrowsException() throws Exception { Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/ra/QpidRAXAResourceTest.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/ra/QpidRAXAResourceTest.java?rev=1613068&r1=1613067&r2=1613068&view=diff ============================================================================== --- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/ra/QpidRAXAResourceTest.java (original) +++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/ra/QpidRAXAResourceTest.java Thu Jul 24 11:27:03 2014 @@ -20,30 +20,18 @@ */ package org.apache.qpid.ra; -import org.apache.qpid.test.utils.QpidBrokerTestCase; - -import javax.jms.Connection; -import javax.jms.ConnectionFactory; -import javax.jms.Message; -import javax.jms.Session; - import javax.jms.XAConnection; import javax.jms.XAConnectionFactory; import javax.jms.XASession; -import javax.transaction.xa.XAException; -import javax.transaction.xa.XAResource; import org.apache.qpid.client.AMQXAResource; - -import org.apache.qpid.ra.QpidRAConnectionFactoryImpl; -import org.apache.qpid.ra.QpidRAManagedConnectionFactory; -import org.apache.qpid.ra.QpidResourceAdapter; +import org.apache.qpid.test.utils.QpidBrokerTestCase; public class QpidRAXAResourceTest extends QpidBrokerTestCase { private static final String FACTORY_NAME = "default"; private static final String BROKER_PORT = "15672"; - private static final String URL = "amqp://guest:guest@client/test?brokerlist='tcp://localhost:" + BROKER_PORT + "?sasl_mechs='PLAIN''"; + private static final String URL = "amqp://guest:guest@client/test?brokerlist='tcp://localhost:" + BROKER_PORT + "?sasl_mechs='PLAIN%2520CRAM-MD5''"; public void testXAResourceIsSameRM() throws Exception { Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/ra/admin/QpidConnectionFactoryProxyTest.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/ra/admin/QpidConnectionFactoryProxyTest.java?rev=1613068&r1=1613067&r2=1613068&view=diff ============================================================================== --- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/ra/admin/QpidConnectionFactoryProxyTest.java (original) +++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/ra/admin/QpidConnectionFactoryProxyTest.java Thu Jul 24 11:27:03 2014 @@ -22,25 +22,18 @@ package org.apache.qpid.ra.admin; import javax.jms.Connection; import javax.jms.ConnectionFactory; -import javax.jms.JMSException; -import javax.naming.NamingException; import javax.jms.QueueConnection; import javax.jms.QueueConnectionFactory; -import javax.naming.Reference; -import javax.naming.Referenceable; -import javax.naming.spi.ObjectFactory; import javax.jms.TopicConnection; import javax.jms.TopicConnectionFactory; -import junit.framework.TestCase; - import org.apache.qpid.test.utils.QpidBrokerTestCase; public class QpidConnectionFactoryProxyTest extends QpidBrokerTestCase { private static final String BROKER_PORT = "15672"; - private static final String URL = "amqp://guest:guest@client/test?brokerlist='tcp://localhost:" + BROKER_PORT + "?sasl_mechs='PLAIN''"; + private static final String URL = "amqp://guest:guest@client/test?brokerlist='tcp://localhost:" + BROKER_PORT + "?sasl_mechs='PLAIN%2520CRAM-MD5''"; public void testQueueConnectionFactory() throws Exception { Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/QpidRestTestCase.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/QpidRestTestCase.java?rev=1613068&r1=1613067&r2=1613068&view=diff ============================================================================== --- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/QpidRestTestCase.java (original) +++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/QpidRestTestCase.java Thu Jul 24 11:27:03 2014 @@ -93,6 +93,11 @@ public class QpidRestTestCase extends Qp anonymousProviderAttributes.put(AuthenticationProvider.NAME, ANONYMOUS_AUTHENTICATION_PROVIDER); config.addObjectConfiguration(AuthenticationProvider.class, anonymousProviderAttributes); + config.setObjectAttribute(AuthenticationProvider.class, TestBrokerConfiguration.ENTRY_NAME_AUTHENTICATION_PROVIDER, + "secureOnlyMechanisms", + "{}"); + + // set password authentication provider on http port for the tests config.setObjectAttribute(Port.class, TestBrokerConfiguration.ENTRY_NAME_HTTP_PORT, Port.AUTHENTICATION_PROVIDER, TestBrokerConfiguration.ENTRY_NAME_AUTHENTICATION_PROVIDER); Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/SaslRestTest.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/SaslRestTest.java?rev=1613068&r1=1613067&r2=1613068&view=diff ============================================================================== --- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/SaslRestTest.java (original) +++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/SaslRestTest.java Thu Jul 24 11:27:03 2014 @@ -67,7 +67,7 @@ public class SaslRestTest extends QpidRe @SuppressWarnings("unchecked") List<String> mechanisms = (List<String>) saslData.get("mechanisms"); - String[] expectedMechanisms = { "AMQPLAIN", "PLAIN", "CRAM-MD5" }; + String[] expectedMechanisms = { "CRAM-MD5" }; for (String mechanism : expectedMechanisms) { assertTrue("Mechanism " + mechanism + " is not found", mechanisms.contains(mechanism)); Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ConnectionTest.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ConnectionTest.java?rev=1613068&r1=1613067&r2=1613068&view=diff ============================================================================== --- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ConnectionTest.java (original) +++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ConnectionTest.java Thu Jul 24 11:27:03 2014 @@ -20,6 +20,10 @@ */ package org.apache.qpid.test.unit.client.connection; +import javax.jms.Connection; +import javax.jms.QueueSession; +import javax.jms.TopicSession; + import org.apache.qpid.AMQConnectionFailureException; import org.apache.qpid.AMQException; import org.apache.qpid.AMQUnresolvedAddressException; @@ -36,10 +40,6 @@ import org.apache.qpid.jms.ConnectionURL import org.apache.qpid.jms.Session; import org.apache.qpid.test.utils.QpidBrokerTestCase; -import javax.jms.Connection; -import javax.jms.QueueSession; -import javax.jms.TopicSession; - public class ConnectionTest extends QpidBrokerTestCase { @@ -358,7 +358,7 @@ public class ConnectionTest extends Qpid try { BrokerDetails broker = getBroker(); - String url = "amqp:///test?brokerlist='" + broker + "?sasl_mechs='PLAIN''"; + String url = "amqp:///test?brokerlist='" + broker + "?sasl_mechs='PLAIN%2520CRAM-MD5''"; conn = new AMQConnection(url); conn.close(); fail("Exception should be thrown as user name and password is required"); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
