[jboss-remoting-commits] JBoss Remoting SVN: r4192 - remoting2/branches/2.x/src/main/org/jboss/remoting/transport/servlet/web.

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

Author: ron.sigal at jboss.com
Date: 2008-05-16 22:43:14 -0400 (Fri, 16 May 2008)
New Revision: 4192

Modified:
   remoting2/branches/2.x/src/main/org/jboss/remoting/transport/servlet/web/ServerInvokerServlet.java
Log:
JBREM-978: Moved security sensitive code to SecurityUtility.

Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/transport/servlet/web/ServerInvokerServlet.java
===================================================================
--- remoting2/branches/2.x/src/main/org/jboss/remoting/transport/servlet/web/ServerInvokerServlet.java	2008-05-17 02:39:45 UTC (rev 4191)
+++ remoting2/branches/2.x/src/main/org/jboss/remoting/transport/servlet/web/ServerInvokerServlet.java	2008-05-17 02:43:14 UTC (rev 4192)
@@ -30,7 +30,6 @@
 import org.jboss.remoting.util.SecurityUtility;
 
 import javax.management.MBeanServer;
-import javax.management.MBeanServerFactory;
 import javax.management.MBeanServerInvocationHandler;
 import javax.management.MalformedObjectNameException;
 import javax.management.ObjectName;
@@ -43,11 +42,6 @@
 import javax.servlet.http.HttpServletResponse;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
-import java.lang.reflect.Method;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.security.PrivilegedActionException;
-import java.security.PrivilegedExceptionAction;
 import java.util.Iterator;
 
 /**
@@ -129,8 +123,7 @@
       }
       byteOutputStream.flush();
       byte[] totalByteArray = byteOutputStream.toByteArray();
-
-      byte[] out = servletInvoker.processRequest(request, totalByteArray, response);
+      byte[] out = SecurityUtility.processRequest(servletInvoker, request, totalByteArray, response);
       ServletOutputStream outStream = response.getOutputStream();
       outStream.write(out);
       outStream.flush();
@@ -274,27 +267,17 @@
       {
          try
          {
-            Class c = Class.forName("java.lang.management.ManagementFactory");
-            Method m = SecurityUtility.getMethod(c, "getPlatformMBeanServer", new Class[] {});
-            MBeanServer s = (MBeanServer) m.invoke(null, new Object[] {});
+            MBeanServer s = SecurityUtility.getPlatformMBeanServer();
             log.debug("Using platform MBeanServer");
             return s;
          }
          catch (Exception e)
          {
-            log.warn("Unable to access java.lang.management.ManagementFactory: must be using jdk 1.4");
             mbeanServerId = "jboss";
          }
       }
       
-      Iterator i = (Iterator) AccessController.doPrivileged( new PrivilegedAction()
-      {
-         public Object run()
-         {
-            return MBeanServerFactory.findMBeanServer(null).iterator();
-         }
-      });
-      
+      Iterator i = SecurityUtility.findMBeanServer(null).iterator();
       while(i.hasNext())
       {
          MBeanServer server = (MBeanServer) i.next();