July 2012 - jboss-remoting-commits

JBoss Remoting SVN: r6458 - 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: 2012-07-19 17:35:09 -0400 (Thu, 19 Jul 2012) New Revision: 6458 Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/transport/http/ssl/HTTPSClientInvoker.java Log: JBREM-1306: Wrapped HttpsURLConnection.setSSLSocketFactory in a doPrivileged() call. 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 2012-07-19 02:44:29 UTC (rev 6457) +++ remoting2/branches/2.x/src/main/org/jboss/remoting/transport/http/ssl/HTTPSClientInvoker.java 2012-07-19 21:35:09 UTC (rev 6458) @@ -24,6 +24,7 @@ import org.jboss.remoting.Client; import org.jboss.remoting.InvokerLocator; +import org.jboss.remoting.InvokerRegistry; import org.jboss.remoting.serialization.ClassLoaderUtility; import org.jboss.remoting.security.CustomSSLSocketFactory; import org.jboss.remoting.security.SSLSocketBuilder; @@ -97,13 +98,22 @@ if (conn instanceof HttpsURLConnection) { - HttpsURLConnection sconn = (HttpsURLConnection) conn; + final HttpsURLConnection sconn = (HttpsURLConnection) conn; SocketFactory socketFactory = getSocketFactory(); if (socketFactory != null && socketFactory instanceof SSLSocketFactory) { - SSLSocketFactory sslSocketFactory = getHandshakeCompatibleFactory((SSLSocketFactory) socketFactory, metadata); - sconn.setSSLSocketFactory(sslSocketFactory); + final SSLSocketFactory sslSocketFactory = getHandshakeCompatibleFactory((SSLSocketFactory) socketFactory, metadata); + + AccessController.doPrivileged( new PrivilegedAction() + { + public Object run() + { + sconn.setSSLSocketFactory(sslSocketFactory); + return null; + } + }); + } setHostnameVerifier(sconn, metadata);

12 years, 4 months

1
0
0 / 0

JBoss Remoting SVN: r6457 - remoting2/branches/2.x/docs/guide/en.

by jboss-remoting-commits＠lists.jboss.org

Author: ron.sigal(a)jboss.com Date: 2012-07-18 22:44:29 -0400 (Wed, 18 Jul 2012) New Revision: 6457 Modified: remoting2/branches/2.x/docs/guide/en/chap5.xml Log: JBREM-1306: Minor syntactic corrections. Modified: remoting2/branches/2.x/docs/guide/en/chap5.xml =================================================================== --- remoting2/branches/2.x/docs/guide/en/chap5.xml 2012-07-19 02:40:54 UTC (rev 6456) +++ remoting2/branches/2.x/docs/guide/en/chap5.xml 2012-07-19 02:44:29 UTC (rev 6457) @@ -6833,9 +6833,10 @@ a void constructor.</para> <para><emphasis role="bold">USE_DEFAULT_SSL_SOCKET_FACTORY</emphasis> (actual value is - 'useDefaultSslSocketFactory') - if set to true, then HTTPSClientInvoker.createSocketFactory() - will call HttpsURLConnection.getDefaultSSLSocketFactory() instead of trying to build a SocketFactory. - </para> + 'useDefaultSslSocketFactory') - if set to true, then + <methodname>HTTPSClientInvoker.createSocketFactory()</methodname> + will call <methodname>HttpsURLConnection.getDefaultSSLSocketFactory()</methodname> instead of trying + to build a SocketFactory.</para> </section> <section>

12 years, 4 months

1
0
0 / 0

JBoss Remoting SVN: r6456 - remoting2/branches/2.x/docs/userguide/en.

by jboss-remoting-commits＠lists.jboss.org

Author: ron.sigal(a)jboss.com Date: 2012-07-18 22:40:54 -0400 (Wed, 18 Jul 2012) New Revision: 6456 Modified: remoting2/branches/2.x/docs/userguide/en/chap7.xml Log: JBREM-1306: Add discussion of new parameter "useDefaultSslSocketFactory". Modified: remoting2/branches/2.x/docs/userguide/en/chap7.xml =================================================================== --- remoting2/branches/2.x/docs/userguide/en/chap7.xml 2012-07-19 02:33:24 UTC (rev 6455) +++ remoting2/branches/2.x/docs/userguide/en/chap7.xml 2012-07-19 02:40:54 UTC (rev 6456) @@ -167,6 +167,11 @@ used by <classname>HTTPSClientInvoker</classname>. The value should be the fully qualified classname of a class that implements <classname>javax.net.ssl.HostnameVerifier</classname> and has a void constructor.</para> + + <para><emphasis role="bold">useDefaultSslSocketFactory</emphasis> - if set to true, then + <methodname>HTTPSClientInvoker.createSocketFactory()</methodname> will call + <methodname>HttpsURLConnection.getDefaultSSLSocketFactory()</methodname> instead of trying to + build a SocketFactory.</para> </section> <section>

