[jboss-remoting-commits] JBoss Remoting SVN: r3969 - remoting2/branches/2.x/src/main/org/jboss/remoting/util.

jboss-remoting-commits at lists.jboss.org jboss-remoting-commits at lists.jboss.org
Fri Apr 11 21:46:27 EDT 2008


Author: ron.sigal at jboss.com
Date: 2008-04-11 21:46:27 -0400 (Fri, 11 Apr 2008)
New Revision: 3969

Added:
   remoting2/branches/2.x/src/main/org/jboss/remoting/util/SecurityUtility.java
Removed:
   remoting2/branches/2.x/src/main/org/jboss/remoting/util/SystemUtility.java
Log:
JBREM-934: (1) Added many methods; (2) renamed SystemUtility SecurityUtility.

Copied: remoting2/branches/2.x/src/main/org/jboss/remoting/util/SecurityUtility.java (from rev 3905, remoting2/branches/2.x/src/main/org/jboss/remoting/util/SystemUtility.java)
===================================================================
--- remoting2/branches/2.x/src/main/org/jboss/remoting/util/SecurityUtility.java	                        (rev 0)
+++ remoting2/branches/2.x/src/main/org/jboss/remoting/util/SecurityUtility.java	2008-04-12 01:46:27 UTC (rev 3969)
@@ -0,0 +1,1117 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2005, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.remoting.util;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.lang.reflect.Method;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.ServerSocket;
+import java.net.Socket;
+import java.net.SocketAddress;
+import java.net.UnknownHostException;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+import java.security.PrivilegedActionException;
+import java.security.PrivilegedExceptionAction;
+
+import javax.management.InstanceNotFoundException;
+import javax.management.MBeanServer;
+import javax.management.MBeanServerFactory;
+import javax.management.ObjectName;
+import javax.net.ServerSocketFactory;
+import javax.net.SocketFactory;
+
+import org.jboss.remoting.Remoting;
+import org.jboss.remoting.security.ServerSocketFactoryMBean;
+
+/**
+ * SecurityUtility provides a central point for making security sensitive calls.
+ * 
+ * It is divided into five sections:
+ * 
+ *   1. calls requiring FilePermissions
+ *   2. calls requiring MBeanPermissions
+ *   3. calls requiring PropertyPermissions
+ *   4. calls requiring RuntimePermissions
+ *   5. calls requiring SocketPermissions
+ *   
+ * When the SecurityUtility class is loaded, it checks for two conditions:
+ * 
+ *   1. there is no security manager
+ *   2. the system property Remoting.SKIP_ACCESS_CONTROL ("skipAccessControl") is 
+ *      set to true.
+ *      
+ * If either condition is true, then every method in SecurityUtility will
+ * bypass its call to AccessController.doPrivileged().
+ * 
+ * @author <a href="ron.sigal at jboss.com">Ron Sigal</a>
+ * @version $Revision: 1.1 $
+ * <p>
+ * Copyright Mar 31, 2008
+ * </p>
+ */
+public class SecurityUtility
+{
+   static boolean skipAccessControl;
+   
+   static
+   {
+      try
+      {
+         skipAccessControl = ((Boolean)AccessController.doPrivileged( new PrivilegedExceptionAction()
+         {
+            public Object run() throws Exception
+            {
+               boolean b1 = System.getSecurityManager() == null;
+               boolean b2 = Boolean.getBoolean(Remoting.SKIP_ACCESS_CONTROL);
+               return new Boolean(b1 || b2);
+            }
+         })).booleanValue();
+      }
+      catch (PrivilegedActionException e)
+      {
+         e.getCause().printStackTrace();
+      }  
+   }
+   
+   
+   static public boolean skipAccessControl()
+   {
+      return skipAccessControl;
+   }
+   
+   ///////////////////////////////////////////////////////////////////////////////////////
+   // FilePermission methods
+   ///////////////////////////////////////////////////////////////////////////////////////
+   
+   static public boolean fileExists(final File file)
+   {
+      if (skipAccessControl)
+      {
+         return file.exists();
+      }
+
+      return ((Boolean)AccessController.doPrivileged( new PrivilegedAction()
+      {
+         public Object run()
+         {
+            return new Boolean(file.exists());
+         }
+      })).booleanValue();
+   }
+
+   
+   static public boolean mkdirs(final File dir)
+   {
+      if (skipAccessControl)
+      {
+         return dir.mkdirs();
+      }
+      
+      return ((Boolean) AccessController.doPrivileged( new PrivilegedAction()
+      {
+         public Object run()
+         {
+            return new Boolean(dir.mkdirs());
+         }
+      })).booleanValue();
+   }
+   
+   
+   static public FileInputStream getFileInputStream(final File file) throws FileNotFoundException
+   {
+      if (skipAccessControl)
+      {
+         return new FileInputStream(file);
+      }
+      
+      try
+      {
+         return (FileInputStream)AccessController.doPrivileged( new PrivilegedExceptionAction()
+         {
+            public Object run() throws FileNotFoundException
+            {
+               return new FileInputStream(file);
+            }
+         });
+      }
+      catch (PrivilegedActionException e)
+      {
+         throw (FileNotFoundException) e.getCause();
+      }
+   }
+   
+   
+   static public FileInputStream getFileInputStream(final String path) throws FileNotFoundException
+   {
+      if (skipAccessControl)
+      {
+         return new FileInputStream(path);
+      }
+      
+      try
+      {
+         return (FileInputStream)AccessController.doPrivileged( new PrivilegedExceptionAction()
+         {
+            public Object run() throws FileNotFoundException
+            {
+               return new FileInputStream(path);
+            }
+         });
+      }
+      catch (PrivilegedActionException e)
+      {
+         throw (FileNotFoundException) e.getCause();
+      }
+   }
+   
+   
+   static public FileOutputStream getFileOutputStream(final File file)
+   throws FileNotFoundException
+   {
+      if (skipAccessControl)
+      {
+         return new FileOutputStream(file);
+      }
+      
+      try
+      {
+         return (FileOutputStream)AccessController.doPrivileged( new PrivilegedExceptionAction()
+         {
+            public Object run() throws FileNotFoundException
+            {
+               return new FileOutputStream(file);
+            }
+         });
+      }
+      catch (PrivilegedActionException e)
+      {
+         throw (FileNotFoundException) e.getCause();
+      }
+   }
+   
+   
+   static public FileOutputStream getFileOutputStream(final File file, final boolean append)
+   throws FileNotFoundException
+   {
+      if (skipAccessControl)
+      {
+         return new FileOutputStream(file, append);
+      }
+      
+      try
+      {
+         return (FileOutputStream)AccessController.doPrivileged( new PrivilegedExceptionAction()
+         {
+            public Object run() throws FileNotFoundException
+            {
+               return new FileOutputStream(file, append);
+            }
+         });
+      }
+      catch (PrivilegedActionException e)
+      {
+         throw (FileNotFoundException) e.getCause();
+      }
+   }
+   
+   
+   static public boolean canRead(final File file)
+   {
+      if (skipAccessControl)
+      {
+         return file.canRead();
+      }
+      
+      return ((Boolean)AccessController.doPrivileged( new PrivilegedAction()
+      {
+         public Object run()
+         {
+            return new Boolean(file.canRead());
+         }
+      })).booleanValue();
+   }
+   
+   
+   static public boolean createNewFile(final File file) throws IOException
+   {
+      if (skipAccessControl)
+      {
+         return file.createNewFile();
+      }
+      
+      try
+      {
+         return ((Boolean)AccessController.doPrivileged( new PrivilegedExceptionAction()
+         {
+            public Object run() throws Exception
+            {
+               return new Boolean(file.createNewFile());
+            }
+         })).booleanValue();
+      }
+      catch (Exception e)
+      {
+         throw (IOException) e.getCause();
+      }
+   }
+   
+   
+   ///////////////////////////////////////////////////////////////////////////////////////
+   // MBeanPermission methods
+   ///////////////////////////////////////////////////////////////////////////////////////
+   
+   static public void connect(final Socket socket, final InetSocketAddress address)
+   throws IOException
+   {
+      if (skipAccessControl)
+      {
+         socket.connect(address);
+         return;
+      }
+      
+      try
+      {
+         AccessController.doPrivileged( new PrivilegedExceptionAction()
+         {
+            public Object run() throws Exception
+            {
+               socket.connect(address);
+               return null;
+            }
+         });
+      }
+      catch (PrivilegedActionException e)
+      {
+         throw (IOException) e.getCause();
+      }   
+   }
+   
+   
+   static public void connect(final Socket socket, final InetSocketAddress address, final int timeout)
+   throws IOException
+   {
+      if (skipAccessControl)
+      {
+         socket.connect(address, timeout);
+         return;
+      }
+      
+      try
+      {
+         AccessController.doPrivileged( new PrivilegedExceptionAction()
+         {
+            public Object run() throws Exception
+            {
+               socket.connect(address, timeout);
+               return null;
+            }
+         });
+      }
+      catch (PrivilegedActionException e)
+      {
+         throw (IOException) e.getCause();
+      }   
+   }
+   
+   
+   static public MBeanServer createMBeanServer() throws Exception
+   {
+      if (skipAccessControl)
+      {
+         return MBeanServerFactory.createMBeanServer();
+      }
+      
+      try
+      {
+         return (MBeanServer) AccessController.doPrivileged( new PrivilegedExceptionAction()
+         {
+            public Object run() throws Exception
+            {
+               return MBeanServerFactory.createMBeanServer();
+            }
+         });
+      }
+      catch (PrivilegedActionException e)
+      {
+         throw (Exception) e.getCause();
+      }   
+   }
+   
+   
+   static public boolean isInstanceOf(final MBeanServer server, final ObjectName objectName, final String className)
+   throws InstanceNotFoundException
+   {
+      if (skipAccessControl)
+      {
+         return server.isInstanceOf(objectName, className);
+      }
+      
+      try
+      {
+         return ((Boolean)AccessController.doPrivileged( new PrivilegedExceptionAction()
+         {
+            public Object run() throws Exception
+            {
+               return new Boolean(server.isInstanceOf(objectName, className));
+            }
+         })).booleanValue();
+      }
+      catch (PrivilegedActionException e)
+      {
+         throw (InstanceNotFoundException) e.getCause();
+      }
+   }
+   
+   
+   static public Object getMBeanAttribute(final MBeanServer server, final ObjectName objectName, final String attribute)
+   throws Exception
+   {
+      if (skipAccessControl)
+      {
+         return server.getAttribute(objectName, attribute);
+      }
+      
+      try
+      {
+         return AccessController.doPrivileged( new PrivilegedExceptionAction()
+         {
+            public Object run() throws Exception
+            {
+               return server.getAttribute(objectName, attribute);
+            }
+         });
+      }
+      catch (PrivilegedActionException e)
+      {
+         throw (Exception) e.getCause();
+      }  
+   }
+   
+   
+   static public void registerMBean(final MBeanServer server, final Object o, final ObjectName name)
+   throws Exception
+   {
+      if (skipAccessControl)
+      {
+         server.registerMBean(o, name);
+         return;
+      }
+      
+      try
+      {
+         AccessController.doPrivileged( new PrivilegedExceptionAction()
+         {
+            public Object run() throws Exception
+            {
+               server.registerMBean(o, name);
+               return null;
+            }
+         });
+      }
+      catch (PrivilegedActionException e)
+      {
+         throw (Exception) e.getCause();
+      }
+   }
+     
+   
+   static public void unregisterMBean(final MBeanServer server, final ObjectName name)
+   throws Exception
+   {
+      if (skipAccessControl)
+      {
+         server.unregisterMBean(name);
+         return;
+      }
+      
+      try
+      {
+         AccessController.doPrivileged( new PrivilegedExceptionAction()
+         {
+            public Object run() throws Exception
+            {
+               server.unregisterMBean(name);
+               return null;
+            }
+         });
+      }
+      catch (PrivilegedActionException e)
+      {
+         throw (Exception) e.getCause();
+      }
+   }
+   
+
+   ///////////////////////////////////////////////////////////////////////////////////////
+   // PropertyPermission methods
+   ///////////////////////////////////////////////////////////////////////////////////////
+   
+   static public String getSystemProperty(final String name, final String defaultValue)
+   {
+      if (skipAccessControl)
+         return System.getProperty(name, defaultValue);
+         
+      String value = null;
+      try
+      {
+         value = (String)AccessController.doPrivileged( new PrivilegedExceptionAction()
+         {
+            public Object run() throws Exception
+            {
+               return System.getProperty(name, defaultValue);
+            }
+         });
+      }
+      catch (PrivilegedActionException e)
+      {
+         throw (RuntimeException) e.getCause();
+      }
+      
+      return value;
+   }
+   
+   
+   static public String getSystemProperty(final String name)
+   {
+      if (skipAccessControl)
+         return System.getProperty(name);
+      
+      String value = null;
+      try
+      {
+         value = (String)AccessController.doPrivileged( new PrivilegedExceptionAction()
+         {
+            public Object run() throws Exception
+            {
+               return System.getProperty(name);
+            }
+         });
+      }
+      catch (PrivilegedActionException e)
+      {
+         throw (RuntimeException) e.getCause();
+      }
+      
+      return value;
+   }
+   
+   
+   static public void setSystemProperty(final String name, final String value)
+   {
+      if (skipAccessControl)
+      {
+         System.setProperty(name, value);
+         return;
+      }
+      
+      try
+      {
+         AccessController.doPrivileged( new PrivilegedExceptionAction()
+         {
+            public Object run() throws Exception
+            {
+               return System.setProperty(name, value);
+            }
+         });
+      }
+      catch (PrivilegedActionException e)
+      {
+         throw (RuntimeException) e.getCause();
+      }
+   }
+   
+   
+   ///////////////////////////////////////////////////////////////////////////////////////
+   // RuntimePermission methods
+   ///////////////////////////////////////////////////////////////////////////////////////
+   
+   static public Object forName(final String className) throws ClassNotFoundException
+   {
+      if (skipAccessControl)
+      {
+         return Class.forName(className);
+      }
+      
+      try
+      {
+         return  AccessController.doPrivileged( new PrivilegedExceptionAction()
+         {
+            public Object run() throws Exception
+            {
+               return Class.forName(className);
+            }
+         });
+      }
+      catch (PrivilegedActionException e)
+      {
+         throw (ClassNotFoundException) e.getCause();
+      }
+   }
+   
+   
+   static public ClassLoader getClassLoader(final Class c)
+   {
+      if (skipAccessControl)
+      {
+         return c.getClassLoader();
+      }
+
+      return (ClassLoader)AccessController.doPrivileged( new PrivilegedAction()
+      {
+         public Object run()
+         {
+            return c.getClassLoader();
+         }
+      });
+   }
+   
+   
+   static public ClassLoader getSystemClassLoader()
+   {
+      if (skipAccessControl)
+      {
+         return ClassLoader.getSystemClassLoader();
+      }
+
+      return (ClassLoader)AccessController.doPrivileged( new PrivilegedAction()
+      {
+         public Object run()
+         {
+            return ClassLoader.getSystemClassLoader();
+         }
+      });
+   }
+   
+   
+   static public Method getMethod(final Class c, final String name, final Class[] parameterTypes)
+   throws NoSuchMethodException
+   {
+      if (skipAccessControl)
+      {
+         return c.getMethod(name, parameterTypes);
+      }
+
+      try
+      {
+         return (Method) AccessController.doPrivileged( new PrivilegedExceptionAction()
+         {
+            public Object run() throws NoSuchMethodException
+            {
+               return c.getMethod(name, parameterTypes);
+            }
+         });
+      }
+      catch (PrivilegedActionException e)
+      {
+         throw (NoSuchMethodException) e.getCause();
+      }
+   }
+   
+   
+   static public Method getDeclaredMethod(final Class c, final String name, final Class[] parameterTypes)
+   throws NoSuchMethodException
+   {
+      if (skipAccessControl)
+      {
+         return c.getDeclaredMethod(name, parameterTypes);
+      }
+
+      try
+      {
+         return (Method) AccessController.doPrivileged( new PrivilegedExceptionAction()
+         {
+            public Object run() throws NoSuchMethodException
+            {
+               return c.getDeclaredMethod(name, parameterTypes);
+            }
+         });
+      }
+      catch (PrivilegedActionException e)
+      {
+         throw (NoSuchMethodException) e.getCause();
+      }
+   }
+
+   
+   ///////////////////////////////////////////////////////////////////////////////////////
+   // SocketPermission methods
+   ///////////////////////////////////////////////////////////////////////////////////////
+   
+   static public Socket accept(final ServerSocket ss) throws IOException
+   {
+      if (skipAccessControl)
+      {
+         return ss.accept();
+      }
+      
+      try
+      {
+          return (Socket)AccessController.doPrivileged( new PrivilegedExceptionAction()
+          {
+             public Object run() throws Exception
+             {
+                 return ss.accept();
+             }
+          });
+      }
+      catch (PrivilegedActionException e)
+      {
+          throw (IOException) e.getCause();
+      }
+   }
+   
+   
+   static public void bind(final ServerSocket ss, final SocketAddress address)
+   throws IOException
+   {
+      if (skipAccessControl)
+      {
+         ss.bind(address);
+         return;
+      }
+
+      try
+      {
+         AccessController.doPrivileged( new PrivilegedExceptionAction()
+         {
+            public Object run() throws Exception
+            {
+               ss.bind(address);
+               return null;
+            }
+         });
+      }
+      catch (PrivilegedActionException e)
+      {
+         throw (IOException) e.getCause();
+      }
+   }
+
+
+   static public void bind(final ServerSocket ss, final SocketAddress address,
+                           final int backlog) throws IOException
+   {
+      if (skipAccessControl)
+      {
+         ss.bind(address, backlog);
+         return;
+      }
+      
+      try
+      {
+          AccessController.doPrivileged( new PrivilegedExceptionAction()
+          {
+             public Object run() throws Exception
+             {
+                ss.bind(address, backlog);
+                return null;
+             }
+          });
+      }
+      catch (PrivilegedActionException e)
+      {
+          throw (IOException) e.getCause();
+      }
+   }
+   
+   
+   static public ServerSocket createServerSocket(final ServerSocketFactoryMBean ssf,
+                                                 final int port) throws IOException
+   {
+      if (skipAccessControl)
+      {
+         return ssf.createServerSocket(port);
+      }
+      
+      try
+      {
+          return (ServerSocket)AccessController.doPrivileged( new PrivilegedExceptionAction()
+          {
+             public Object run() throws Exception
+             {
+                 return ssf.createServerSocket(port);
+             }
+          });
+      }
+      catch (PrivilegedActionException e)
+      {
+          throw (IOException) e.getCause();
+      }
+   }
+
+   
+   static public ServerSocket createServerSocket(final ServerSocketFactoryMBean ssf,
+                                                 final int port, final int backlog)
+   throws IOException
+   {
+      if (skipAccessControl)
+      {
+         return ssf.createServerSocket(port, backlog);
+      }
+
+      try
+      {
+         return (ServerSocket)AccessController.doPrivileged( new PrivilegedExceptionAction()
+         {
+            public Object run() throws Exception
+            {
+               return ssf.createServerSocket(port, backlog);
+            }
+         });
+      }
+      catch (PrivilegedActionException e)
+      {
+         throw (IOException) e.getCause();
+      }
+   }
+
+   
+   static public ServerSocket createServerSocket(final ServerSocketFactoryMBean ssf,
+                                                 final int port, final int backlog,
+                                                 final InetAddress inetAddress)
+   throws IOException
+   {
+      if (skipAccessControl)
+      {
+         return ssf.createServerSocket(port, backlog, inetAddress);
+      }
+
+      try
+      {
+         return (ServerSocket)AccessController.doPrivileged( new PrivilegedExceptionAction()
+         {
+            public Object run() throws Exception
+            {
+               return ssf.createServerSocket(port, backlog, inetAddress);
+            }
+         });
+      }
+      catch (PrivilegedActionException e)
+      {
+         throw (IOException) e.getCause();
+      }
+   }
+
+
+   static public ServerSocket createServerSocket(final ServerSocketFactory ssf,
+                                                 final int port) throws IOException
+   {
+      if (skipAccessControl)
+      {
+         return ssf.createServerSocket(port);
+      }
+
+      try
+      {
+         return (ServerSocket)AccessController.doPrivileged( new PrivilegedExceptionAction()
+         {
+            public Object run() throws Exception
+            {
+               return ssf.createServerSocket(port);
+            }
+         });
+      }
+      catch (PrivilegedActionException e)
+      {
+         throw (IOException) e.getCause();
+      }
+   }
+
+
+   static public ServerSocket createServerSocket(final ServerSocketFactory ssf,
+                                                 final int port, final int backlog)
+   throws IOException
+   {
+      if (skipAccessControl)
+      {
+         return ssf.createServerSocket(port, backlog);
+      }
+
+      try
+      {
+         return (ServerSocket)AccessController.doPrivileged( new PrivilegedExceptionAction()
+         {
+            public Object run() throws Exception
+            {
+               return ssf.createServerSocket(port, backlog);
+            }
+         });
+      }
+      catch (PrivilegedActionException e)
+      {
+         throw (IOException) e.getCause();
+      }
+   }
+
+
+   static public ServerSocket createServerSocket(final ServerSocketFactory ssf,
+                                                 final int port, final int backlog,
+                                                 final InetAddress inetAddress)
+   throws IOException
+   {
+      if (skipAccessControl)
+      {
+         return ssf.createServerSocket(port, backlog, inetAddress);
+      }
+
+      try
+      {
+         return (ServerSocket)AccessController.doPrivileged( new PrivilegedExceptionAction()
+         {
+            public Object run() throws Exception
+            {
+               return ssf.createServerSocket(port, backlog, inetAddress);
+            }
+         });
+      }
+      catch (PrivilegedActionException e)
+      {
+         throw (IOException) e.getCause();
+      }
+   }
+
+   
+   static public ServerSocket createServerSocket(final int port) throws IOException
+   {
+      if (skipAccessControl)
+      {
+         return new ServerSocket(port);
+      }
+
+      try
+      {
+         return (ServerSocket)AccessController.doPrivileged( new PrivilegedExceptionAction()
+         {
+            public Object run() throws Exception
+            {
+               return new ServerSocket(port);
+            }
+         });
+      }
+      catch (PrivilegedActionException e)
+      {
+         throw (IOException) e.getCause();
+      }
+   }
+
+
+   static public ServerSocket createServerSocket(final int port, final int backlog)
+   throws IOException
+   {
+      if (skipAccessControl)
+      {
+         return new ServerSocket(port, backlog);
+      }
+
+      try
+      {
+         return (ServerSocket)AccessController.doPrivileged( new PrivilegedExceptionAction()
+         {
+            public Object run() throws Exception
+            {
+               return new ServerSocket(port, backlog);
+            }
+         });
+      }
+      catch (PrivilegedActionException e)
+      {
+         throw (IOException) e.getCause();
+      }
+   }
+
+
+   static public ServerSocket createServerSocket(final int port, final int backlog,
+                                                 final InetAddress inetAddress)
+   throws IOException
+   {
+      if (skipAccessControl)
+      {
+         return new ServerSocket(port, backlog, inetAddress);
+      }
+
+      try
+      {
+         return (ServerSocket)AccessController.doPrivileged( new PrivilegedExceptionAction()
+         {
+            public Object run() throws Exception
+            {
+               return new ServerSocket(port, backlog, inetAddress);
+            }
+         });
+      }
+      catch (PrivilegedActionException e)
+      {
+         throw (IOException) e.getCause();
+      }
+   }
+
+
+   static public Socket createSocket(final String host, final int port) throws IOException
+   {
+      if (skipAccessControl)
+      {
+         return new Socket(host, port);
+      }
+      
+      try
+      {
+          return (Socket)AccessController.doPrivileged( new PrivilegedExceptionAction()
+          {
+             public Object run() throws Exception
+             {
+                return new Socket(host, port);
+             }
+          });
+      }
+      catch (PrivilegedActionException e)
+      {
+         throw (IOException) e.getCause();
+      }
+   }
+
+
+   static public Socket createSocket(final SocketFactory sf, final String host, final int port)
+   throws IOException
+   {
+      if (skipAccessControl)
+      {
+         return sf.createSocket(host, port);
+      }
+      
+      try
+      {
+          return (Socket)AccessController.doPrivileged( new PrivilegedExceptionAction()
+          {
+             public Object run() throws Exception
+             {
+                return sf.createSocket(host, port);
+             }
+          });
+      }
+      catch (PrivilegedActionException e)
+      {
+         throw (IOException) e.getCause();
+      }
+   }
+   
+   
+   static public InetAddress getLocalHost() throws UnknownHostException
+   {
+      if (skipAccessControl)
+      {
+         try
+         {
+            return InetAddress.getLocalHost();
+         }
+         catch (IOException e)
+         {
+            return InetAddress.getByName("127.0.0.1");
+         }
+      }
+
+      try
+      {
+         return (InetAddress) AccessController.doPrivileged( new PrivilegedExceptionAction()
+         {
+            public Object run() throws IOException
+            {
+               try
+               {
+                  return InetAddress.getLocalHost();
+               }
+               catch (IOException e)
+               {
+                  return InetAddress.getByName("127.0.0.1");
+               }
+            }
+         });
+      }
+      catch (PrivilegedActionException e)
+      {
+         throw (UnknownHostException) e.getCause();
+      }
+   }
+
+   
+   static public String getLocalHostName() throws UnknownHostException
+   {
+      if (skipAccessControl)
+      {
+         return getLocalHost().getHostName();
+      }
+
+      try
+      {
+         return (String) AccessController.doPrivileged( new PrivilegedExceptionAction()
+         {
+            public Object run() throws IOException
+            {
+               InetAddress address = null;
+               try
+               {
+                  address = InetAddress.getLocalHost();
+               }
+               catch (IOException e)
+               {
+                  address = InetAddress.getByName("127.0.0.1");
+               }
+               
+               return address.getHostName();
+            }
+         });
+      }
+      catch (PrivilegedActionException e)
+      {
+         throw (UnknownHostException) e.getCause();
+      }
+   }
+   
+   
+   static public InetAddress getAddressByName(final String host) throws UnknownHostException
+   {
+      if (skipAccessControl)
+      {
+         return InetAddress.getByName(host);
+      }
+      
+      try
+      {
+         return (InetAddress)AccessController.doPrivileged( new PrivilegedExceptionAction()
+         {
+            public Object run() throws IOException
+            {
+               return InetAddress.getByName(host);
+            }
+         });
+      }
+      catch (PrivilegedActionException e)
+      {
+         throw (UnknownHostException) e.getCause();
+      }
+   }
+}
\ No newline at end of file

