JBoss Remoting SVN: r3705 - remoting2/branches/2.x/src/main/org/jboss/remoting/transport/rmi.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2008-03-20 21:37:02 -0400 (Thu, 20 Mar 2008)
New Revision: 3705
Modified:
remoting2/branches/2.x/src/main/org/jboss/remoting/transport/rmi/RemotingRMIClientSocketFactory.java
Log:
JBREM-934: Put Socket creation in AccessController.doPrivileged() call.
Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/transport/rmi/RemotingRMIClientSocketFactory.java
===================================================================
--- remoting2/branches/2.x/src/main/org/jboss/remoting/transport/rmi/RemotingRMIClientSocketFactory.java 2008-03-21 01:36:12 UTC (rev 3704)
+++ remoting2/branches/2.x/src/main/org/jboss/remoting/transport/rmi/RemotingRMIClientSocketFactory.java 2008-03-21 01:37:02 UTC (rev 3705)
@@ -28,6 +28,9 @@
import java.net.Socket;
import java.net.UnknownHostException;
import java.rmi.server.RMIClientSocketFactory;
+import java.security.AccessController;
+import java.security.PrivilegedActionException;
+import java.security.PrivilegedExceptionAction;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
@@ -39,6 +42,7 @@
import org.jboss.remoting.InvokerLocator;
import org.jboss.remoting.Remoting;
import org.jboss.remoting.Version;
+import org.jboss.remoting.loading.ClassByteClassLoader;
/**
@@ -168,13 +172,13 @@
* @return new socket
* @throws IOException if there is a problem creating a socket
*/
- public Socket createSocket(String host, int port) throws IOException
+ public Socket createSocket(String host, final int port) throws IOException
{
// If invokerLocator isn't in configMaps, an RMICLientInvoker has not been created
// yet. This call was probably made by an RMI thread, and is premature. Best attempt
// is to return a vanilla socket.
- String effectiveHost = hostName != null ? hostName : host;
+ final String effectiveHost = hostName != null ? hostName : host;
if (log.isTraceEnabled())
log.trace("host: " + host + ", effective host: " + effectiveHost + ", port: " + port);
@@ -193,20 +197,52 @@
log.warn(Thread.currentThread().getName() + " unrecognized invoker locator: " + invokerLocator);
log.warn("unable to retrieve socket factory: returning plain socket");
}
- return new Socket(effectiveHost, port);
+
+ Socket socket = null;
+ try
+ {
+ socket = (Socket)AccessController.doPrivileged( new PrivilegedExceptionAction()
+ {
+ public Object run() throws Exception
+ {
+ return new Socket(effectiveHost, port);
+ }
+ });
+ }
+ catch (PrivilegedActionException e)
+ {
+ throw (IOException) e.getCause();
+ }
+ return socket;
}
+
socketFactory = retrieveSocketFactory(holder);
}
Socket socket = null;
- if(socketFactory != null)
+ try
{
- socket = socketFactory.createSocket(effectiveHost, port);
+ socket = (Socket)AccessController.doPrivileged( new PrivilegedExceptionAction()
+ {
+ public Object run() throws Exception
+ {
+ Socket s = null;
+ if(socketFactory != null)
+ {
+ s = socketFactory.createSocket(effectiveHost, port);
+ }
+ else
+ {
+ s = new Socket(effectiveHost, port);
+ }
+ return s;
+ }
+ });
}
- else
+ catch (PrivilegedActionException e)
{
- socket = new Socket(effectiveHost, port);
+ throw (IOException) e.getCause();
}
socket.setSoTimeout(timeout);
16 years, 3 months
JBoss Remoting SVN: r3704 - remoting2/branches/2.x/src/main/org/jboss/remoting/transport/coyote/ssl.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2008-03-20 21:36:12 -0400 (Thu, 20 Mar 2008)
New Revision: 3704
Modified:
remoting2/branches/2.x/src/main/org/jboss/remoting/transport/coyote/ssl/RemotingServerSocketFactory.java
Log:
JBREM-934: Put ServerSocket.accept() in AccessController.doPrivileged() call.
Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/transport/coyote/ssl/RemotingServerSocketFactory.java
===================================================================
--- remoting2/branches/2.x/src/main/org/jboss/remoting/transport/coyote/ssl/RemotingServerSocketFactory.java 2008-03-21 01:35:50 UTC (rev 3703)
+++ remoting2/branches/2.x/src/main/org/jboss/remoting/transport/coyote/ssl/RemotingServerSocketFactory.java 2008-03-21 01:36:12 UTC (rev 3704)
@@ -35,6 +35,9 @@
import java.net.InetAddress;
import java.net.ServerSocket;
import java.net.Socket;
+import java.security.AccessController;
+import java.security.PrivilegedActionException;
+import java.security.PrivilegedExceptionAction;
import java.util.HashMap;
import java.util.Map;
@@ -180,9 +183,25 @@
*
* @throws java.io.IOException;
*/
- public Socket acceptSocket(ServerSocket socket) throws IOException
+ public Socket acceptSocket(final ServerSocket serverSocket) throws IOException
{
- return socket.accept();
+ Socket socket = null;
+ try
+ {
+ socket = (Socket)AccessController.doPrivileged( new PrivilegedExceptionAction()
+ {
+ public Object run() throws Exception
+ {
+ return serverSocket.accept();
+ }
+ });
+ }
+ catch (PrivilegedActionException e)
+ {
+ throw (IOException) e.getCause();
+ }
+
+ return socket;
}
/**
16 years, 3 months
JBoss Remoting SVN: r3703 - remoting2/branches/2.x/src/main/org/jboss/remoting/transport/bisocket.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2008-03-20 21:35:50 -0400 (Thu, 20 Mar 2008)
New Revision: 3703
Modified:
remoting2/branches/2.x/src/main/org/jboss/remoting/transport/bisocket/BisocketServerInvoker.java
Log:
JBREM-934: Put ServerSocket creation, Socket creation, and ServerSocket.accept() in AccessController.doPrivileged() calls.
Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/transport/bisocket/BisocketServerInvoker.java
===================================================================
--- remoting2/branches/2.x/src/main/org/jboss/remoting/transport/bisocket/BisocketServerInvoker.java 2008-03-21 01:33:28 UTC (rev 3702)
+++ remoting2/branches/2.x/src/main/org/jboss/remoting/transport/bisocket/BisocketServerInvoker.java 2008-03-21 01:35:50 UTC (rev 3703)
@@ -28,6 +28,9 @@
import java.net.InetAddress;
import java.net.ServerSocket;
import java.net.Socket;
+import java.security.AccessController;
+import java.security.PrivilegedActionException;
+import java.security.PrivilegedExceptionAction;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
@@ -202,7 +205,7 @@
while (it.hasNext())
{
ServerSocket ss = (ServerSocket) it.next();
- InetAddress host = ss.getInetAddress();
+ final InetAddress host = ss.getInetAddress();
int secondaryBindPort = -1;
if (secondaryBindPorts.size() > i)
{
@@ -219,13 +222,30 @@
}
ServerSocket secondaryServerSocket = null;
- if (serverSocketFactory != null)
+ final int finalBindPort = secondaryBindPort;
+
+ try
{
- secondaryServerSocket = serverSocketFactory.createServerSocket(secondaryBindPort, 0, host);
+ secondaryServerSocket = (ServerSocket) AccessController.doPrivileged( new PrivilegedExceptionAction()
+ {
+ public Object run() throws Exception
+ {
+ ServerSocket ss = null;
+ if (serverSocketFactory != null)
+ {
+ ss = serverSocketFactory.createServerSocket(finalBindPort, 0, host);
+ }
+ else
+ {
+ ss = new ServerSocket(finalBindPort, 0, host);
+ }
+ return ss;
+ }
+ });
}
- else
+ catch (PrivilegedActionException e)
{
- secondaryServerSocket = new ServerSocket(secondaryBindPort, 0, host);
+ throw (IOException) e.getCause();
}
ss = checkSecondaryServerSocketWrapper(secondaryServerSocket);
@@ -356,20 +376,31 @@
Socket socket = null;
IOException savedException = null;
+ final String finalHost = locator.getHost();
+ final int finalPort = locator.getPort();
for (int i = 0; i < socketCreationRetries; i++)
{
try
{
- if (socketFactory != null)
- socket = socketFactory.createSocket(host, port);
- else
- socket = new Socket(host, port);
+ socket = (Socket) AccessController.doPrivileged( new PrivilegedExceptionAction()
+ {
+ public Object run() throws Exception
+ {
+ Socket s = null;
+ if (socketFactory != null)
+ s = socketFactory.createSocket(finalHost, finalPort);
+ else
+ s = new Socket(finalHost, finalPort);
+ return s;
+ }
+ });
}
- catch (IOException e)
+ catch (PrivilegedActionException e)
{
- log.debug("Error creating a control socket", e);
- savedException = e;
+ IOException ioe = (IOException) e.getCause();
+ log.debug("Error creating a control socket", ioe);
+ savedException = ioe;
}
if (socket != null)
@@ -934,20 +965,31 @@
InvokerLocator locator = (InvokerLocator) listenerIdToInvokerLocatorMap.get(listenerId);
IOException savedException = null;
-
+ final String finalHost = locator.getHost();
+ final int finalPort = locator.getPort();
+
for (int i = 0; i < socketCreationRetries; i++)
{
try
{
- if (socketFactory != null)
- socket = socketFactory.createSocket(locator.getHost(), locator.getPort());
- else
- socket = new Socket(locator.getHost(), locator.getPort());
+ socket = (Socket) AccessController.doPrivileged( new PrivilegedExceptionAction()
+ {
+ public Object run() throws Exception
+ {
+ Socket s = null;
+ if (socketFactory != null)
+ s = socketFactory.createSocket(finalHost, finalPort);
+ else
+ s = new Socket(finalHost, finalPort);
+ return s;
+ }
+ });
}
- catch (IOException e)
+ catch (PrivilegedActionException e)
{
- log.debug("Error creating a socket", e);
- savedException = e;
+ IOException ioe = (IOException) e.getCause();
+ log.debug("Error creating a socket", ioe);
+ savedException = ioe;
}
if (socket != null)
@@ -1073,7 +1115,22 @@
{
try
{
- Socket socket = secondaryServerSocket.accept();
+ Socket socket = null;
+ try
+ {
+ socket = (Socket)AccessController.doPrivileged( new PrivilegedExceptionAction()
+ {
+ public Object run() throws Exception
+ {
+ return secondaryServerSocket.accept();
+ }
+ });
+ }
+ catch (PrivilegedActionException e)
+ {
+ throw (IOException) e.getCause();
+ }
+
if (log.isTraceEnabled()) log.trace("accepted: " + socket);
DataInputStream dis = new DataInputStream(socket.getInputStream());
int action = dis.read();
16 years, 3 months
JBoss Remoting SVN: r3702 - remoting2/branches/2.x/src/main/org/jboss/remoting/transport.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2008-03-20 21:33:28 -0400 (Thu, 20 Mar 2008)
New Revision: 3702
Modified:
remoting2/branches/2.x/src/main/org/jboss/remoting/transport/PortUtil.java
Log:
JBREM-934: Put ServerSocket creation in AccessController.doPrivileged() call.
Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/transport/PortUtil.java
===================================================================
--- remoting2/branches/2.x/src/main/org/jboss/remoting/transport/PortUtil.java 2008-03-21 01:32:54 UTC (rev 3701)
+++ remoting2/branches/2.x/src/main/org/jboss/remoting/transport/PortUtil.java 2008-03-21 01:33:28 UTC (rev 3702)
@@ -24,7 +24,12 @@
import java.net.ServerSocket;
import java.net.InetAddress;
+import java.net.Socket;
+import java.net.UnknownHostException;
import java.io.IOException;
+import java.security.AccessController;
+import java.security.PrivilegedActionException;
+import java.security.PrivilegedExceptionAction;
import java.security.SecureRandom;
import org.jboss.logging.Logger;
@@ -55,20 +60,31 @@
* @param p
* @return true if available, false if already in use
*/
- public static boolean checkPort(int p, String host)
+ public static boolean checkPort(final int p, String host)
{
boolean available = true;
ServerSocket socket = null;
try
{
- InetAddress inetAddress = InetAddress.getByName(host);
- socket = new ServerSocket(p, 0, inetAddress);
+ final InetAddress inetAddress = InetAddress.getByName(host);
+
+ socket = (ServerSocket) AccessController.doPrivileged( new PrivilegedExceptionAction()
+ {
+ public Object run() throws Exception
+ {
+ return new ServerSocket(p, 0, inetAddress);
+ }
+ });
}
- catch(IOException e)
+ catch (PrivilegedActionException e)
{
- log.debug("port " + p + " already in use. Will try another.", e);
+ log.debug("port " + p + " already in use. Will try another.", e.getCause());
available = false;
}
+ catch (UnknownHostException e)
+ {
+ log.warn("unknown host: " + host);
+ }
finally
{
if(socket != null)
@@ -83,8 +99,8 @@
}
}
}
+
return available;
-
}
/**
16 years, 3 months
JBoss Remoting SVN: r3701 - remoting2/branches/2.x/src/main/org/jboss/remoting/transport.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2008-03-20 21:32:54 -0400 (Thu, 20 Mar 2008)
New Revision: 3701
Modified:
remoting2/branches/2.x/src/main/org/jboss/remoting/transport/AddressUtil.java
Log:
JBREM-934: Put ServerSocket.accept() in AccessController.doPrivileged() call.
Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/transport/AddressUtil.java
===================================================================
--- remoting2/branches/2.x/src/main/org/jboss/remoting/transport/AddressUtil.java 2008-03-21 01:32:33 UTC (rev 3700)
+++ remoting2/branches/2.x/src/main/org/jboss/remoting/transport/AddressUtil.java 2008-03-21 01:32:54 UTC (rev 3701)
@@ -26,6 +26,9 @@
import java.net.InetAddress;
import java.net.ServerSocket;
import java.net.Socket;
+import java.security.AccessController;
+import java.security.PrivilegedActionException;
+import java.security.PrivilegedExceptionAction;
import org.jboss.logging.Logger;
@@ -86,13 +89,20 @@
{
try
{
- ServerSocket ss = new ServerSocket(port, 0, addr);
- Socket s = ss.accept();
- s.close();
- ss.close();
- log.trace("ServerTestThread ok: " + addr + ":" + port);
+ AccessController.doPrivileged( new PrivilegedExceptionAction()
+ {
+ public Object run() throws Exception
+ {
+ ServerSocket ss = new ServerSocket(port, 0, addr);
+ Socket s = ss.accept();
+ s.close();
+ ss.close();
+ log.trace("ServerTestThread ok: " + addr + ":" + port);
+ return null;
+ }
+ });
}
- catch (IOException e)
+ catch (PrivilegedActionException e)
{
log.trace("error in ServerTestThread", e);
}
16 years, 3 months
JBoss Remoting SVN: r3700 - remoting2/branches/2.x/src/main/org/jboss/remoting/socketfactory.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2008-03-20 21:32:33 -0400 (Thu, 20 Mar 2008)
New Revision: 3700
Modified:
remoting2/branches/2.x/src/main/org/jboss/remoting/socketfactory/CreationListenerServerSocket.java
Log:
JBREM-934: Put ServerSocket.accept() in AccessController.doPrivileged() call.
Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/socketfactory/CreationListenerServerSocket.java
===================================================================
--- remoting2/branches/2.x/src/main/org/jboss/remoting/socketfactory/CreationListenerServerSocket.java 2008-03-21 01:31:59 UTC (rev 3699)
+++ remoting2/branches/2.x/src/main/org/jboss/remoting/socketfactory/CreationListenerServerSocket.java 2008-03-21 01:32:33 UTC (rev 3700)
@@ -28,6 +28,9 @@
import java.net.SocketAddress;
import java.net.SocketException;
import java.nio.channels.ServerSocketChannel;
+import java.security.AccessController;
+import java.security.PrivilegedActionException;
+import java.security.PrivilegedExceptionAction;
/**
* A CreationListenerServerSocket wraps a ServerSocket to which it delegates
@@ -91,8 +94,23 @@
public Socket accept() throws IOException
- {
- Socket socket = serverSocket.accept();
+ {
+ Socket socket = null;
+ try
+ {
+ socket = (Socket)AccessController.doPrivileged( new PrivilegedExceptionAction()
+ {
+ public Object run() throws Exception
+ {
+ return serverSocket.accept();
+ }
+ });
+ }
+ catch (PrivilegedActionException e)
+ {
+ throw (IOException) e.getCause();
+ }
+
listener.socketCreated(socket, serverSocket);
return socket;
}
16 years, 3 months
JBoss Remoting SVN: r3699 - remoting2/branches/2.x/src/main/org/jboss/remoting.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2008-03-20 21:31:59 -0400 (Thu, 20 Mar 2008)
New Revision: 3699
Modified:
remoting2/branches/2.x/src/main/org/jboss/remoting/Version.java
Log:
JBREM-934: Put System.getProperty() and System.getProperty() in AccessController.doPrivileged() call.
Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/Version.java
===================================================================
--- remoting2/branches/2.x/src/main/org/jboss/remoting/Version.java 2008-03-21 01:31:14 UTC (rev 3698)
+++ remoting2/branches/2.x/src/main/org/jboss/remoting/Version.java 2008-03-21 01:31:59 UTC (rev 3699)
@@ -22,6 +22,13 @@
package org.jboss.remoting;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+import java.security.PrivilegedActionException;
+import java.security.PrivilegedExceptionAction;
+
+import org.jboss.remoting.loading.ClassByteClassLoader;
+
/**
* @author <a href="mailto:tom.elrod@jboss.com">Tom Elrod</a>
*/
@@ -48,7 +55,15 @@
static
{
boolean precompatibleFlag = false;
- String precompatible = System.getProperty(PRE_2_0_COMPATIBLE);
+ String precompatible = (String)AccessController.doPrivileged( new PrivilegedAction()
+ {
+ public Object run()
+ {
+ return System.getProperty(PRE_2_0_COMPATIBLE);
+ }
+ });
+
+
if(precompatible != null && precompatible.length() > 0)
{
precompatibleFlag = Boolean.valueOf(precompatible).booleanValue();
@@ -61,7 +76,15 @@
}
else
{
- String userDefinedVersion = System.getProperty(REMOTING_VERSION_TO_USE);
+ String userDefinedVersion = (String) AccessController.doPrivileged( new PrivilegedAction()
+ {
+ public Object run()
+ {
+ return System.getProperty(REMOTING_VERSION_TO_USE);
+ }
+ });
+
+
if(userDefinedVersion != null && userDefinedVersion.length() > 0)
{
byte userByteVersion = new Byte(userDefinedVersion).byteValue();
@@ -81,7 +104,14 @@
}
else
{
- System.setProperty(REMOTING_VERSION_TO_USE, new Byte(defaultByteVersion).toString());
+ AccessController.doPrivileged( new PrivilegedAction()
+ {
+ public Object run()
+ {
+ System.setProperty(REMOTING_VERSION_TO_USE, new Byte(defaultByteVersion).toString());
+ return null;
+ }
+ });
}
}
}
16 years, 3 months
JBoss Remoting SVN: r3698 - remoting2/branches/2.x/src/main/org/jboss/remoting.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2008-03-20 21:31:14 -0400 (Thu, 20 Mar 2008)
New Revision: 3698
Modified:
remoting2/branches/2.x/src/main/org/jboss/remoting/MicroRemoteClientInvoker.java
Log:
JBREM-934: Put classloader creation in AccessController.doPrivileged() call.
Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/MicroRemoteClientInvoker.java
===================================================================
--- remoting2/branches/2.x/src/main/org/jboss/remoting/MicroRemoteClientInvoker.java 2008-03-21 01:30:05 UTC (rev 3697)
+++ remoting2/branches/2.x/src/main/org/jboss/remoting/MicroRemoteClientInvoker.java 2008-03-21 01:31:14 UTC (rev 3698)
@@ -12,6 +12,10 @@
import org.jboss.util.id.GUID;
import java.io.IOException;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+import java.security.PrivilegedActionException;
+import java.security.PrivilegedExceptionAction;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
@@ -116,7 +120,7 @@
// class loader. This allows to load remoting classes as well as user's
// classes. If possible, will simply reset context classloader on existing
// RemotingClassLoader.
- ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
+ final ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
if (unmarshaller instanceof UpdateableClassloaderUnMarshaller)
{
UpdateableClassloaderUnMarshaller uclum = (UpdateableClassloaderUnMarshaller) unmarshaller;
@@ -128,13 +132,26 @@
}
else
{
- rcl = new RemotingClassLoader(getClassLoader(), contextClassLoader);
+ rcl = (RemotingClassLoader)AccessController.doPrivileged( new PrivilegedAction()
+ {
+ public Object run()
+ {
+ return new RemotingClassLoader(getClassLoader(), contextClassLoader);
+ }
+ });
+
unmarshaller.setClassLoader(rcl);
}
}
else
{
- rcl = new RemotingClassLoader(getClassLoader(), contextClassLoader);
+ rcl = (RemotingClassLoader)AccessController.doPrivileged( new PrivilegedAction()
+ {
+ public Object run()
+ {
+ return new RemotingClassLoader(getClassLoader(), contextClassLoader);
+ }
+ });
unmarshaller.setClassLoader(rcl);
}
}
16 years, 3 months
JBoss Remoting SVN: r3697 - remoting2/branches/2.x/src/main/org/jboss/remoting.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2008-03-20 21:30:05 -0400 (Thu, 20 Mar 2008)
New Revision: 3697
Modified:
remoting2/branches/2.x/src/main/org/jboss/remoting/InvokerLocator.java
Log:
JBREM-934: Put System.getProperty() in AccessController.doPrivileged() call.
Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/InvokerLocator.java
===================================================================
--- remoting2/branches/2.x/src/main/org/jboss/remoting/InvokerLocator.java 2008-03-21 01:23:14 UTC (rev 3696)
+++ remoting2/branches/2.x/src/main/org/jboss/remoting/InvokerLocator.java 2008-03-21 01:30:05 UTC (rev 3697)
@@ -28,6 +28,8 @@
import java.net.URI;
import java.net.URISyntaxException;
import java.net.UnknownHostException;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
@@ -306,10 +308,21 @@
{
boolean doLegacyParsing = false;
if (legacyParsingFlag != null)
+ {
doLegacyParsing = legacyParsingFlag.booleanValue();
- else if (System.getProperty(LEGACY_PARSING) != null)
- doLegacyParsing = Boolean.getBoolean(LEGACY_PARSING);
-
+ }
+ else
+ {
+ String s = (String)AccessController.doPrivileged( new PrivilegedAction()
+ {
+ public Object run()
+ {
+ return System.getProperty(LEGACY_PARSING);
+ }
+ });
+ doLegacyParsing = "true".equalsIgnoreCase(s);
+ }
+
if (doLegacyParsing)
{
log.warn("using deprecated legacy URL parsing routine");
16 years, 3 months
JBoss Remoting SVN: r3696 - remoting2/branches/2.x.
by jboss-remoting-commits＠lists.jboss.org
Author: david.lloyd(a)jboss.com
Date: 2008-03-20 21:23:14 -0400 (Thu, 20 Mar 2008)
New Revision: 3696
Modified:
remoting2/branches/2.x/test.policy
Log:
JBREM-920 - More stuff for MBeans, and one oddball that should not be necessary...
Modified: remoting2/branches/2.x/test.policy
===================================================================
--- remoting2/branches/2.x/test.policy 2008-03-21 01:19:10 UTC (rev 3695)
+++ remoting2/branches/2.x/test.policy 2008-03-21 01:23:14 UTC (rev 3696)
@@ -17,11 +17,11 @@
permission javax.management.MBeanTrustPermission "register";
permission javax.management.MBeanPermission "javax.management.MBeanServerDelegate#MBeanServerId[JMImplementation:type=MBeanServerDelegate]", "getAttribute";
permission javax.management.MBeanPermission "-#-[-]", "queryMBeans";
- permission javax.management.MBeanPermission "org.jboss.remoting.transport.socket.SocketServerInvoker#-[jboss.remoting:host=127.0.0.1,*,service=invoker,transport=socket]", "registerMBean, queryMBeans, isInstanceOf";
- permission javax.management.MBeanPermission "org.jboss.remoting.transport.socket.SocketServerInvoker#-[jboss.remoting:host=localhost,*,service=invoker,transport=socket]", "registerMBean, queryMBeans, isInstanceOf";
- permission javax.management.MBeanPermission "org.jboss.remoting.transport.socket.SocketServerInvoker#-[jboss.remoting:host=\"[::1]\",*,service=invoker,transport=socket]", "registerMBean, queryMBeans, isInstanceOf";
- permission javax.management.MBeanPermission "org.jboss.remoting.transport.socket.SocketServerInvoker#-[jboss.remoting:host=\"[::ffff:127.0.0.1]\",*,service=invoker,transport=socket]", "registerMBean, queryMBeans, isInstanceOf";
- permission javax.management.MBeanPermission "org.jboss.remoting.transport.socket.SocketServerInvoker#-[jboss.remoting:host=\"[::]\",*,service=invoker,transport=socket]", "registerMBean, queryMBeans, isInstanceOf";
+ permission javax.management.MBeanPermission "org.jboss.remoting.transport.socket.SocketServerInvoker#-[jboss.remoting:host=127.0.0.1,*,service=invoker,transport=socket]", "unregisterMBean, registerMBean, queryMBeans, isInstanceOf";
+ permission javax.management.MBeanPermission "org.jboss.remoting.transport.socket.SocketServerInvoker#-[jboss.remoting:host=localhost,*,service=invoker,transport=socket]", "unregisterMBean, registerMBean, queryMBeans, isInstanceOf";
+ permission javax.management.MBeanPermission "org.jboss.remoting.transport.socket.SocketServerInvoker#-[jboss.remoting:host=\"[::1]\",*,service=invoker,transport=socket]", "unregisterMBean, registerMBean, queryMBeans, isInstanceOf";
+ permission javax.management.MBeanPermission "org.jboss.remoting.transport.socket.SocketServerInvoker#-[jboss.remoting:host=\"[::ffff:127.0.0.1]\",*,service=invoker,transport=socket]", "unregisterMBean, registerMBean, queryMBeans, isInstanceOf";
+ permission javax.management.MBeanPermission "org.jboss.remoting.transport.socket.SocketServerInvoker#-[jboss.remoting:host=\"[::]\",*,service=invoker,transport=socket]", "unregisterMBean, registerMBean, queryMBeans, isInstanceOf";
permission javax.management.MBeanPermission "org.jboss.remoting.transport.Connector#-[jboss.remoting:transport=socket,type=Connector]", "queryMBeans, isInstanceOf";
permission javax.management.MBeanPermission "org.jboss.remoting.transport.Connector#-[jboss.remoting:transport=sslsocket,type=Connector]", "queryMBeans, isInstanceOf";
permission javax.management.MBeanPermission "javax.management.MBeanServerDelegate#-[JMImplementation:type=MBeanServerDelegate]", "queryMBeans, isInstanceOf";
@@ -30,6 +30,9 @@
permission javax.management.MBeanPermission "org.jboss.remoting.network.NetworkRegistry#-[remoting:type=NetworkRegistry]", "queryMBeans, isInstanceOf";
permission javax.management.MBeanPermission "org.jboss.remoting.network.NetworkRegistry#Servers[remoting:type=NetworkRegistry]", "getAttribute";
+ // TODO: Figure out why these aren't covered by the AllPermission entries below
+ permission javax.management.MBeanPermission "org.jboss.test.remoting.detection.metadata.MetadataTestCase$TestNetworkRegistry#-[remoting:type=NetworkRegistry]", "unregisterMBean, registerMBean, queryMBeans, isInstanceOf";
+
// System properties accessed by Remoting
permission java.util.PropertyPermission "jboss.remoting.pre_2_0_compatible", "read";
permission java.util.PropertyPermission "jboss.remoting.version", "read, write";
16 years, 3 months