From jboss-remoting-commits at lists.jboss.org Thu Feb 28 01:16:19 2008 Content-Type: multipart/mixed; boundary="===============2775544188217038429==" MIME-Version: 1.0 From: jboss-remoting-commits at lists.jboss.org To: jboss-remoting-commits at lists.jboss.org Subject: [jboss-remoting-commits] JBoss Remoting SVN: r3535 - in remoting2/branches/2.x/src/tests/org/jboss/test/remoting/callback: sslsocketfactory and 1 other directory. Date: Thu, 28 Feb 2008 01:16:19 -0500 Message-ID: --===============2775544188217038429== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: ron.sigal(a)jboss.com Date: 2008-02-28 01:16:19 -0500 (Thu, 28 Feb 2008) New Revision: 3535 Added: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/callback/sslsoc= ketfactory/ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/callback/sslsoc= ketfactory/HttpsSSLSocketFactoryTestCase.java remoting2/branches/2.x/src/tests/org/jboss/test/remoting/callback/sslsoc= ketfactory/SSLRMISSLSocketFactoryTestCase.java remoting2/branches/2.x/src/tests/org/jboss/test/remoting/callback/sslsoc= ketfactory/SSLSocketFactoryTestParent.java remoting2/branches/2.x/src/tests/org/jboss/test/remoting/callback/sslsoc= ketfactory/SSLSocketSSLSocketFactoryTestCase.java remoting2/branches/2.x/src/tests/org/jboss/test/remoting/callback/sslsoc= ketfactory/keystore remoting2/branches/2.x/src/tests/org/jboss/test/remoting/callback/sslsoc= ketfactory/truststore Log: JBREM-522: New unit tests. Added: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/callback/ss= lsocketfactory/HttpsSSLSocketFactoryTestCase.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- remoting2/branches/2.x/src/tests/org/jboss/test/remoting/callback/sslso= cketfactory/HttpsSSLSocketFactoryTestCase.java (rev= 0) +++ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/callback/sslso= cketfactory/HttpsSSLSocketFactoryTestCase.java 2008-02-28 06:16:19 UTC (rev= 3535) @@ -0,0 +1,50 @@ +/* +* JBoss, Home of Professional Open Source +* Copyright 2005, JBoss Inc., and individual contributors as indicated +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ +package org.jboss.test.remoting.callback.sslsocketfactory; + +import java.util.Map; + +import org.jboss.remoting.transport.http.ssl.HTTPSClientInvoker; + + +/** + * Unit test for JBREM-522. + * = + * @author Ron Sigal + * @version $Revision: 1.1 $ + *

+ * Copyright Feb 27, 2008 + *

+ */ +public class HttpsSSLSocketFactoryTestCase extends SSLSocketFactoryTestPar= ent +{ + protected String getTransport() + { + return "https"; + } + = + protected void addExtraClientConfig(Map config) + { + config.put(HTTPSClientInvoker.IGNORE_HTTPS_HOST, "true"); + } +} + Added: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/callback/ss= lsocketfactory/SSLRMISSLSocketFactoryTestCase.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- remoting2/branches/2.x/src/tests/org/jboss/test/remoting/callback/sslso= cketfactory/SSLRMISSLSocketFactoryTestCase.java (re= v 0) +++ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/callback/sslso= cketfactory/SSLRMISSLSocketFactoryTestCase.java 2008-02-28 06:16:19 UTC (re= v 3535) @@ -0,0 +1,41 @@ +/* +* JBoss, Home of Professional Open Source +* Copyright 2005, JBoss Inc., and individual contributors as indicated +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ +package org.jboss.test.remoting.callback.sslsocketfactory; + + +/** + * Unit test for JBREM-522. + * = + * @author Ron Sigal + * @version $Revision: 1.1 $ + *

+ * Copyright Feb 27, 2008 + *

+ */ +public class SSLRMISSLSocketFactoryTestCase extends SSLSocketFactoryTestPa= rent +{ + protected String getTransport() + { + return "sslrmi"; + } +} + Added: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/callback/ss= lsocketfactory/SSLSocketFactoryTestParent.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- remoting2/branches/2.x/src/tests/org/jboss/test/remoting/callback/sslso= cketfactory/SSLSocketFactoryTestParent.java (rev 0) +++ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/callback/sslso= cketfactory/SSLSocketFactoryTestParent.java 2008-02-28 06:16:19 UTC (rev 35= 35) @@ -0,0 +1,193 @@ +/* +* JBoss, Home of Professional Open Source +* Copyright 2005, JBoss Inc., and individual contributors as indicated +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ +package org.jboss.test.remoting.callback.sslsocketfactory; + +import java.net.InetAddress; +import java.net.ServerSocket; +import java.util.HashMap; +import java.util.Map; +import java.util.Set; + +import javax.management.MBeanServer; +import javax.net.ServerSocketFactory; +import javax.net.ssl.SSLServerSocket; +import javax.net.ssl.SSLServerSocketFactory; + +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.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.Callback; +import org.jboss.remoting.callback.HandleCallbackException; +import org.jboss.remoting.callback.InvokerCallbackHandler; +import org.jboss.remoting.security.SSLSocketBuilder; +import org.jboss.remoting.transport.Connector; +import org.jboss.remoting.transport.PortUtil; + + +abstract public class SSLSocketFactoryTestParent extends TestCase +{ + private static Logger log =3D Logger.getLogger(SSLSocketFactoryTestPare= nt.class); + = + private static boolean firstTime =3D 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 =3D false; + Logger.getLogger("org.jboss.remoting").setLevel(XLevel.INFO); + Logger.getLogger("org.jboss.test.remoting").setLevel(Level.INFO); + String pattern =3D "[%d{ABSOLUTE}] [%t] %5p (%F:%L) - %m%n"; + PatternLayout layout =3D new PatternLayout(pattern); + ConsoleAppender consoleAppender =3D new ConsoleAppender(layout); + Logger.getRootLogger().addAppender(consoleAppender); = + } + } + + = + public void tearDown() + { + } + = + = + public void testSSLServerSocketFactory() throws Throwable + { + log.info("entering " + getName()); + = + // Start server. + setupServer(); + = + // Create client. + InvokerLocator clientLocator =3D new InvokerLocator(locatorURI); + HashMap clientConfig =3D new HashMap(); + clientConfig.put(SSLSocketBuilder.REMOTING_TRUST_STORE_TYPE, "JKS"); + String trustStoreFilePath =3D this.getClass().getResource("truststor= e").getFile(); + clientConfig.put(SSLSocketBuilder.REMOTING_TRUST_STORE_FILE_PATH, tr= ustStoreFilePath); + clientConfig.put(SSLSocketBuilder.REMOTING_TRUST_STORE_PASSWORD, "un= it-tests-client"); + clientConfig.put(InvokerLocator.FORCE_REMOTE, "true"); + addExtraClientConfig(clientConfig); + Client client =3D new Client(clientLocator, clientConfig); + client.connect(); + log.info("client is connected"); + = + // Test connections. + assertEquals("abc", client.invoke("abc")); + log.info("connection is good"); + = + // Add callback listener. + TestCallbackHandler callbackHandler =3D new TestCallbackHandler(); + client.addListener(callbackHandler, null, null, true); + = + // Test callback SSLServerSocketFactory. + Set callbackConnectors =3D client.getCallbackConnectors(callbackHand= ler); + assertEquals(1, callbackConnectors.size()); + Connector callbackConnector =3D (Connector) callbackConnectors.itera= tor().next(); + ServerInvoker callbackServerInvoker =3D callbackConnector.getServerI= nvoker(); + ServerSocketFactory serverSocketFactory =3D callbackServerInvoker.ge= tServerSocketFactory(); + assertTrue(serverSocketFactory instanceof SSLServerSocketFactory); + InetAddress address =3D InetAddress.getLocalHost(); + int port =3D PortUtil.findFreePort(address.getHostAddress()); + ServerSocket serverSocket =3D serverSocketFactory.createServerSocke= t(port, 100, address); + SSLServerSocket sslServerSocket =3D (SSLServerSocket) serverSocket; + assertTrue(sslServerSocket.getUseClientMode()); + = + client.removeListener(callbackHandler); + client.disconnect(); + shutdownServer(); + log.info(getName() + " PASSES"); + } + = + = + abstract protected String getTransport(); + = + = + protected void addExtraClientConfig(Map config) {} + protected void addExtraServerConfig(Map config) {} + = + + protected void setupServer() throws Exception + { + host =3D InetAddress.getLocalHost().getHostAddress(); + port =3D PortUtil.findFreePort(host); + locatorURI =3D getTransport() + "://" + host + ":" + port; = + serverLocator =3D new InvokerLocator(locatorURI); + log.info("Starting remoting server with locator uri of: " + locatorU= RI); + HashMap config =3D new HashMap(); + config.put(SSLSocketBuilder.REMOTING_KEY_STORE_TYPE, "JKS"); + String keyStoreFilePath =3D this.getClass().getResource("keystore").= getFile(); + config.put(SSLSocketBuilder.REMOTING_KEY_STORE_FILE_PATH, keyStoreFi= lePath); + config.put(SSLSocketBuilder.REMOTING_KEY_STORE_PASSWORD, "unit-tests= -server"); + config.put(InvokerLocator.FORCE_REMOTE, "true"); + addExtraServerConfig(config); + connector =3D new Connector(serverLocator, config); + connector.create(); + invocationHandler =3D new TestInvocationHandler(); + connector.addInvocationHandler("test", invocationHandler); + connector.start(); + } + = + = + protected void shutdownServer() throws Exception + { + if (connector !=3D null) + connector.stop(); + } + = + = + static class TestInvocationHandler implements ServerInvocationHandler + { + public void addListener(InvokerCallbackHandler callbackHandler) {} + public Object invoke(final InvocationRequest invocation) throws Thro= wable + { + return invocation.getParameter(); + } + public void removeListener(InvokerCallbackHandler callbackHandler) {} + public void setMBeanServer(MBeanServer server) {} + public void setInvoker(ServerInvoker invoker) {} + } + = + = + static class TestCallbackHandler implements InvokerCallbackHandler + { + public void handleCallback(Callback callback) throws HandleCallbackE= xception + { + log.info("received callback"); + } = + } +} \ No newline at end of file Added: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/callback/ss= lsocketfactory/SSLSocketSSLSocketFactoryTestCase.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- remoting2/branches/2.x/src/tests/org/jboss/test/remoting/callback/sslso= cketfactory/SSLSocketSSLSocketFactoryTestCase.java = (rev 0) +++ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/callback/sslso= cketfactory/SSLSocketSSLSocketFactoryTestCase.java 2008-02-28 06:16:19 UTC = (rev 3535) @@ -0,0 +1,41 @@ +/* +* JBoss, Home of Professional Open Source +* Copyright 2005, JBoss Inc., and individual contributors as indicated +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ +package org.jboss.test.remoting.callback.sslsocketfactory; + + +/** + * Unit test for JBREM-522. + * = + * @author Ron Sigal + * @version $Revision: 1.1 $ + *

+ * Copyright Feb 27, 2008 + *

+ */ +public class SSLSocketSSLSocketFactoryTestCase extends SSLSocketFactoryTes= tParent +{ + protected String getTransport() + { + return "sslsocket"; + } +} + Added: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/callback/ss= lsocketfactory/keystore =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: remoting2/branches/2.x/src/tests/org/jboss/test/remoti= ng/callback/sslsocketfactory/keystore ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/callback/ss= lsocketfactory/truststore =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: remoting2/branches/2.x/src/tests/org/jboss/test/remoti= ng/callback/sslsocketfactory/truststore ___________________________________________________________________ Name: svn:mime-type + application/octet-stream --===============2775544188217038429==--