[Jboss-cvs] JBossAS SVN: r55394 - in branches/Branch_4_0: server/src/main/org/jboss/jmx/connector/invoker testsuite/src/main/org/jboss/test/jmx/test

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

Author: anil.saldhana at jboss.com
Date: 2006-08-07 20:29:45 -0400 (Mon, 07 Aug 2006)
New Revision: 55394

Modified:
   branches/Branch_4_0/server/src/main/org/jboss/jmx/connector/invoker/AuthorizationInterceptor.java
   branches/Branch_4_0/testsuite/src/main/org/jboss/test/jmx/test/RMIAdaptorAuthorizationUnitTestCase.java
Log:
JBAS-3431: Ignore requests for MBeanCount and MBeanInfo etc as we have authenticated the caller

Modified: branches/Branch_4_0/server/src/main/org/jboss/jmx/connector/invoker/AuthorizationInterceptor.java
===================================================================
--- branches/Branch_4_0/server/src/main/org/jboss/jmx/connector/invoker/AuthorizationInterceptor.java	2006-08-08 00:19:49 UTC (rev 55393)
+++ branches/Branch_4_0/server/src/main/org/jboss/jmx/connector/invoker/AuthorizationInterceptor.java	2006-08-08 00:29:45 UTC (rev 55394)
@@ -103,24 +103,28 @@
             Principal caller = inv.getPrincipal();
             //Get the Method Name
             Object[] obj = inv.getArguments();
-            ObjectName objname = (ObjectName) obj[0];
-            String opname = (String) obj[1];
+            //Ignore calls like MBeanCount or getMBeanInfo
+            if(obj != null && obj.length > 1)
+            {
+               ObjectName objname = (ObjectName) obj[0];
+               String opname = (String) obj[1];
 
-            try
-            {
-               checkAuthorization(caller, objname.getCanonicalName(), opname);
-            }
-            catch(SecurityException e)
-            {
-               throw e;
-            }
-            catch(Exception e)
-            {
-               String msg = "Failed to authorize principal=" + caller
+               try
+               {
+                  checkAuthorization(caller, objname.getCanonicalName(), opname);
+               }
+               catch(SecurityException e)
+               {
+                  throw e;
+               }
+               catch(Exception e)
+               {
+                  String msg = "Failed to authorize principal=" + caller
                   + ",MBean=" + objname + ", Operation=" + opname;
-               SecurityException ex = new SecurityException(msg);
-               ex.initCause(e);
-               throw ex;
+                  SecurityException ex = new SecurityException(msg);
+                  ex.initCause(e);
+                  throw ex;
+               }
             }
          }
       }

Modified: branches/Branch_4_0/testsuite/src/main/org/jboss/test/jmx/test/RMIAdaptorAuthorizationUnitTestCase.java
===================================================================
--- branches/Branch_4_0/testsuite/src/main/org/jboss/test/jmx/test/RMIAdaptorAuthorizationUnitTestCase.java	2006-08-08 00:19:49 UTC (rev 55393)
+++ branches/Branch_4_0/testsuite/src/main/org/jboss/test/jmx/test/RMIAdaptorAuthorizationUnitTestCase.java	2006-08-08 00:29:45 UTC (rev 55394)
@@ -21,6 +21,7 @@
 */
 package org.jboss.test.jmx.test;
 
+import javax.management.MBeanInfo;
 import javax.management.MBeanServerConnection;
 import javax.management.ObjectName;
 import javax.naming.InitialContext;
@@ -63,6 +64,10 @@
       ObjectName server = new ObjectName("jboss.system:type=Server");
       String version = (String) conn.getAttribute(server, "Version");
       log.info("Obtained server version: "+version);
+      MBeanInfo info = conn.getMBeanInfo(server); 
+      assertNotNull("MBeanInfo != null", info);
+      Integer mbeanCount = conn.getMBeanCount();
+      assertNotNull("mbeanCount != null", mbeanCount);
       lc.logout();
    }