12 years, 4 months

1
0
0 / 0

JBoss Remoting SVN: r6455 - remoting2/branches/2.2/docs/guide/en.

by jboss-remoting-commits＠lists.jboss.org

Author: ron.sigal(a)jboss.com Date: 2012-07-18 22:33:24 -0400 (Wed, 18 Jul 2012) New Revision: 6455 Modified: remoting2/branches/2.2/docs/guide/en/chap5.xml Log: JBREM-1306: Add discussion of new parameter "useDefaultSslSocketFactory". Modified: remoting2/branches/2.2/docs/guide/en/chap5.xml =================================================================== --- remoting2/branches/2.2/docs/guide/en/chap5.xml 2012-07-19 02:24:31 UTC (rev 6454) +++ remoting2/branches/2.2/docs/guide/en/chap5.xml 2012-07-19 02:33:24 UTC (rev 6455) @@ -2,7 +2,7 @@ <chapter id="chapter-configuration" xreflabel="Configuration"> <title>Configuration</title> - <para>This covers the configuration for JBoss Remoting discovery, + <para>This chapter covers the configuration for JBoss Remoting discovery, connectors, marshallers, and transports. All the configuration properties specified can be set either via calls to the object itself, including via JMX (so can be done via the JMX or Web console), or via a JBoss AS service @@ -1486,7 +1486,6 @@ Invoker uses an <classname>SSLServerSocket</classname> by default, created by an <classname>SSLServerSocketFactory</classname>. See section <xref linkend="section-socket-factories" /> for more information.</para> - </section> <section> <title>HTTP(S) Client Invoker - proxy and basic authentication</title> @@ -1609,7 +1608,23 @@ <classname>SocketFactory</classname> configuration. </para> - + </section> + + <section> + <title>HTTPS client socket factory configuration</title> + + <para>If a socket factory is not passed into the HTTPS client invoker, it will use + <classname>org.jboss.remoting.security.SSLSocketBuilder</classname> to create one. + However, it might be desirable to allow it to fall back to a default socket factory + passed into HttpsURLConnection. As of release 2.5.4.SP4, a configuration parameter is + available to allow that to happen. + </para> + + <para><emphasis role="bold">useDefaultSslSocketFactory</emphasis> - If the parameter is + set to "true", <methodname>HTTPSClientInvoker.createSocketFactory()</methodname> + will call <methodname>HttpsURLConnection.getDefaultSSLSocketFactory()</methodname> + instead of trying to build a socket factory.</para> + </section> </section> <section> @@ -6846,6 +6861,11 @@ used by the http client invoker. The value should be the fully qualified classname of class that implements javax.net.ssl.HostnameVerifier and has a void constructor.</para> + + <para><emphasis role="bold">USE_DEFAULT_SSL_SOCKET_FACTORY</emphasis> (actual value is + 'useDefaultSslSocketFactory') - if set to true, then HTTPSClientInvoker.createSocketFactory() + will call HttpsURLConnection.getDefaultSSLSocketFactory() instead of trying to build a SocketFactory. + </para> <para></para>

12 years, 4 months

1
0
0 / 0

JBoss Remoting SVN: r6454 - remoting2/branches/2.x/docs/guide/en.

by jboss-remoting-commits＠lists.jboss.org

