JBoss Remoting SVN: r6448 - remoting2/branches/2.2/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-17 14:19:38 -0400 (Tue, 17 Jul 2012)
New Revision: 6448
Added:
remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/socket/timeout/SemaphoreGrowthTestCase.java
Log:
JBREM-1305: New unit test.
Added: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/socket/timeout/SemaphoreGrowthTestCase.java
===================================================================
--- remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/socket/timeout/SemaphoreGrowthTestCase.java (rev 0)
+++ remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/socket/timeout/SemaphoreGrowthTestCase.java 2012-07-17 18:19:38 UTC (rev 6448)
@@ -0,0 +1,262 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2009, 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.test.remoting.transport.socket.timeout;
+
+import java.net.InetAddress;
+import java.rmi.MarshalException;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.management.MBeanServer;
+
+import junit.framework.TestCase;
+
+import org.apache.log4j.ConsoleAppender;
+import org.apache.log4j.Level;
+import org.apache.log4j.Logger;
+import org.apache.log4j.PatternLayout;
+import org.jboss.logging.XLevel;
+import org.jboss.remoting.CannotConnectException;
+import org.jboss.remoting.Client;
+import org.jboss.remoting.InvocationRequest;
+import org.jboss.remoting.InvokerLocator;
+import org.jboss.remoting.ServerInvocationHandler;
+import org.jboss.remoting.ServerInvoker;
+import org.jboss.remoting.callback.InvokerCallbackHandler;
+import org.jboss.remoting.transport.Connector;
+import org.jboss.remoting.transport.PortUtil;
+
+import EDU.oswego.cs.dl.util.concurrent.CountDown;
+
+
+/**
+ * JBREM-1305
+ *
+ * @author <a href="mailto:ron.sigal@jboss.com">Ron Sigal</a>
+ * @version $Rev$
+ * <p>
+ * Copyright Jul 16, 2012
+ * </p>
+ */
+public class SemaphoreGrowthTestCase extends TestCase
+{
+ private static Logger log = Logger.getLogger(SemaphoreGrowthTestCase.class);
+
+ private static boolean firstTime = true;
+
+ protected String host;
+ protected int port;
+ protected String locatorURI;
+ protected InvokerLocator serverLocator;
+ protected Connector connector;
+ protected TestInvocationHandler invocationHandler;
+ protected CountDown latch0 = new CountDown(1);
+ protected CountDown latch1 = new CountDown(2);
+
+ public void setUp() throws Exception
+ {
+ if (firstTime)
+ {
+ firstTime = false;
+ Logger.getLogger("org.jboss.remoting").setLevel(XLevel.TRACE);
+ Logger.getLogger("org.jboss.test.remoting").setLevel(Level.INFO);
+ String pattern = "[%d{ABSOLUTE}] [%t] %5p (%F:%L) - %m%n";
+ PatternLayout layout = new PatternLayout(pattern);
+ ConsoleAppender consoleAppender = new ConsoleAppender(layout);
+ Logger.getRootLogger().addAppender(consoleAppender);
+ }
+ }
+
+
+ public void tearDown()
+ {
+ }
+
+
+ public void testSemaphoreGrowth() throws Throwable
+ {
+ log.info("entering " + getName());
+
+ // Start server.
+ setupServer();
+
+ // Create client.
+ InvokerLocator clientLocator = new InvokerLocator(locatorURI);
+ HashMap clientConfig = new HashMap();
+ clientConfig.put(InvokerLocator.FORCE_REMOTE, "true");
+ addExtraClientConfig(clientConfig);
+ Client client = new Client(clientLocator, clientConfig);
+ client.connect();
+ log.info("client is connected");
+
+ // Make first two calls, attempt to increase semaphore count.
+ CallThread ct0 = new CallThread(client, "20000", "longwait", latch0, 0);
+ ct0.start();
+ Thread.sleep(500);
+ try
+ {
+ log.info("Making second invocation");
+ HashMap metadata = new HashMap();
+ metadata.put("timeout", "1000");
+ client.invoke("unused", metadata);
+ fail("Second call unexpectedly succeeded");
+ }
+ catch (MarshalException e)
+ {
+ if (e.getCause() instanceof CannotConnectException && e.getMessage().indexOf("are in use") > -1)
+ {
+ log.info("Second call gets expected timeout");
+ }
+ else
+ {
+ fail("Second call got unexpected exception wrapped in CannotConnectException: " + e);
+ }
+ }
+ catch (Throwable t)
+ {
+ fail("Second call got unexpected exception: " + t);
+ }
+
+ // Verify that semaphore count has not been increased.
+ 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);
+ 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 CannotConnectException &&
+ ct2.t.getMessage().indexOf("are in use") > -1);
+
+ client.disconnect();
+ shutdownServer();
+ log.info(getName() + " PASSES");
+ }
+
+
+ protected String getTransport()
+ {
+ return "socket";
+ }
+
+
+ protected void addExtraClientConfig(Map config) {}
+ protected void addExtraServerConfig(Map config) {}
+
+
+ protected void setupServer() throws Exception
+ {
+ host = InetAddress.getLocalHost().getHostAddress();
+ port = PortUtil.findFreePort(host);
+ locatorURI = getTransport() + "://" + host + ":" + port;
+ locatorURI += "/?timeout=6000&clientMaxPoolSize=1&numberOfCallRetries=1";
+ String metadata = System.getProperty("remoting.metadata");
+ if (metadata != null)
+ {
+ locatorURI += "&" + metadata;
+ }
+ serverLocator = new InvokerLocator(locatorURI);
+ log.info("Starting remoting server with locator uri of: " + locatorURI);
+ HashMap config = new HashMap();
+ config.put(InvokerLocator.FORCE_REMOTE, "true");
+ addExtraServerConfig(config);
+ connector = new Connector(serverLocator, config);
+ connector.create();
+ invocationHandler = new TestInvocationHandler();
+ connector.addInvocationHandler("test", invocationHandler);
+ connector.start();
+ }
+
+
+ protected void shutdownServer() throws Exception
+ {
+ if (connector != null)
+ connector.stop();
+ }
+
+
+ static class TestInvocationHandler implements ServerInvocationHandler
+ {
+ public void addListener(InvokerCallbackHandler callbackHandler) {}
+ public Object invoke(final InvocationRequest invocation) throws Throwable
+ {
+ Object parameter = invocation.getParameter();
+ if ("shortwait".equals(parameter))
+ {
+ log.info("doing shortwait");
+ Thread.sleep(4000);
+ }
+ else if ("longwait".equals(parameter))
+ {
+ log.info("doing longwait");
+ Thread.sleep(10000);
+ }
+ return parameter;
+ }
+ public void removeListener(InvokerCallbackHandler callbackHandler) {}
+ public void setMBeanServer(MBeanServer server) {}
+ public void setInvoker(ServerInvoker invoker) {}
+ }
+
+
+ class CallThread extends Thread
+ {
+ Client client;
+ String timeout;
+ String command;
+ CountDown latch;
+ int id;
+ Throwable t;
+
+ 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
+ {
+ HashMap metadata = new HashMap();
+ metadata.put("timeout", timeout);
+ log.info("CallThread " + id + " making invocation: " + command);
+ client.invoke(command, metadata);
+ log.info("CallThread " + id + " back from invocation");
+ }
+ catch (Throwable t)
+ {
+ log.info("Thread " + id + " got exception: " + t.getMessage());
+ this.t = t;
+ }
+ finally
+ {
+ latch.release();
+ }
+ }
+ }
+}
\ No newline at end of file
11 years, 9 months
JBoss Remoting SVN: r6447 - 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:19:00 -0400 (Tue, 17 Jul 2012)
New Revision: 6447
Modified:
remoting2/branches/2.2/src/main/org/jboss/remoting/transport/socket/MicroSocketClientInvoker.java
Log:
JBREM-1305: transport() catches IllegalStateException from getConnection() and doesn't release a semaphore.
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 03:52:00 UTC (rev 6446)
+++ remoting2/branches/2.2/src/main/org/jboss/remoting/transport/socket/MicroSocketClientInvoker.java 2012-07-17 18:19:00 UTC (rev 6447)
@@ -581,7 +581,7 @@
}
int retryCount = 0;
- SocketException sockEx = null;
+ Exception sockEx = null;
for (; retryCount < numberOfCallRetries; retryCount++)
{
@@ -601,6 +601,13 @@
{
socketWrapper = getConnection(marshaller, unmarshaller, timeLeft);
}
+ catch (IllegalStateException e)
+ {
+ sockEx = new CannotConnectException(
+ "Can not get connection to server. All connections for " +
+ locator + " are in use", e);
+ continue;
+ }
catch (SocketException e)
{
semaphore.release();
11 years, 9 months
JBoss Remoting SVN: r6446 - remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/socket/ssl/socketfactory.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2012-07-16 23:52:00 -0400 (Mon, 16 Jul 2012)
New Revision: 6446
Added:
remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/socket/ssl/socketfactory/DefaultSocketFactoryTestCase.java
Log:
JBREM-1306: New unit test.
Added: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/socket/ssl/socketfactory/DefaultSocketFactoryTestCase.java
===================================================================
--- remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/socket/ssl/socketfactory/DefaultSocketFactoryTestCase.java (rev 0)
+++ remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/socket/ssl/socketfactory/DefaultSocketFactoryTestCase.java 2012-07-17 03:52:00 UTC (rev 6446)
@@ -0,0 +1,273 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2009, 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.test.remoting.transport.socket.ssl.socketfactory;
+
+import java.io.IOException;
+import java.net.InetAddress;
+import java.net.Socket;
+import java.net.UnknownHostException;
+import java.util.HashMap;
+
+import javax.management.MBeanServer;
+import javax.net.SocketFactory;
+import javax.net.ssl.SSLSocketFactory;
+
+import junit.framework.TestCase;
+
+import org.apache.log4j.ConsoleAppender;
+import org.apache.log4j.Level;
+import org.apache.log4j.Logger;
+import org.apache.log4j.PatternLayout;
+import org.jboss.remoting.Client;
+import org.jboss.remoting.InvocationRequest;
+import org.jboss.remoting.InvokerLocator;
+import org.jboss.remoting.Remoting;
+import org.jboss.remoting.ServerInvocationHandler;
+import org.jboss.remoting.ServerInvoker;
+import org.jboss.remoting.callback.InvokerCallbackHandler;
+import org.jboss.remoting.transport.Connector;
+import org.jboss.remoting.transport.PortUtil;
+import org.jboss.remoting.transport.http.ssl.HTTPSClientInvoker;
+
+/**
+ * JBREM-1306.
+ *
+ * @author <a href="mailto:ron.sigal@jboss.com">Ron Sigal</a>
+ * @version $Rev$
+ * <p>
+ * Copyright May 30, 2012
+ * </p>
+ */
+public class DefaultSocketFactoryTestCase extends TestCase
+{
+ private static Logger log = Logger.getLogger(DefaultSocketFactoryTestCase.class);
+
+ private static boolean firstTime = true;
+
+ protected String host;
+ protected int port;
+ protected String locatorURI;
+ protected InvokerLocator serverLocator;
+ protected Connector connector;
+ protected TestInvocationHandler invocationHandler;
+
+
+ public void setUp() throws Exception
+ {
+ if (firstTime)
+ {
+ firstTime = false;
+ Logger.getLogger("org.jboss.remoting").setLevel(Level.INFO);
+ Logger.getLogger("org.jboss.test.remoting").setLevel(Level.INFO);
+ String pattern = "[%d{ABSOLUTE}] [%t] %5p (%F:%L) - %m%n";
+ PatternLayout layout = new PatternLayout(pattern);
+ ConsoleAppender consoleAppender = new ConsoleAppender(layout);
+ Logger.getRootLogger().addAppender(consoleAppender);
+ }
+
+ String trustStoreFilePath = this.getClass().getResource("../.truststore").getFile();
+ System.setProperty("javax.net.ssl.trustStore", trustStoreFilePath);
+ System.setProperty("javax.net.ssl.trustStorePassword", "unit-tests-client");
+ String keyStoreFilePath = this.getClass().getResource("../.keystore").getFile();
+ System.setProperty("javax.net.ssl.keyStore", keyStoreFilePath);
+ System.setProperty("javax.net.ssl.keyStorePassword", "unit-tests-server");
+ System.setProperty("org.jboss.security.ignoreHttpsHost", "true");
+ }
+
+
+ public void tearDown()
+ {
+ }
+
+
+ public void testCustomSocketFactory() throws Throwable
+ {
+ log.info("entering " + getName());
+
+ // Start server.
+ setupServer();
+
+ // Create client.
+ InvokerLocator clientLocator = new InvokerLocator(locatorURI);
+ HashMap clientConfig = new HashMap();
+ clientConfig.put(InvokerLocator.FORCE_REMOTE, "true");
+ clientConfig.put(Remoting.CUSTOM_SOCKET_FACTORY, new TestSSLSocketFactory());
+ Client client = new Client(clientLocator, clientConfig);
+ client.connect();
+ log.info("client is connected");
+
+ // Test connection.
+ assertEquals("abc", client.invoke("abc"));
+ log.info("connection is good");
+
+ // Verify custom SSLSocketFactory is being used.
+ assertTrue(client.getInvoker().getSocketFactory() instanceof TestSSLSocketFactory);
+
+ client.disconnect();
+ shutdownServer();
+ log.info(getName() + " PASSES");
+ }
+
+
+ public void testDefaultSocketFactory() throws Throwable
+ {
+ log.info("entering " + getName());
+
+ // Start server.
+ setupServer();
+
+ // Create client.
+ InvokerLocator clientLocator = new InvokerLocator(locatorURI);
+ HashMap clientConfig = new HashMap();
+ clientConfig.put(InvokerLocator.FORCE_REMOTE, "true");
+ clientConfig.put(Remoting.CUSTOM_SOCKET_FACTORY, new TestSSLSocketFactory());
+ clientConfig.put(HTTPSClientInvoker.USE_DEFAULT_SSL_SOCKET_FACTORY, "true");
+ Client client = new Client(clientLocator, clientConfig);
+ client.connect();
+ log.info("client is connected");
+
+ // Test connection.
+ assertEquals("abc", client.invoke("abc"));
+ log.info("connection is good");
+
+ // Verify custom SSLSocketFactory is not being used.
+ assertFalse(client.getInvoker().getSocketFactory() instanceof TestSSLSocketFactory);
+
+ client.disconnect();
+ shutdownServer();
+ log.info(getName() + " PASSES");
+ }
+
+
+ public void testDefaultSocketFactoryWithParameterFalse() throws Throwable
+ {
+ log.info("entering " + getName());
+
+ // Start server.
+ setupServer();
+
+ // Create client.
+ InvokerLocator clientLocator = new InvokerLocator(locatorURI);
+ HashMap clientConfig = new HashMap();
+ clientConfig.put(InvokerLocator.FORCE_REMOTE, "true");
+ clientConfig.put(Remoting.CUSTOM_SOCKET_FACTORY, new TestSSLSocketFactory());
+ clientConfig.put(HTTPSClientInvoker.USE_DEFAULT_SSL_SOCKET_FACTORY, "false");
+ Client client = new Client(clientLocator, clientConfig);
+ client.connect();
+ log.info("client is connected");
+
+ // Test connection.
+ assertEquals("abc", client.invoke("abc"));
+ log.info("connection is good");
+
+ // Verify custom SSLSocketFactory is being used.
+ assertTrue(client.getInvoker().getSocketFactory() instanceof TestSSLSocketFactory);
+
+ client.disconnect();
+ shutdownServer();
+ log.info(getName() + " PASSES");
+ }
+
+
+ protected String getTransport()
+ {
+ return "https";
+ }
+
+
+ protected void setupServer() throws Exception
+ {
+ host = InetAddress.getLocalHost().getHostAddress();
+ port = PortUtil.findFreePort(host);
+ locatorURI = getTransport() + "://" + host + ":" + port;
+ String metadata = System.getProperty("remoting.metadata");
+ if (metadata != null)
+ {
+ locatorURI += "/?" + metadata;
+ }
+ serverLocator = new InvokerLocator(locatorURI);
+ log.info("Starting remoting server with locator uri of: " + locatorURI);
+ HashMap config = new HashMap();
+ config.put(InvokerLocator.FORCE_REMOTE, "true");
+ connector = new Connector(serverLocator, config);
+ connector.create();
+ invocationHandler = new TestInvocationHandler();
+ connector.addInvocationHandler("test", invocationHandler);
+ connector.start();
+ }
+
+
+ protected void shutdownServer() throws Exception
+ {
+ if (connector != null)
+ connector.stop();
+ }
+
+
+ static class TestInvocationHandler implements ServerInvocationHandler
+ {
+ public void addListener(InvokerCallbackHandler callbackHandler) {}
+ public Object invoke(final InvocationRequest invocation) throws Throwable
+ {
+ return invocation.getParameter();
+ }
+ public void removeListener(InvokerCallbackHandler callbackHandler) {}
+ public void setMBeanServer(MBeanServer server) {}
+ public void setInvoker(ServerInvoker invoker) {}
+ }
+
+
+ public static class TestSSLSocketFactory extends SocketFactory
+ {
+ SocketFactory sf = SSLSocketFactory.getDefault();
+
+ public TestSSLSocketFactory()
+ {
+ }
+
+ public Socket createSocket() throws IOException, UnknownHostException
+ {
+ return sf.createSocket();
+ }
+
+ public Socket createSocket(String arg0, int arg1) throws IOException, UnknownHostException
+ {
+ return sf.createSocket(arg0, arg1);
+ }
+
+ public Socket createSocket(InetAddress arg0, int arg1) throws IOException
+ {
+ return sf.createSocket(arg0, arg1);
+ }
+
+ public Socket createSocket(String arg0, int arg1, InetAddress arg2, int arg3) throws IOException,
+ UnknownHostException
+ {
+ return sf.createSocket(arg0, arg1, arg2, arg3);
+ }
+
+ public Socket createSocket(InetAddress arg0, int arg1, InetAddress arg2, int arg3) throws IOException
+ {
+ return sf.createSocket(arg0, arg1, arg2, arg3);
+ }
+ }
+}
\ No newline at end of file
11 years, 9 months
JBoss Remoting SVN: r6445 - remoting2/branches/2.2/src/main/org/jboss/remoting/transport/http/ssl.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2012-07-16 23:51:14 -0400 (Mon, 16 Jul 2012)
New Revision: 6445
Modified:
remoting2/branches/2.2/src/main/org/jboss/remoting/transport/http/ssl/HTTPSClientInvoker.java
Log:
JBREM-1306: If the new configuration parameter "useDefaultSslSocketFactory" is true, createSocketFactory() will use HttpsURLConnection default socket factory.
Modified: remoting2/branches/2.2/src/main/org/jboss/remoting/transport/http/ssl/HTTPSClientInvoker.java
===================================================================
--- remoting2/branches/2.2/src/main/org/jboss/remoting/transport/http/ssl/HTTPSClientInvoker.java 2012-07-17 02:48:34 UTC (rev 6444)
+++ remoting2/branches/2.2/src/main/org/jboss/remoting/transport/http/ssl/HTTPSClientInvoker.java 2012-07-17 03:51:14 UTC (rev 6445)
@@ -52,6 +52,7 @@
*/
public static final String IGNORE_HTTPS_HOST = "org.jboss.security.ignoreHttpsHost";
public static final String HOSTNAME_VERIFIER = "hostnameVerifier";
+ public static final String USE_DEFAULT_SSL_SOCKET_FACTORY = "useDefaultSslSocketFactory";
public HTTPSClientInvoker(InvokerLocator locator)
{
@@ -126,6 +127,12 @@
protected SocketFactory createSocketFactory(Map configuration)
{
+ String useDefaultSslSocketFactory = (String) configuration.get(USE_DEFAULT_SSL_SOCKET_FACTORY);
+ if (useDefaultSslSocketFactory != null && Boolean.valueOf(useDefaultSslSocketFactory).booleanValue())
+ {
+ return HttpsURLConnection.getDefaultSSLSocketFactory();
+ }
+
SocketFactory sf = super.createSocketFactory(configuration);
if (isCompleteSocketFactory(sf))
11 years, 9 months
JBoss Remoting SVN: r6444 - remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/http/ssl/socketfactory.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2012-07-16 22:48:34 -0400 (Mon, 16 Jul 2012)
New Revision: 6444
Added:
remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/http/ssl/socketfactory/DefaultSocketFactoryTestCase.java
Log:
JBREM-1306: New unit test.
Added: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/http/ssl/socketfactory/DefaultSocketFactoryTestCase.java
===================================================================
--- remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/http/ssl/socketfactory/DefaultSocketFactoryTestCase.java (rev 0)
+++ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/http/ssl/socketfactory/DefaultSocketFactoryTestCase.java 2012-07-17 02:48:34 UTC (rev 6444)
@@ -0,0 +1,273 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2009, 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.test.remoting.transport.http.ssl.socketfactory;
+
+import java.io.IOException;
+import java.net.InetAddress;
+import java.net.Socket;
+import java.net.UnknownHostException;
+import java.util.HashMap;
+
+import javax.management.MBeanServer;
+import javax.net.SocketFactory;
+import javax.net.ssl.SSLSocketFactory;
+
+import junit.framework.TestCase;
+
+import org.apache.log4j.ConsoleAppender;
+import org.apache.log4j.Level;
+import org.apache.log4j.Logger;
+import org.apache.log4j.PatternLayout;
+import org.jboss.remoting.Client;
+import org.jboss.remoting.InvocationRequest;
+import org.jboss.remoting.InvokerLocator;
+import org.jboss.remoting.Remoting;
+import org.jboss.remoting.ServerInvocationHandler;
+import org.jboss.remoting.ServerInvoker;
+import org.jboss.remoting.callback.InvokerCallbackHandler;
+import org.jboss.remoting.transport.Connector;
+import org.jboss.remoting.transport.PortUtil;
+import org.jboss.remoting.transport.http.ssl.HTTPSClientInvoker;
+
+/**
+ * JBREM-1306.
+ *
+ * @author <a href="mailto:ron.sigal@jboss.com">Ron Sigal</a>
+ * @version $Rev$
+ * <p>
+ * Copyright May 30, 2012
+ * </p>
+ */
+public class DefaultSocketFactoryTestCase extends TestCase
+{
+ private static Logger log = Logger.getLogger(DefaultSocketFactoryTestCase.class);
+
+ private static boolean firstTime = true;
+
+ protected String host;
+ protected int port;
+ protected String locatorURI;
+ protected InvokerLocator serverLocator;
+ protected Connector connector;
+ protected TestInvocationHandler invocationHandler;
+
+
+ public void setUp() throws Exception
+ {
+ if (firstTime)
+ {
+ firstTime = false;
+ Logger.getLogger("org.jboss.remoting").setLevel(Level.INFO);
+ Logger.getLogger("org.jboss.test.remoting").setLevel(Level.INFO);
+ String pattern = "[%d{ABSOLUTE}] [%t] %5p (%F:%L) - %m%n";
+ PatternLayout layout = new PatternLayout(pattern);
+ ConsoleAppender consoleAppender = new ConsoleAppender(layout);
+ Logger.getRootLogger().addAppender(consoleAppender);
+ }
+
+ String trustStoreFilePath = this.getClass().getResource("../.truststore").getFile();
+ System.setProperty("javax.net.ssl.trustStore", trustStoreFilePath);
+ System.setProperty("javax.net.ssl.trustStorePassword", "unit-tests-client");
+ String keyStoreFilePath = this.getClass().getResource("../.keystore").getFile();
+ System.setProperty("javax.net.ssl.keyStore", keyStoreFilePath);
+ System.setProperty("javax.net.ssl.keyStorePassword", "unit-tests-server");
+ System.setProperty("org.jboss.security.ignoreHttpsHost", "true");
+ }
+
+
+ public void tearDown()
+ {
+ }
+
+
+ public void testCustomSocketFactory() throws Throwable
+ {
+ log.info("entering " + getName());
+
+ // Start server.
+ setupServer();
+
+ // Create client.
+ InvokerLocator clientLocator = new InvokerLocator(locatorURI);
+ HashMap clientConfig = new HashMap();
+ clientConfig.put(InvokerLocator.FORCE_REMOTE, "true");
+ clientConfig.put(Remoting.CUSTOM_SOCKET_FACTORY, new TestSSLSocketFactory());
+ Client client = new Client(clientLocator, clientConfig);
+ client.connect();
+ log.info("client is connected");
+
+ // Test connection.
+ assertEquals("abc", client.invoke("abc"));
+ log.info("connection is good");
+
+ // Verify custom SSLSocketFactory is being used.
+ assertTrue(client.getInvoker().getSocketFactory() instanceof TestSSLSocketFactory);
+
+ client.disconnect();
+ shutdownServer();
+ log.info(getName() + " PASSES");
+ }
+
+
+ public void testDefaultSocketFactory() throws Throwable
+ {
+ log.info("entering " + getName());
+
+ // Start server.
+ setupServer();
+
+ // Create client.
+ InvokerLocator clientLocator = new InvokerLocator(locatorURI);
+ HashMap clientConfig = new HashMap();
+ clientConfig.put(InvokerLocator.FORCE_REMOTE, "true");
+ clientConfig.put(Remoting.CUSTOM_SOCKET_FACTORY, new TestSSLSocketFactory());
+ clientConfig.put(HTTPSClientInvoker.USE_DEFAULT_SSL_SOCKET_FACTORY, "true");
+ Client client = new Client(clientLocator, clientConfig);
+ client.connect();
+ log.info("client is connected");
+
+ // Test connection.
+ assertEquals("abc", client.invoke("abc"));
+ log.info("connection is good");
+
+ // Verify custom SSLSocketFactory is not being used.
+ assertFalse(client.getInvoker().getSocketFactory() instanceof TestSSLSocketFactory);
+
+ client.disconnect();
+ shutdownServer();
+ log.info(getName() + " PASSES");
+ }
+
+
+ public void testDefaultSocketFactoryWithParameterFalse() throws Throwable
+ {
+ log.info("entering " + getName());
+
+ // Start server.
+ setupServer();
+
+ // Create client.
+ InvokerLocator clientLocator = new InvokerLocator(locatorURI);
+ HashMap clientConfig = new HashMap();
+ clientConfig.put(InvokerLocator.FORCE_REMOTE, "true");
+ clientConfig.put(Remoting.CUSTOM_SOCKET_FACTORY, new TestSSLSocketFactory());
+ clientConfig.put(HTTPSClientInvoker.USE_DEFAULT_SSL_SOCKET_FACTORY, "false");
+ Client client = new Client(clientLocator, clientConfig);
+ client.connect();
+ log.info("client is connected");
+
+ // Test connection.
+ assertEquals("abc", client.invoke("abc"));
+ log.info("connection is good");
+
+ // Verify custom SSLSocketFactory is being used.
+ assertTrue(client.getInvoker().getSocketFactory() instanceof TestSSLSocketFactory);
+
+ client.disconnect();
+ shutdownServer();
+ log.info(getName() + " PASSES");
+ }
+
+
+ protected String getTransport()
+ {
+ return "https";
+ }
+
+
+ protected void setupServer() throws Exception
+ {
+ host = InetAddress.getLocalHost().getHostAddress();
+ port = PortUtil.findFreePort(host);
+ locatorURI = getTransport() + "://" + host + ":" + port;
+ String metadata = System.getProperty("remoting.metadata");
+ if (metadata != null)
+ {
+ locatorURI += "/?" + metadata;
+ }
+ serverLocator = new InvokerLocator(locatorURI);
+ log.info("Starting remoting server with locator uri of: " + locatorURI);
+ HashMap config = new HashMap();
+ config.put(InvokerLocator.FORCE_REMOTE, "true");
+ connector = new Connector(serverLocator, config);
+ connector.create();
+ invocationHandler = new TestInvocationHandler();
+ connector.addInvocationHandler("test", invocationHandler);
+ connector.start();
+ }
+
+
+ protected void shutdownServer() throws Exception
+ {
+ if (connector != null)
+ connector.stop();
+ }
+
+
+ static class TestInvocationHandler implements ServerInvocationHandler
+ {
+ public void addListener(InvokerCallbackHandler callbackHandler) {}
+ public Object invoke(final InvocationRequest invocation) throws Throwable
+ {
+ return invocation.getParameter();
+ }
+ public void removeListener(InvokerCallbackHandler callbackHandler) {}
+ public void setMBeanServer(MBeanServer server) {}
+ public void setInvoker(ServerInvoker invoker) {}
+ }
+
+
+ public static class TestSSLSocketFactory extends SocketFactory
+ {
+ SocketFactory sf = SSLSocketFactory.getDefault();
+
+ public TestSSLSocketFactory()
+ {
+ }
+
+ public Socket createSocket() throws IOException, UnknownHostException
+ {
+ return sf.createSocket();
+ }
+
+ public Socket createSocket(String arg0, int arg1) throws IOException, UnknownHostException
+ {
+ return sf.createSocket(arg0, arg1);
+ }
+
+ public Socket createSocket(InetAddress arg0, int arg1) throws IOException
+ {
+ return sf.createSocket(arg0, arg1);
+ }
+
+ public Socket createSocket(String arg0, int arg1, InetAddress arg2, int arg3) throws IOException,
+ UnknownHostException
+ {
+ return sf.createSocket(arg0, arg1, arg2, arg3);
+ }
+
+ public Socket createSocket(InetAddress arg0, int arg1, InetAddress arg2, int arg3) throws IOException
+ {
+ return sf.createSocket(arg0, arg1, arg2, arg3);
+ }
+ }
+}
\ No newline at end of file
11 years, 9 months
JBoss Remoting SVN: r6443 - 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-16 22:39:34 -0400 (Mon, 16 Jul 2012)
New Revision: 6443
Modified:
remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/socket/timeout/SemaphoreGrowthTestCase.java
Log:
JBREM-1305: Removed some unused imports.
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-17 02:38:51 UTC (rev 6442)
+++ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/socket/timeout/SemaphoreGrowthTestCase.java 2012-07-17 02:39:34 UTC (rev 6443)
@@ -43,10 +43,8 @@
import org.jboss.remoting.callback.InvokerCallbackHandler;
import org.jboss.remoting.transport.Connector;
import org.jboss.remoting.transport.PortUtil;
-import org.jgroups.persistence.CannotConnectException;
import EDU.oswego.cs.dl.util.concurrent.CountDown;
-import EDU.oswego.cs.dl.util.concurrent.Latch;
/**
11 years, 9 months
JBoss Remoting SVN: r6442 - 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-16 22:38:51 -0400 (Mon, 16 Jul 2012)
New Revision: 6442
Added:
remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/socket/timeout/SemaphoreGrowthTestCase.java
Log:
JBREM-1305: New unit test.
Added: 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 (rev 0)
+++ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/socket/timeout/SemaphoreGrowthTestCase.java 2012-07-17 02:38:51 UTC (rev 6442)
@@ -0,0 +1,248 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2009, 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.test.remoting.transport.socket.timeout;
+
+import java.net.InetAddress;
+import java.net.SocketTimeoutException;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.management.MBeanServer;
+
+import junit.framework.TestCase;
+
+import org.apache.log4j.ConsoleAppender;
+import org.apache.log4j.Level;
+import org.apache.log4j.Logger;
+import org.apache.log4j.PatternLayout;
+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;
+import org.jboss.remoting.ServerInvoker;
+import org.jboss.remoting.callback.InvokerCallbackHandler;
+import org.jboss.remoting.transport.Connector;
+import org.jboss.remoting.transport.PortUtil;
+import org.jgroups.persistence.CannotConnectException;
+
+import EDU.oswego.cs.dl.util.concurrent.CountDown;
+import EDU.oswego.cs.dl.util.concurrent.Latch;
+
+
+/**
+ * JBREM-1305
+ *
+ * @author <a href="mailto:ron.sigal@jboss.com">Ron Sigal</a>
+ * @version $Rev$
+ * <p>
+ * Copyright Jul 16, 2012
+ * </p>
+ */
+public class SemaphoreGrowthTestCase extends TestCase
+{
+ private static Logger log = Logger.getLogger(SemaphoreGrowthTestCase.class);
+
+ private static boolean firstTime = true;
+
+ protected String host;
+ protected int port;
+ protected String locatorURI;
+ protected InvokerLocator serverLocator;
+ protected Connector connector;
+ protected TestInvocationHandler invocationHandler;
+ protected CountDown latch = new CountDown(2);
+
+
+ public void setUp() throws Exception
+ {
+ if (firstTime)
+ {
+ firstTime = false;
+ Logger.getLogger("org.jboss.remoting").setLevel(Level.INFO);
+ Logger.getLogger("org.jboss.test.remoting").setLevel(Level.INFO);
+ String pattern = "[%d{ABSOLUTE}] [%t] %5p (%F:%L) - %m%n";
+ PatternLayout layout = new PatternLayout(pattern);
+ ConsoleAppender consoleAppender = new ConsoleAppender(layout);
+ Logger.getRootLogger().addAppender(consoleAppender);
+ }
+ }
+
+
+ public void tearDown()
+ {
+ }
+
+
+ public void testSemaphoreGrowth() throws Throwable
+ {
+ log.info("entering " + getName());
+
+ // Start server.
+ setupServer();
+
+ // Create client.
+ InvokerLocator clientLocator = new InvokerLocator(locatorURI);
+ HashMap clientConfig = new HashMap();
+ clientConfig.put(InvokerLocator.FORCE_REMOTE, "true");
+ addExtraClientConfig(clientConfig);
+ Client client = new Client(clientLocator, clientConfig);
+ 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.
+ try
+ {
+ client.invoke("longwait");
+ fail("First call unexpectedly succeeded");
+ }
+ catch (InvocationFailureException e)
+ {
+ if (e.getCause() instanceof SocketTimeoutException)
+ {
+ log.info("First call gets expected timeout");
+ }
+ else
+ {
+ fail("First call got unexpected exception wrapped in CannotConnectException: " + e);
+ }
+ }
+ catch (Throwable t)
+ {
+ fail("First 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();
+ Thread.sleep(500);
+ ct1.start();
+ latch.acquire();
+ log.info("Delay for third call: " + ct1.delay);
+ assertTrue("Second call was not delayed", ct1.delay > 2000);
+
+ client.disconnect();
+ shutdownServer();
+ log.info(getName() + " PASSES");
+ }
+
+
+ protected String getTransport()
+ {
+ return "socket";
+ }
+
+
+ protected void addExtraClientConfig(Map config) {}
+ protected void addExtraServerConfig(Map config) {}
+
+
+ protected void setupServer() throws Exception
+ {
+ host = InetAddress.getLocalHost().getHostAddress();
+ port = PortUtil.findFreePort(host);
+ locatorURI = getTransport() + "://" + host + ":" + port;
+ locatorURI += "/?timeout=6000&clientMaxPoolSize=1&numberOfCallRetries=1";
+ String metadata = System.getProperty("remoting.metadata");
+ if (metadata != null)
+ {
+ locatorURI += "&" + metadata;
+ }
+ serverLocator = new InvokerLocator(locatorURI);
+ log.info("Starting remoting server with locator uri of: " + locatorURI);
+ HashMap config = new HashMap();
+ config.put(InvokerLocator.FORCE_REMOTE, "true");
+ addExtraServerConfig(config);
+ connector = new Connector(serverLocator, config);
+ connector.create();
+ invocationHandler = new TestInvocationHandler();
+ connector.addInvocationHandler("test", invocationHandler);
+ connector.start();
+ }
+
+
+ protected void shutdownServer() throws Exception
+ {
+ if (connector != null)
+ connector.stop();
+ }
+
+
+ static class TestInvocationHandler implements ServerInvocationHandler
+ {
+ public void addListener(InvokerCallbackHandler callbackHandler) {}
+ public Object invoke(final InvocationRequest invocation) throws Throwable
+ {
+ Object parameter = invocation.getParameter();
+ if ("shortwait".equals(parameter))
+ {
+ log.info("doing shortwait");
+ Thread.sleep(4000);
+ }
+ else if ("longwait".equals(parameter))
+ {
+ log.info("doing longwait");
+ Thread.sleep(10000);
+ }
+ return parameter;
+ }
+ public void removeListener(InvokerCallbackHandler callbackHandler) {}
+ public void setMBeanServer(MBeanServer server) {}
+ public void setInvoker(ServerInvoker invoker) {}
+ }
+
+ class CallThread extends Thread
+ {
+ Client client;
+ String command;
+ int id;
+ long delay;
+
+ public CallThread(Client client, String command, int id)
+ {
+ this.client = client;
+ this.command = command;
+ this.id = id;
+ }
+ public void run()
+ {
+ try
+ {
+ long start = System.currentTimeMillis();
+ log.info("CallThread " + id + " making invocation: " + command);
+ client.invoke(command);
+ delay = System.currentTimeMillis() - start;
+ log.info("CallThread " + id + " back from invocation");
+ latch.release();
+ }
+ catch (Throwable t)
+ {
+ log.info("Thread " + id + " got exception: " + t.getMessage());
+ }
+ }
+ }
+}
\ No newline at end of file
11 years, 9 months
JBoss Remoting SVN: r6441 - 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-16 22:34:40 -0400 (Mon, 16 Jul 2012)
New Revision: 6441
Modified:
remoting2/branches/2.x/src/main/org/jboss/remoting/transport/http/ssl/HTTPSClientInvoker.java
Log:
JBREM-1306: If the new configuration parameter "useDefaultSslSocketFactory" is true, createSocketFactory() will use HttpsURLConnection default socket factory.
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-17 02:26:49 UTC (rev 6440)
+++ remoting2/branches/2.x/src/main/org/jboss/remoting/transport/http/ssl/HTTPSClientInvoker.java 2012-07-17 02:34:40 UTC (rev 6441)
@@ -54,6 +54,7 @@
*/
public static final String IGNORE_HTTPS_HOST = "org.jboss.security.ignoreHttpsHost";
public static final String HOSTNAME_VERIFIER = "hostnameVerifier";
+ public static final String USE_DEFAULT_SSL_SOCKET_FACTORY = "useDefaultSslSocketFactory";
public HTTPSClientInvoker(InvokerLocator locator)
{
@@ -128,6 +129,12 @@
protected SocketFactory createSocketFactory(Map configuration)
{
+ String useDefaultSslSocketFactory = (String) configuration.get(USE_DEFAULT_SSL_SOCKET_FACTORY);
+ if (useDefaultSslSocketFactory != null && Boolean.valueOf(useDefaultSslSocketFactory).booleanValue())
+ {
+ return HttpsURLConnection.getDefaultSSLSocketFactory();
+ }
+
SocketFactory sf = super.createSocketFactory(configuration);
if (isCompleteSocketFactory(sf))
11 years, 9 months
JBoss Remoting SVN: r6440 - 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-16 22:26:49 -0400 (Mon, 16 Jul 2012)
New Revision: 6440
Modified:
remoting2/branches/2.x/src/main/org/jboss/remoting/transport/socket/MicroSocketClientInvoker.java
Log:
JBREM-1305: transport() catches IllegalStateException from getConnection() and doesn't release a semaphore.
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-04-10 01:07:41 UTC (rev 6439)
+++ remoting2/branches/2.x/src/main/org/jboss/remoting/transport/socket/MicroSocketClientInvoker.java 2012-07-17 02:26:49 UTC (rev 6440)
@@ -822,6 +822,13 @@
if (trace) log.trace(this + " released semaphore: " + semaphore.permits(), e);
throw new RuntimeException(e);
}
+ catch (IllegalStateException e)
+ {
+ sockEx = new CannotConnectException(
+ "Can not get connection to server. All connections for " +
+ locator + " are in use", e);
+ continue;
+ }
catch (Exception e)
{
// if (bailOut)
11 years, 9 months