Return-Path: Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: (qmail 23481 invoked from network); 27 May 2008 13:52:19 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 27 May 2008 13:52:19 -0000 Received: (qmail 62562 invoked by uid 500); 27 May 2008 13:52:21 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 62526 invoked by uid 500); 27 May 2008 13:52:20 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 62517 invoked by uid 99); 27 May 2008 13:52:20 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 27 May 2008 06:52:20 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 27 May 2008 13:51:26 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 3A31B2388A07; Tue, 27 May 2008 06:51:48 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r660517 - in /activemq/trunk/activemq-core/src: main/java/org/apache/activemq/security/ test/java/org/apache/activemq/security/ test/resources/org/apache/activemq/security/ Date: Tue, 27 May 2008 13:51:46 -0000 To: commits@activemq.apache.org From: rajdavies@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080527135148.3A31B2388A07@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: rajdavies Date: Tue May 27 06:51:42 2008 New Revision: 660517 URL: http://svn.apache.org/viewvc?rev=660517&view=rev Log: Apply patch for https://issues.apache.org/activemq/browse/AMQ-1747 Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/security/AuthorizationBroker.java activemq/trunk/activemq-core/src/test/java/org/apache/activemq/security/SimpleAuthenticationPluginTest.java activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/security/simple-auth-broker.xml Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/security/AuthorizationBroker.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/security/AuthorizationBroker.java?rev=660517&r1=660516&r2=660517&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/security/AuthorizationBroker.java (original) +++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/security/AuthorizationBroker.java Tue May 27 06:51:42 2008 @@ -51,6 +51,12 @@ if (securityContext == null) { throw new SecurityException("User is not authenticated."); } + + Destination existing = this.getDestinationMap().get(destination); + if (existing != null) { + return existing; + } + // if(!((ActiveMQTempDestination)destination).getConnectionId().equals(context.getConnectionId().getValue()) // ) { if (!securityContext.isBrokerContext()) { Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/security/SimpleAuthenticationPluginTest.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/security/SimpleAuthenticationPluginTest.java?rev=660517&r1=660516&r2=660517&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/security/SimpleAuthenticationPluginTest.java (original) +++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/security/SimpleAuthenticationPluginTest.java Tue May 27 06:51:42 2008 @@ -18,9 +18,16 @@ import java.net.URI; +import javax.jms.JMSException; +import javax.jms.Message; + import junit.framework.Test; + +import org.apache.activemq.CombinationTestSupport; import org.apache.activemq.broker.BrokerFactory; import org.apache.activemq.broker.BrokerService; +import org.apache.activemq.command.ActiveMQMessage; +import org.apache.activemq.command.ActiveMQQueue; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -44,5 +51,20 @@ LOG.info("Loading broker configuration from the classpath with URI: " + uri); return BrokerFactory.createBroker(new URI("xbean:" + uri)); } + + /** + * @see {@link CombinationTestSupport} + */ + public void initCombosForTestPredefinedDestinations() { + addCombinationValues("userName", new Object[] {"guest"}); + addCombinationValues("password", new Object[] {"password"}); + addCombinationValues("destination", new Object[] {new ActiveMQQueue("TEST.Q")}); + } + + public void testPredefinedDestinations() throws JMSException { + Message sent = doSend(false); + assertEquals("guest", ((ActiveMQMessage)sent).getUserID()); + assertEquals("guest", sent.getStringProperty("JMSXUserID")); + } } Modified: activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/security/simple-auth-broker.xml URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/security/simple-auth-broker.xml?rev=660517&r1=660516&r2=660517&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/security/simple-auth-broker.xml (original) +++ activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/security/simple-auth-broker.xml Tue May 27 06:51:42 2008 @@ -23,6 +23,10 @@ + + + + @@ -44,6 +48,8 @@ + +