Author: ron.sigal(a)jboss.com Date: 2012-07-18 22:24:31 -0400 (Wed, 18 Jul 2012) New Revision: 6454 Modified: remoting2/branches/2.x/docs/guide/en/chap5.xml Log: JBREM-1306: Add discussion of new parameter "useDefaultSslSocketFactory". Modified: remoting2/branches/2.x/docs/guide/en/chap5.xml =================================================================== --- remoting2/branches/2.x/docs/guide/en/chap5.xml 2012-07-18 22:34:18 UTC (rev 6453) +++ remoting2/branches/2.x/docs/guide/en/chap5.xml 2012-07-19 02:24:31 UTC (rev 6454) @@ -2,7 +2,7 @@ <chapter id="chapter-configuration" xreflabel="Configuration"> <title>Configuration</title> - <para>This covers the configuration for JBoss Remoting discovery, connectors, + <para>This chapter covers the configuration for JBoss Remoting discovery, connectors, marshallers, and transports. All the configuration properties specified can be set either via calls to the object itself, including via JMX (so can be done via the JMX or Web console), via a JBoss AS service xml file. Examples of @@ -1950,7 +1950,6 @@ Invoker uses an <classname>SSLServerSocket</classname> by default, created by an <classname>SSLServerSocketFactory</classname>. See section <xref linkend="section-socket-factories" /> for more information.</para> - </section> <section> <title>HTTP(S) Client Invoker - proxy and basic authentication</title> @@ -2071,9 +2070,25 @@ <classname>SocketFactory</classname> configuration. </para> - + </section> + + <section> + <title>HTTPS client socket factory configuration</title> + + <para>If a socket factory is not passed into the HTTPS client invoker, it will use + <classname>org.jboss.remoting.security.SSLSocketBuilder</classname> to create one. + However, it might be desirable to allow it to fall back to a default socket factory + passed into HttpsURLConnection. As of release 2.5.4.SP4, a configuration parameter is + available to allow that to happen. + </para> + + <para><emphasis role="bold">useDefaultSslSocketFactory</emphasis> - If the parameter is + set to "true", <methodname>HTTPSClientInvoker.createSocketFactory()</methodname> + will call <methodname>HttpsURLConnection.getDefaultSSLSocketFactory()</methodname> + instead of trying to build a socket factory.</para> + </section> </section> - + <section> <title>Servlet transport</title> @@ -6816,7 +6831,11 @@ used by the http client invoker. The value should be the fully qualified classname of class that implements javax.net.ssl.HostnameVerifier and has a void constructor.</para> - + + <para><emphasis role="bold">USE_DEFAULT_SSL_SOCKET_FACTORY</emphasis> (actual value is + 'useDefaultSslSocketFactory') - if set to true, then HTTPSClientInvoker.createSocketFactory() + will call HttpsURLConnection.getDefaultSSLSocketFactory() instead of trying to build a SocketFactory. + </para> </section> <section>

12 years, 4 months

1
0
0 / 0

JBoss Remoting SVN: r6453 - remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/socket/timeout.

by jboss-remoting-commits＠lists.jboss.org

Author: ron.sigal(a)jboss.com Date: 2012-07-18 18:34:18 -0400 (Wed, 18 Jul 2012) New Revision: 6453 Modified: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/socket/timeout/WriteTimeoutTestParent.java Log: JBREM-1120: Extended wait time in testServerWriteTimeout(). Modified: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/socket/timeout/WriteTimeoutTestParent.java =================================================================== --- remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/socket/timeout/WriteTimeoutTestParent.java 2012-07-18 22:33:13 UTC (rev 6452) +++ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/socket/timeout/WriteTimeoutTestParent.java 2012-07-18 22:34:18 UTC (rev 6453) @@ -203,7 +203,7 @@ } // Test server invoker state. - Thread.sleep(4000); + Thread.sleep(6000); SocketServerInvoker serverInvoker = (SocketServerInvoker) connector.getServerInvoker(); assertEquals(0, serverInvoker.getCurrentClientPoolSize()); assertEquals(1, serverInvoker.getCurrentThreadPoolSize()); @@ -302,7 +302,7 @@ if (isBisocket(getTransport())) { callbackTest = true; - setupServer(true, false, "1000", 5000, 1); + setupServer(true, false, "1000", 5000, 2); } else { @@ -766,11 +766,13 @@ this.os = os; this.timeout = timeout; this.initialWrites = initialWrites; + log.info(this + " outputStream: " + os); } public void close()throws IOException { closed = true; - super.close(); +// super.close(); + os.close(); log.info(this + " closed"); } public void write(int b) throws IOException

12 years, 4 months

1
0
0 / 0

JBoss Remoting SVN: r6452 - remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/socket/timeout.

by jboss-remoting-commits＠lists.jboss.org