Deleted: remoting2/branches/2.x/src/main/org/jboss/remoting/util/SystemUtility.java
===================================================================
--- remoting2/branches/2.x/src/main/org/jboss/remoting/util/SystemUtility.java	2008-04-12 01:45:57 UTC (rev 3968)
+++ remoting2/branches/2.x/src/main/org/jboss/remoting/util/SystemUtility.java	2008-04-12 01:46:27 UTC (rev 3969)
@@ -1,109 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.remoting.util;
-
-import java.io.File;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.security.PrivilegedActionException;
-import java.security.PrivilegedExceptionAction;
-
-/**
- * @author <a href="ron.sigal at jboss.com">Ron Sigal</a>
- * @version $Revision: 1.1 $
- * <p>
- * Copyright Mar 31, 2008
- * </p>
- */
-public class SystemUtility
-{
-   static public String getSystemProperty(final String name, final String defaultValue)
-   {
-      String value = null;
-      try
-      {
-         value = (String)AccessController.doPrivileged( new PrivilegedExceptionAction()
-         {
-            public Object run() throws Exception
-            {
-               return System.getProperty(name, defaultValue);
-            }
-         });
-      }
-      catch (PrivilegedActionException e)
-      {
-         throw (RuntimeException) e.getCause();
-      }
-      
-      return value;
-   }
-   
-   static public String getSystemProperty(final String name)
-   {
-      String value = null;
-      try
-      {
-         value = (String)AccessController.doPrivileged( new PrivilegedExceptionAction()
-         {
-            public Object run() throws Exception
-            {
-               return System.getProperty(name);
-            }
-         });
-      }
-      catch (PrivilegedActionException e)
-      {
-         throw (RuntimeException) e.getCause();
-      }
-      
-      return value;
-   }
-   
-   static public void setSystemProperty(final String name, final String value)
-   {
-      try
-      {
-         AccessController.doPrivileged( new PrivilegedExceptionAction()
-         {
-            public Object run() throws Exception
-            {
-               return System.setProperty(name, value);
-            }
-         });
-      }
-      catch (PrivilegedActionException e)
-      {
-         throw (RuntimeException) e.getCause();
-      }
-   }
-   
-   static public boolean mkdirs(final File dir)
-   {
-      return ((Boolean) AccessController.doPrivileged( new PrivilegedAction()
-      {
-         public Object run()
-         {
-            return new Boolean(dir.mkdirs());
-         }
-      })).booleanValue();
-   }
-}
\ No newline at end of file




More information about the jboss-remoting-commits mailing list