[jboss-cvs] JBoss Messaging SVN: r3587 - in branches/Branch_Stable: src/etc/server/default/deploy and 2 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: clebert.suconic at jboss.com
Date: 2008-01-17 16:38:40 -0500 (Thu, 17 Jan 2008)
New Revision: 3587

Modified:
   branches/Branch_Stable/
   branches/Branch_Stable/src/etc/server/default/deploy/messaging-service.xml
   branches/Branch_Stable/src/main/org/jboss/jms/server/ServerPeer.java
   branches/Branch_Stable/tests/src/org/jboss/test/messaging/tools/container/ServiceContainer.java
Log:
Fixing security on MessageSucker


Property changes on: branches/Branch_Stable
___________________________________________________________________
Name: svn:ignore
   - output
thirdparty
messaging.iws
bin
ObjectStore

   + output
thirdparty
messaging.iws
bin
ObjectStore
release


Modified: branches/Branch_Stable/src/etc/server/default/deploy/messaging-service.xml
===================================================================
--- branches/Branch_Stable/src/etc/server/default/deploy/messaging-service.xml	2008-01-17 16:32:40 UTC (rev 3586)
+++ branches/Branch_Stable/src/etc/server/default/deploy/messaging-service.xml	2008-01-17 21:38:40 UTC (rev 3587)
@@ -27,7 +27,7 @@
         The password used by the message sucker connections to create connections.
         THIS SHOULD ALWAYS BE CHANGED AT INSTALL TIME TO SECURE SYSTEM
         -->
-        <attribute name="SuckerPassword">x</attribute>  
+        <attribute name="SuckerPassword">CHANGE ME!!</attribute>  
    </mbean>
 
      <!-- ServerPeer MBean configuration

Modified: branches/Branch_Stable/src/main/org/jboss/jms/server/ServerPeer.java
===================================================================
--- branches/Branch_Stable/src/main/org/jboss/jms/server/ServerPeer.java	2008-01-17 16:32:40 UTC (rev 3586)
+++ branches/Branch_Stable/src/main/org/jboss/jms/server/ServerPeer.java	2008-01-17 21:38:40 UTC (rev 3587)
@@ -133,7 +133,7 @@
    
    private long recoverDeliveriesTimeout = 5 * 60 * 1000;
    
-   private String suckerPassword;
+   private String suckerPassword = SecurityMetadataStore.DEFAULT_SUCKER_USER_PASSWORD;
 
    /** The server aop xml configuration */
    private String serverAopConfig = "aop-messaging-server.xml";

Modified: branches/Branch_Stable/tests/src/org/jboss/test/messaging/tools/container/ServiceContainer.java
===================================================================
--- branches/Branch_Stable/tests/src/org/jboss/test/messaging/tools/container/ServiceContainer.java	2008-01-17 16:32:40 UTC (rev 3586)
+++ branches/Branch_Stable/tests/src/org/jboss/test/messaging/tools/container/ServiceContainer.java	2008-01-17 21:38:40 UTC (rev 3587)
@@ -1098,13 +1098,15 @@
 
    public SecurityMetadataStore startSecurityStore() throws Exception
    {
+      ObjectName securityObject = new ObjectName("jboss.messaging:service=SecurityStore");
       SecurityMetadataStore securityMetadataStore = new SecurityMetadataStore();
       securityMetadataStore.setSecurityDomain(MockJBossSecurityManager.TEST_SECURITY_DOMAIN);
+      securityMetadataStore.setSuckerPassword(SecurityMetadataStore.DEFAULT_SUCKER_USER_PASSWORD);
       securityMetadataStore.setDefaultSecurityConfig(XMLUtil.stringToElement("<security>\n" +
               "                  <role name=\"guest\" read=\"true\" write=\"true\" create=\"true\"/>\n" +
               "             </security>"));
-      mbeanServer.registerMBean(securityMetadataStore, new ObjectName("jboss.messaging:service=SecurityStore"));
-      mbeanServer.invoke(new ObjectName("jboss.messaging:service=SecurityStore"), "start", new Object[0], new String[0]);
+      mbeanServer.registerMBean(securityMetadataStore, securityObject);
+      mbeanServer.invoke(securityObject, "start", new Object[0], new String[0]);
       return securityMetadataStore;
    }