Author: ron.sigal(a)jboss.com Date: 2012-07-18 18:33:13 -0400 (Wed, 18 Jul 2012) New Revision: 6452 Modified: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/socket/timeout/SemaphoreGrowthTestCase.java Log: JBREM-1305: Fixed it. Modified: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/socket/timeout/SemaphoreGrowthTestCase.java =================================================================== --- remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/socket/timeout/SemaphoreGrowthTestCase.java 2012-07-18 19:11:55 UTC (rev 6451) +++ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/socket/timeout/SemaphoreGrowthTestCase.java 2012-07-18 22:33:13 UTC (rev 6452) @@ -22,7 +22,6 @@ package org.jboss.test.remoting.transport.socket.timeout; import java.net.InetAddress; -import java.net.SocketTimeoutException; import java.util.HashMap; import java.util.Map; @@ -34,8 +33,8 @@ import org.apache.log4j.Level; import org.apache.log4j.Logger; import org.apache.log4j.PatternLayout; +import org.jboss.remoting.CannotConnectException; import org.jboss.remoting.Client; -import org.jboss.remoting.InvocationFailureException; import org.jboss.remoting.InvocationRequest; import org.jboss.remoting.InvokerLocator; import org.jboss.remoting.ServerInvocationHandler; @@ -68,8 +67,8 @@ protected InvokerLocator serverLocator; protected Connector connector; protected TestInvocationHandler invocationHandler; - protected CountDown latch = new CountDown(2); - + protected CountDown latch0 = new CountDown(1); + protected CountDown latch1 = new CountDown(2); public void setUp() throws Exception { @@ -107,41 +106,47 @@ client.connect(); log.info("client is connected"); - // Test connection. - assertEquals("abc", client.invoke("abc")); - log.info("connection is good"); - - // Make first call, attempt to increase semaphore count. + // Make first two calls, attempt to increase semaphore count. + CallThread ct0 = new CallThread(client, "20000", "longwait", latch0, 0); + ct0.start(); + Thread.sleep(500); try { - client.invoke("longwait"); - fail("First call unexpectedly succeeded"); + log.info("Making second invocation"); + HashMap metadata = new HashMap(); + metadata.put("timeout", "1000"); + client.invoke("unused", metadata); + fail("Second call unexpectedly succeeded"); } - catch (InvocationFailureException e) + catch (CannotConnectException e) { - if (e.getCause() instanceof SocketTimeoutException) + if (e.getCause() instanceof IllegalStateException && e.getMessage().indexOf("are in use") > -1) { - log.info("First call gets expected timeout"); + log.info("Second call gets expected timeout"); } else { - fail("First call got unexpected exception wrapped in CannotConnectException: " + e); + fail("Second call got unexpected exception wrapped in CannotConnectException: " + e); } } catch (Throwable t) { - fail("First call got unexpected exception: " + t); + fail("Second call got unexpected exception: " + t); } // Verify that semaphore count has not been increased. - CallThread ct0 = new CallThread(client, "shortwait", 0); - CallThread ct1 = new CallThread(client, "nowait", 1); - ct0.start(); + latch0.acquire(); + CallThread ct1 = new CallThread(client, "10000", "shortwait", latch1, 1); + CallThread ct2 = new CallThread(client, "1000", "nowait", latch1, 2); + ct1.start(); Thread.sleep(500); - ct1.start(); - latch.acquire(); - log.info("Delay for third call: " + ct1.delay); - assertTrue("Second call was not delayed", ct1.delay > 2000); + ct2.start(); + latch1.acquire(); + log.info("Exception for fourth call: " + ct2.t); + assertTrue("Fourth call should have timed out", + ct2.t != null && + ct2.t.getCause() instanceof IllegalStateException && + ct2.t.getMessage().indexOf("are in use") > -1); client.disconnect(); shutdownServer(); @@ -213,34 +218,43 @@ public void setInvoker(ServerInvoker invoker) {} } + class CallThread extends Thread { Client client; + String timeout; String command; + CountDown latch; int id; - long delay; + Throwable t; - public CallThread(Client client, String command, int id) + public CallThread(Client client, String timeout, String command, CountDown latch, int id) { this.client = client; + this.timeout = timeout; this.command = command; + this.latch = latch; this.id = id; } public void run() { try { - long start = System.currentTimeMillis(); + HashMap metadata = new HashMap(); + metadata.put("timeout", timeout); log.info("CallThread " + id + " making invocation: " + command); - client.invoke(command); - delay = System.currentTimeMillis() - start; + client.invoke(command, metadata); log.info("CallThread " + id + " back from invocation"); - latch.release(); } catch (Throwable t) { log.info("Thread " + id + " got exception: " + t.getMessage()); + this.t = t; } + finally + { + latch.release(); + } } } } \ No newline at end of file

12 years, 4 months

1
0
0 / 0

JBoss Remoting SVN: r6451 - remoting2/branches/2.x/src/etc.

by jboss-remoting-commits＠lists.jboss.org

Author: ron.sigal(a)jboss.com Date: 2012-07-18 15:11:55 -0400 (Wed, 18 Jul 2012) New Revision: 6451 Modified: remoting2/branches/2.x/src/etc/remoting.security.policy.core Log: JBREM-1306: Adding RuntimePermission "setFactory". Modified: remoting2/branches/2.x/src/etc/remoting.security.policy.core =================================================================== --- remoting2/branches/2.x/src/etc/remoting.security.policy.core 2012-07-17 18:21:38 UTC (rev 6450) +++ remoting2/branches/2.x/src/etc/remoting.security.policy.core 2012-07-18 19:11:55 UTC (rev 6451) @@ -167,10 +167,12 @@ // org.jboss.remoting.security.SSLSocketBuilder // org.jboss.remoting.transport.coyote.CoyoteInvoker // org.jboss.remoting.transport.http.HTTPClientInvoker + // org.jboss.remoting.transport.http.ssl.HTTPSClientInvoker // org.jboss.remoting.transport.servlet.web.ServerInvokerServlet // org.jboss.remoting.transporter.TransporterHandler // org.jboss.remoting.InvokerRegistry permission java.lang.RuntimePermission "accessClassInPackage.*"; + permission java.lang.RuntimePermission "setFactory"; // Used by org.jboss.remoting.transport.coyote.CoyoteInvoker permission java.lang.RuntimePermission "loadLibrary.tcnative-1";

12 years, 4 months

1
0
0 / 0

JBoss Remoting SVN: r6450 - remoting2/branches/2.2/src/main/org/jboss/remoting/transport/socket.

by jboss-remoting-commits＠lists.jboss.org

Author: ron.sigal(a)jboss.com Date: 2012-07-17 14:21:38 -0400 (Tue, 17 Jul 2012) New Revision: 6450 Modified: remoting2/branches/2.2/src/main/org/jboss/remoting/transport/socket/MicroSocketClientInvoker.java Log: JBREM-1305: Moved log call in getConnection(). Modified: remoting2/branches/2.2/src/main/org/jboss/remoting/transport/socket/MicroSocketClientInvoker.java =================================================================== --- remoting2/branches/2.2/src/main/org/jboss/remoting/transport/socket/MicroSocketClientInvoker.java 2012-07-17 18:20:45 UTC (rev 6449) +++ remoting2/branches/2.2/src/main/org/jboss/remoting/transport/socket/MicroSocketClientInvoker.java 2012-07-17 18:21:38 UTC (rev 6450) @@ -884,12 +884,12 @@ long start = System.currentTimeMillis(); long timeToWait = (timeAllowed > 0) ? timeAllowed : 30000; boolean timedout = !semaphore.attempt(timeToWait); - if (trace) log.trace(this + " obtained semaphore: " + semaphore.permits()); if (timedout) { throw new IllegalStateException("Timeout waiting for a free socket"); } + if (trace) log.trace(this + " obtained semaphore: " + semaphore.permits()); SocketWrapper pooled = null;

12 years, 4 months

1
0
0 / 0

JBoss Remoting SVN: r6449 - remoting2/branches/2.x/src/main/org/jboss/remoting/transport/socket.

by jboss-remoting-commits＠lists.jboss.org

Author: ron.sigal(a)jboss.com Date: 2012-07-17 14:20:45 -0400 (Tue, 17 Jul 2012) New Revision: 6449 Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/transport/socket/MicroSocketClientInvoker.java Log: JBREM-1305: Moved log call in getConnection(). Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/transport/socket/MicroSocketClientInvoker.java =================================================================== --- remoting2/branches/2.x/src/main/org/jboss/remoting/transport/socket/MicroSocketClientInvoker.java 2012-07-17 18:19:38 UTC (rev 6448) +++ remoting2/branches/2.x/src/main/org/jboss/remoting/transport/socket/MicroSocketClientInvoker.java 2012-07-17 18:20:45 UTC (rev 6449) @@ -1129,12 +1129,12 @@ long start = System.currentTimeMillis(); long timeToWait = (timeAllowed > 0) ? timeAllowed : connectionWait; boolean timedout = !semaphore.attempt(timeToWait); - if (trace) log.trace(this + " obtained semaphore: " + semaphore.permits()); if (timedout) { throw new IllegalStateException("Timeout waiting for a free socket"); } + if (trace) log.trace(this + " obtained semaphore: " + semaphore.permits()); SocketWrapper pooled = null;

12 years, 4 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

jboss-remoting-commits July 2012