JBoss Remoting SVN: r4158 - remoting2/branches/2.x/src/main/org/jboss/remoting/transport/sslbisocket.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2008-05-09 19:53:00 -0400 (Fri, 09 May 2008)
New Revision: 4158
Modified:
remoting2/branches/2.x/src/main/org/jboss/remoting/transport/sslbisocket/SSLBisocketClientInvoker.java
Log:
JBREM-976: Reduced logging noise.
Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/transport/sslbisocket/SSLBisocketClientInvoker.java
===================================================================
--- remoting2/branches/2.x/src/main/org/jboss/remoting/transport/sslbisocket/SSLBisocketClientInvoker.java 2008-05-09 23:52:07 UTC (rev 4157)
+++ remoting2/branches/2.x/src/main/org/jboss/remoting/transport/sslbisocket/SSLBisocketClientInvoker.java 2008-05-09 23:53:00 UTC (rev 4158)
@@ -144,7 +144,8 @@
}
catch (Exception e)
{
- log.error("Error creating SSL Socket Factory for client invoker.", e);
+ log.error("Error creating SSL Socket Factory for client invoker: " + e.getMessage());
+ log.debug("Error creating SSL Socket Factory for client invoker.", e);
}
if (wrapper != null)
16 years
JBoss Remoting SVN: r4157 - remoting2/branches/2.x/src/main/org/jboss/remoting/transport/http/ssl.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2008-05-09 19:52:07 -0400 (Fri, 09 May 2008)
New Revision: 4157
Modified:
remoting2/branches/2.x/src/main/org/jboss/remoting/transport/http/ssl/HTTPSClientInvoker.java
Log:
JBREM-976: Reduced logging noise.
Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/transport/http/ssl/HTTPSClientInvoker.java
===================================================================
--- remoting2/branches/2.x/src/main/org/jboss/remoting/transport/http/ssl/HTTPSClientInvoker.java 2008-05-09 23:39:25 UTC (rev 4156)
+++ remoting2/branches/2.x/src/main/org/jboss/remoting/transport/http/ssl/HTTPSClientInvoker.java 2008-05-09 23:52:07 UTC (rev 4157)
@@ -143,7 +143,8 @@
}
catch (Exception e)
{
- log.error("Error creating SSL Socket Factory for client invoker.", e);
+ log.error("Error creating SSL Socket Factory for client invoker: " + e.getMessage());
+ log.debug("Error creating SSL Socket Factory for client invoker.", e);
}
if (wrapper != null)
16 years
JBoss Remoting SVN: r4156 - remoting2/branches/2.x/src/etc.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2008-05-09 19:39:25 -0400 (Fri, 09 May 2008)
New Revision: 4156
Modified:
remoting2/branches/2.x/src/etc/remoting.security.policy.tests
Log:
JBREM-920: Added permissions for org.jboss.test.remoting.classloader.InvokerTestCase.
Modified: remoting2/branches/2.x/src/etc/remoting.security.policy.tests
===================================================================
--- remoting2/branches/2.x/src/etc/remoting.security.policy.tests 2008-05-09 23:34:40 UTC (rev 4155)
+++ remoting2/branches/2.x/src/etc/remoting.security.policy.tests 2008-05-09 23:39:25 UTC (rev 4156)
@@ -147,6 +147,11 @@
permission javax.management.MBeanServerPermission "createMBeanServer, findMBeanServer";
+ // org.jboss.test.remoting.classloader.InvokerTestCase
+ permission java.io.FilePermission "${build.home}${/}lib${/}-", "read";
+ permission java.io.FilePermission "${build.home}${/}output${/}lib${/}jboss-remoting.jar", "read";
+ permission java.lang.RuntimePermission "accessDeclaredMembers";
+
// org.jboss.test.remoting.transport.connector.ObjectNameWithZeroesAddressTestCase
permission javax.management.MBeanPermission "*#-[*:*]", "queryMBeans";
16 years
JBoss Remoting SVN: r4155 - remoting2/branches/2.x/src/main/org/jboss/remoting/serialization.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2008-05-09 19:34:40 -0400 (Fri, 09 May 2008)
New Revision: 4155
Modified:
remoting2/branches/2.x/src/main/org/jboss/remoting/serialization/ClassLoaderUtility.java
Log:
JBREM-978: Backed out logging statements.
Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/serialization/ClassLoaderUtility.java
===================================================================
--- remoting2/branches/2.x/src/main/org/jboss/remoting/serialization/ClassLoaderUtility.java 2008-05-09 07:54:39 UTC (rev 4154)
+++ remoting2/branches/2.x/src/main/org/jboss/remoting/serialization/ClassLoaderUtility.java 2008-05-09 23:34:40 UTC (rev 4155)
@@ -24,15 +24,12 @@
import java.security.AccessController;
import java.security.PrivilegedAction;
-import org.apache.log4j.Logger;
-
/**
* @author <a href="mailto:clebert.suconic@jboss.com">Clebert Suconic</a>
*/
public class ClassLoaderUtility
{
- static Logger log = Logger.getLogger(ClassLoaderUtility.class);
-
+
/**
* Tries to load the class from the current thread's context class loader. If
* not successful, tries to load the class from the current instance.
@@ -62,7 +59,6 @@
}
catch (Throwable t)
{
- log.debug("Context classloader can't find class: " + classname, t);
}
if (clazz != null)
@@ -83,7 +79,6 @@
}
catch (Throwable t)
{
- log.debug("clazz classloader can't find class: " + classname, t);
}
}
@@ -103,7 +98,6 @@
}
catch (Throwable t)
{
- log.debug("system classloader can't find class: " + classname, t);
}
throw new ClassNotFoundException(classname);
@@ -141,7 +135,6 @@
}
catch (Throwable t)
{
- log.debug("clazz classloader can't find class: " + classname, t);
}
}
@@ -161,7 +154,6 @@
}
catch (Throwable t)
{
- log.debug("context classloader can't find class: " + classname, t);
}
@@ -181,7 +173,6 @@
}
catch (Throwable t)
{
- log.debug("system classloader can't find class: " + classname, t);
}
throw new ClassNotFoundException(classname);
16 years
JBoss Remoting SVN: r4154 - remoting2/branches/2.x/src/main/org/jboss/remoting/util.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2008-05-09 03:54:39 -0400 (Fri, 09 May 2008)
New Revision: 4154
Modified:
remoting2/branches/2.x/src/main/org/jboss/remoting/util/SecurityUtility.java
Log:
JBREM-977: Added two variations on createServerSocket().
Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/util/SecurityUtility.java
===================================================================
--- remoting2/branches/2.x/src/main/org/jboss/remoting/util/SecurityUtility.java 2008-05-09 07:52:49 UTC (rev 4153)
+++ remoting2/branches/2.x/src/main/org/jboss/remoting/util/SecurityUtility.java 2008-05-09 07:54:39 UTC (rev 4154)
@@ -854,6 +854,30 @@
}
+ static public ServerSocket createServerSocket(final ServerSocketFactoryMBean ssf) throws IOException
+ {
+ if (skipAccessControl)
+ {
+ return ssf.createServerSocket();
+ }
+
+ try
+ {
+ return (ServerSocket)AccessController.doPrivileged( new PrivilegedExceptionAction()
+ {
+ public Object run() throws IOException
+ {
+ return ssf.createServerSocket();
+ }
+ });
+ }
+ catch (PrivilegedActionException e)
+ {
+ throw (IOException) e.getCause();
+ }
+ }
+
+
static public ServerSocket createServerSocket(final ServerSocketFactoryMBean ssf,
final int port) throws IOException
{
@@ -931,7 +955,31 @@
}
}
+
+ static public ServerSocket createServerSocket(final ServerSocketFactory ssf) throws IOException
+ {
+ if (skipAccessControl)
+ {
+ return ssf.createServerSocket();
+ }
+ try
+ {
+ return (ServerSocket)AccessController.doPrivileged( new PrivilegedExceptionAction()
+ {
+ public Object run() throws IOException
+ {
+ return ssf.createServerSocket();
+ }
+ });
+ }
+ catch (PrivilegedActionException e)
+ {
+ throw (IOException) e.getCause();
+ }
+ }
+
+
static public ServerSocket createServerSocket(final ServerSocketFactory ssf,
final int port) throws IOException
{
@@ -1008,8 +1056,8 @@
throw (IOException) e.getCause();
}
}
-
+
static public ServerSocket createServerSocket(final int port) throws IOException
{
if (skipAccessControl)
@@ -1021,7 +1069,7 @@
{
return (ServerSocket)AccessController.doPrivileged( new PrivilegedExceptionAction()
{
- public Object run() throws Exception
+ public Object run() throws IOException
{
return new ServerSocket(port);
}
@@ -1046,7 +1094,7 @@
{
return (ServerSocket)AccessController.doPrivileged( new PrivilegedExceptionAction()
{
- public Object run() throws Exception
+ public Object run() throws IOException
{
return new ServerSocket(port, backlog);
}
@@ -1072,7 +1120,7 @@
{
return (ServerSocket)AccessController.doPrivileged( new PrivilegedExceptionAction()
{
- public Object run() throws Exception
+ public Object run() throws IOException
{
return new ServerSocket(port, backlog, inetAddress);
}
@@ -1096,7 +1144,7 @@
{
return (Socket)AccessController.doPrivileged( new PrivilegedExceptionAction()
{
- public Object run() throws Exception
+ public Object run() throws IOException
{
return new Socket(host, port);
}
@@ -1121,7 +1169,7 @@
{
return (Socket)AccessController.doPrivileged( new PrivilegedExceptionAction()
{
- public Object run() throws Exception
+ public Object run() throws IOException
{
return sf.createSocket(host, port);
}
16 years
JBoss Remoting SVN: r4153 - 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-05-09 03:52:49 -0400 (Fri, 09 May 2008)
New Revision: 4153
Modified:
remoting2/branches/2.x/src/main/org/jboss/remoting/transport/rmi/RMIServerInvoker.java
Log:
JBREM-978: Removed extraneous call to oos.writeObject().
Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/transport/rmi/RMIServerInvoker.java
===================================================================
--- remoting2/branches/2.x/src/main/org/jboss/remoting/transport/rmi/RMIServerInvoker.java 2008-05-09 07:51:52 UTC (rev 4152)
+++ remoting2/branches/2.x/src/main/org/jboss/remoting/transport/rmi/RMIServerInvoker.java 2008-05-09 07:52:49 UTC (rev 4153)
@@ -369,7 +369,6 @@
ByteArrayOutputStream baos = new ByteArrayOutputStream();
SerializationManager manager = SerializationStreamFactory.getManagerInstance(getSerializationType());
ObjectOutputStream oos = manager.createOutput(baos);
- oos.writeObject(payload);
SecurityUtility.writeObject(oos, payload);
oos.flush();
oos.close();
16 years
JBoss Remoting SVN: r4152 - remoting2/branches/2.x/src/main/org/jboss/remoting/security.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2008-05-09 03:51:52 -0400 (Fri, 09 May 2008)
New Revision: 4152
Modified:
remoting2/branches/2.x/src/main/org/jboss/remoting/security/ServerSocketFactoryWrapper.java
Log:
JBREM-977: Makes in zero argument createServerSocket(), goes through SecurityUtility.
Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/security/ServerSocketFactoryWrapper.java
===================================================================
--- remoting2/branches/2.x/src/main/org/jboss/remoting/security/ServerSocketFactoryWrapper.java 2008-05-09 07:49:28 UTC (rev 4151)
+++ remoting2/branches/2.x/src/main/org/jboss/remoting/security/ServerSocketFactoryWrapper.java 2008-05-09 07:51:52 UTC (rev 4152)
@@ -58,7 +58,7 @@
public ServerSocket createServerSocket() throws IOException
{
- return serverSocketFactory.createServerSocket();
+ return SecurityUtility.createServerSocket(serverSocketFactory);
}
public ServerSocketFactoryMBean getDelegate()
16 years
JBoss Remoting SVN: r4151 - remoting2/branches/2.x/src/etc.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2008-05-09 03:49:28 -0400 (Fri, 09 May 2008)
New Revision: 4151
Modified:
remoting2/branches/2.x/src/etc/remoting.security.policy.tests.minimal
Log:
JBREM-920, JBREM-978: Added permissions for several tests.
Modified: remoting2/branches/2.x/src/etc/remoting.security.policy.tests.minimal
===================================================================
--- remoting2/branches/2.x/src/etc/remoting.security.policy.tests.minimal 2008-05-09 07:46:43 UTC (rev 4150)
+++ remoting2/branches/2.x/src/etc/remoting.security.policy.tests.minimal 2008-05-09 07:49:28 UTC (rev 4151)
@@ -31,11 +31,15 @@
// Permissions to read test keystores and truststores
permission java.io.FilePermission "${build.home}${/}output${/}tests${/}classes${/}org${/}jboss${/}test${/}remoting${/}transport${/}bisocket${/}ssl${/}.keystore", "read";
permission java.io.FilePermission "${build.home}${/}output${/}tests${/}classes${/}org${/}jboss${/}test${/}remoting${/}transport${/}bisocket${/}ssl${/}.truststore", "read";
+ permission java.io.FilePermission "${build.home}${/}output${/}tests${/}classes${/}org${/}jboss${/}test${/}remoting${/}transport${/}http${/}ssl${/}.keystore", "read";
+ permission java.io.FilePermission "${build.home}${/}output${/}tests${/}classes${/}org${/}jboss${/}test${/}remoting${/}transport${/}http${/}ssl${/}.truststore", "read";
permission java.io.FilePermission "${build.home}${/}output${/}tests${/}classes${/}org${/}jboss${/}test${/}remoting${/}transport${/}rmi${/}ssl${/}.keystore", "read";
permission java.io.FilePermission "${build.home}${/}output${/}tests${/}classes${/}org${/}jboss${/}test${/}remoting${/}transport${/}rmi${/}ssl${/}.truststore", "read";
permission java.io.FilePermission "${build.home}${/}output${/}tests${/}classes${/}org${/}jboss${/}test${/}remoting${/}transport${/}socket${/}ssl${/}.keystore", "read";
permission java.io.FilePermission "${build.home}${/}output${/}tests${/}classes${/}org${/}jboss${/}test${/}remoting${/}transport${/}socket${/}ssl${/}.truststore", "read";
-
+
+ // org.jboss.test.remoting.transport.http.ssl.custom.HTTPSInvokerTestCase
+ permission javax.management.MBeanPermission "org.jboss.remoting.security.SSLServerSocketFactoryService#createServerSocket[test:type=serversocketfactory]", "invoke";
};
//****************************************************************************************************************************************************************
@@ -56,7 +60,14 @@
permission java.io.FilePermission "${build.home}${/}output${/}tests${/}classes${/}org${/}jboss${/}test${/}remoting${/}transport${/}socket${/}ssl${/}.truststore", "read";
permission javax.management.MBeanServerPermission "createMBeanServer";
+
+ // org.jboss.test.remoting.transport.http.ssl.custom.HTTPSInvokerTestCase
+ permission javax.management.MBeanPermission "org.jboss.remoting.security.SSLServerSocketFactoryService#-[test:type=serversocketfactory]", "registerMBean";
+ permission javax.management.MBeanPermission "org.jboss.remoting.transport.Connector#-[test:transport=coyote,type=connector]", "registerMBean";
+
+ permission java.util.PropertyPermission "org.apache.tomcat.util.buf.UDecoder.ALLOW_ENCODED_SLASH", "read";
permission java.util.PropertyPermission "jrunit.bind_addr", "read";
+
permission java.net.SocketPermission "*:*", "accept,resolve";
// org.jboss.test.remoting.transport.InvokerTestDriver
16 years
JBoss Remoting SVN: r4150 - remoting2/branches/2.x/src/etc.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2008-05-09 03:46:43 -0400 (Fri, 09 May 2008)
New Revision: 4150
Modified:
remoting2/branches/2.x/src/etc/remoting.security.policy.tests
Log:
JBREM-920, JBREM-978: Added MBeanPermissions for several tests.
Modified: remoting2/branches/2.x/src/etc/remoting.security.policy.tests
===================================================================
--- remoting2/branches/2.x/src/etc/remoting.security.policy.tests 2008-05-08 19:51:01 UTC (rev 4149)
+++ remoting2/branches/2.x/src/etc/remoting.security.policy.tests 2008-05-09 07:46:43 UTC (rev 4150)
@@ -57,8 +57,31 @@
// org.jboss.test.remoting.security.ServerSocketFactoryProxyTestCase
permission javax.management.MBeanPermission "org.jboss.test.remoting.security.TestServerSocketFactory#createServerSocket[test:type=SSLServerSocketFactoryService]", "invoke";
+ // org.jboss.test.remoting.transport.bisocket.ssl.builder.SSLBisocketInvokerTestCase
+ // org.jboss.test.remoting.transport.http.ssl.basic.HTTPSInvokerTestCase
+ // org.jboss.test.remoting.transport.http.ssl.builder.HTTPSInvokerTestCase
+ // org.jboss.test.remoting.transport.http.ssl.custom.HTTPSInvokerTestCase
+ // org.jboss.test.remoting.transport.rmi.ssl.builder.RMIInvokerTestCase
+ permission javax.management.MBeanPermission "org.jboss.remoting.security.SSLServerSocketFactoryService#createServerSocket[test:type=serversocketfactory]", "invoke";
+
+ // org.jboss.test.remoting.transport.{bisocket,socket}.ssl.config.FactoryConfigTestCase
+ permission javax.management.MBeanPermission "org.jboss.remoting.security.SSLServerSocketFactoryService#createServerSocket[jboss:type=serversocketfactory]", "invoke";
+
+ // org.jboss.test.remoting.transport.http.connection.socketfactory.by_mbean.SocketFactoryByMBeanTestCase
+ permission javax.management.MBeanPermission "org.jboss.test.remoting.transport.http.connection.socketfactory.by_mbean.SocketFactoryTestServer$ServerSocketFactoryMock#createServerSocket[jboss:type=serversocketfactory]", "invoke";
+
+ // org.jboss.test.remoting.transport.http.ssl.config.FactoryConfigTestCase
+ permission javax.management.MBeanPermission "org.jboss.remoting.security.SSLServerSocketFactoryService#createServerSocket[jboss:type=serversocketfactory2]", "invoke";
+
+ // org.jboss.test.remoting.transport.rmi.connection.socketfactory.by_mbean.SocketFactoryByMBeanTestCase
+ permission javax.management.MBeanPermission "org.jboss.test.remoting.transport.rmi.connection.socketfactory.by_mbean.SocketFactoryTestServer$ServerSocketFactoryMock#createServerSocket[jboss:type=serversocketfactory]", "invoke";
+
+ // org.jboss.test.remoting.transport.rmi.ssl.config.FactoryConfigTestCase
+ permission javax.management.MBeanPermission "org.jboss.test.remoting.transport.rmi.ssl.config.FactoryConfigTestCase$SerializableServerSocketFactory#createServerSocket[jboss:type=serversocketfactory]", "invoke";
+ permission javax.management.MBeanPermission "org.jboss.test.remoting.transport.rmi.ssl.config.FactoryConfigTestCase$SerializableServerSocketFactory#createServerSocket[jboss:type=serversocketfactory2]", "invoke";
+
// Subclasses of org.jboss.test.remoting.transport.config.FactoryConfigTestCaseParent and FactoryConfigTestCaseSSLParent
- // org.jboss.test.remoting.transport.{http,rmi,socket}.connection.socketfactory.by_mbean.SocketFactoryTestServer
+ // org.jboss.test.remoting.transport.{http,socket}.connection.socketfactory.by_mbean.SocketFactoryTestServer
permission javax.management.MBeanPermission "org.jboss.test.remoting.transport.socket.connection.socketfactory.by_mbean.SocketFactoryTestServer$ServerSocketFactoryMock#createServerSocket[jboss:type=serversocketfactory]", "invoke";
};
16 years
JBoss Remoting SVN: r4149 - remoting2/branches/2.x/src/tests/org/jboss/test/remoting/security.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2008-05-08 15:51:01 -0400 (Thu, 08 May 2008)
New Revision: 4149
Modified:
remoting2/branches/2.x/src/tests/org/jboss/test/remoting/security/TestCallbackStore.java
Log:
JBREM-977: Start with .8 of maxMemory in use.
Modified: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/security/TestCallbackStore.java
===================================================================
--- remoting2/branches/2.x/src/tests/org/jboss/test/remoting/security/TestCallbackStore.java 2008-05-08 09:08:41 UTC (rev 4148)
+++ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/security/TestCallbackStore.java 2008-05-08 19:51:01 UTC (rev 4149)
@@ -37,7 +37,7 @@
{
long max = Runtime.getRuntime().maxMemory();
log.info("max mem: " + max);
- int memSize = (int) (max * 0.9);
+ int memSize = (int) (max * 0.8);
memHolder = new byte[memSize];
log.info("memHolder.length: " + memHolder.length);
}
16 years