December 2009 - jboss-remoting-commits

JBoss Remoting SVN: r5628 - remoting2/branches/2.x/lib/jbossweb.

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

Author: ron.sigal(a)jboss.com Date: 2009-12-25 12:15:19 -0500 (Fri, 25 Dec 2009) New Revision: 5628 Modified: remoting2/branches/2.x/lib/jbossweb/README remoting2/branches/2.x/lib/jbossweb/jbossweb.jar Log: JBREM-1174: Downgraded jbossweb.jar to 2.1.3.GA. Modified: remoting2/branches/2.x/lib/jbossweb/README =================================================================== --- remoting2/branches/2.x/lib/jbossweb/README 2009-12-25 17:14:24 UTC (rev 5627) +++ remoting2/branches/2.x/lib/jbossweb/README 2009-12-25 17:15:19 UTC (rev 5628) @@ -1,3 +1,3 @@ File Version From ------- ------- ---- -jbossweb.jar 2.1.4.GA http://repository.jboss.com/maven2/jboss/web/jbossweb/2.1.4.GA/ +jbossweb.jar 2.1.3.GA http://repository.jboss.com/maven2/jboss/web/jbossweb/2.1.3.GA/ Modified: remoting2/branches/2.x/lib/jbossweb/jbossweb.jar =================================================================== (Binary files differ)

14 years, 5 months

1
0
0 / 0

JBoss Remoting SVN: r5627 - remoting2/branches/2.x/lib/jboss.

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

Author: ron.sigal(a)jboss.com Date: 2009-12-25 12:14:24 -0500 (Fri, 25 Dec 2009) New Revision: 5627 Modified: remoting2/branches/2.x/lib/jboss/README remoting2/branches/2.x/lib/jboss/jboss-common-core.jar Log: JBREM-1174: Updated jboss-common-core.jar to 2.2.16. Modified: remoting2/branches/2.x/lib/jboss/README =================================================================== --- remoting2/branches/2.x/lib/jboss/README 2009-12-25 02:14:42 UTC (rev 5626) +++ remoting2/branches/2.x/lib/jboss/README 2009-12-25 17:14:24 UTC (rev 5627) @@ -3,7 +3,7 @@ File Version From ------- ------- ---- -jboss-common-core.jar 2.2.15.GA http://repository.jboss.com/maven2/org/jboss/jboss-common-core/2.2.15.GA/ +jboss-common-core.jar 2.2.16.GA http://repository.jboss.com/maven2/org/jboss/jboss-common-core/2.2.16.GA/ jboss-j2se.jar 5.2.0.Beta1 build: SVNTag=JBoss_5_2_0_Beta1 date=200909162314 jboss-jmx.jar 5.2.0.Beta1 build: SVNTag=JBoss_5_2_0_Beta1 date=20090916231 jboss-logging-log4j.jar 2.1.0.GA http://repository.jboss.com/maven2/org/jboss/logging/jboss-logging-log4j/... Modified: remoting2/branches/2.x/lib/jboss/jboss-common-core.jar =================================================================== (Binary files differ)

14 years, 5 months

1
0
0 / 0

JBoss Remoting SVN: r5626 - in remoting2/branches/2.2/src/tests/org/jboss/test/remoting/ssl: emptystore and 1 other directory.

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

Author: ron.sigal(a)jboss.com Date: 2009-12-24 21:14:42 -0500 (Thu, 24 Dec 2009) New Revision: 5626 Added: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/ssl/emptystore/ remoting2/branches/2.2/src/tests/org/jboss/test/remoting/ssl/emptystore/EmptyStoreTestCase.java Log: JBREM-1172: New unit test. Added: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/ssl/emptystore/EmptyStoreTestCase.java =================================================================== --- remoting2/branches/2.2/src/tests/org/jboss/test/remoting/ssl/emptystore/EmptyStoreTestCase.java (rev 0) +++ remoting2/branches/2.2/src/tests/org/jboss/test/remoting/ssl/emptystore/EmptyStoreTestCase.java 2009-12-25 02:14:42 UTC (rev 5626) @@ -0,0 +1,119 @@ +/* +* 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.ssl.emptystore; + +import java.io.IOException; +import java.net.ServerSocket; +import java.net.Socket; +import java.util.HashMap; + +import javax.net.ServerSocketFactory; +import javax.net.SocketFactory; + +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.security.SSLSocketBuilder; + + +/** + * Unit test for JBREM-1172. + * + * @author <a href="mailto:ron.sigal@jboss.com">Ron Sigal</a> + * + * Copyright Dec 19, 2009 + * + * @version $Rev$ + */ +public class EmptyStoreTestCase extends TestCase +{ + private static Logger log = Logger.getLogger(EmptyStoreTestCase.class); + + private static boolean firstTime = true; + + + 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 testNONEKeyStore() throws Throwable + { + log.info("entering " + getName()); + + // Create SSLSocketBuilder. + HashMap config = new HashMap(); + config.put(SSLSocketBuilder.REMOTING_KEY_STORE_TYPE, "JKS"); + config.put(SSLSocketBuilder.REMOTING_KEY_STORE_FILE_PATH, "NONE"); + config.put(SSLSocketBuilder.REMOTING_KEY_STORE_PASSWORD, "dummy"); + config.put(SSLSocketBuilder.REMOTING_TRUST_STORE_TYPE, "JKS"); + config.put(SSLSocketBuilder.REMOTING_TRUST_STORE_FILE_PATH, "NONE"); + config.put(SSLSocketBuilder.REMOTING_TRUST_STORE_PASSWORD, "dummy"); + SSLSocketBuilder socketBuilder = new SSLSocketBuilder(config); + socketBuilder.setUseSSLServerSocketFactory(false); + socketBuilder.setUseSSLSocketFactory(false); + + // Create ServerSocket. + try + { + ServerSocketFactory ssf = socketBuilder.createSSLServerSocketFactory(); + ServerSocket ss = ssf.createServerSocket(); + ss.close(); + } + catch (IOException e) + { + fail("Unable to create ServerSocket"); + } + + // Create Socket. + try + { + SocketFactory sf = socketBuilder.createSSLSocketFactory(); + Socket s = sf.createSocket(); + s.close(); + } + catch (IOException e) + { + fail("Unable to create Socket"); + } + + log.info(getName() + " PASSES"); + } +} \ No newline at end of file

14 years, 5 months

1
0
0 / 0

JBoss Remoting SVN: r5625 - remoting2/branches/2.2/src/main/org/jboss/remoting/security.

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

Author: ron.sigal(a)jboss.com Date: 2009-12-24 21:13:13 -0500 (Thu, 24 Dec 2009) New Revision: 5625 Modified: remoting2/branches/2.2/src/main/org/jboss/remoting/security/SSLSocketBuilder.java Log: JBREM-1172: Can handle keystore / truststore URL set to "NONE". Modified: remoting2/branches/2.2/src/main/org/jboss/remoting/security/SSLSocketBuilder.java =================================================================== --- remoting2/branches/2.2/src/main/org/jboss/remoting/security/SSLSocketBuilder.java 2009-12-25 02:08:55 UTC (rev 5624) +++ remoting2/branches/2.2/src/main/org/jboss/remoting/security/SSLSocketBuilder.java 2009-12-25 02:13:13 UTC (rev 5625) @@ -229,6 +229,8 @@ * when not using custom config. */ public static final String REMOTING_DEFAULT_SOCKET_FACTORY_CLASS = "org.jboss.remoting.defaultSocketFactory"; + + public static final String NONE_STORE = "NONE"; private SSLContext sslContextServerSocketFactory = null; // context that builds the server socket factories private SSLContext sslContextSocketFactory = null; // context that builds the socket factories @@ -262,6 +264,19 @@ private boolean useSSLSocketFactory = true; private static final Logger log = Logger.getLogger(SSLSocketBuilder.class); + + private static URL NONE_STORE_URL; + + static + { + try + { + NONE_STORE_URL = new URL("file:NONE"); + } catch (MalformedURLException e) + { + log.info("unexpected URL exception", e); + } + } /** * Constructor for {@link SSLSocketBuilder} that does not have @@ -1536,13 +1551,18 @@ throw new NullStoreURLException("Can not find store file for url because store url is null."); } + URL url = storePathURL == NONE_STORE_URL ? null : storePathURL; + // now that keystore instance created, need to load data from file InputStream keyStoreInputStream = null; try { - keyStoreInputStream = storePathURL.openStream(); - + if (url != null) + { + keyStoreInputStream = url.openStream(); + } + // is ok for password to be null, as will just be used to check integrity of store char[] password = storePassword != null ? storePassword.toCharArray() : null; keyStore.load(keyStoreInputStream, password); @@ -1582,6 +1602,11 @@ */ protected URL validateStoreURL(String storePath) throws IOException { + if (storePath == NONE_STORE) + { + return NONE_STORE_URL; + } + URL url = null; // First see if this is a URL

14 years, 5 months

1
0
0 / 0

JBoss Remoting SVN: r5624 - in remoting2/branches/2.x/src/tests/org/jboss/test/remoting/ssl: emptystore and 1 other directory.

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

Author: ron.sigal(a)jboss.com Date: 2009-12-24 21:08:55 -0500 (Thu, 24 Dec 2009) New Revision: 5624 Added: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/ssl/emptystore/ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/ssl/emptystore/EmptyStoreTestCase.java Log: JBREM-1172: New unit test. Added: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/ssl/emptystore/EmptyStoreTestCase.java =================================================================== --- remoting2/branches/2.x/src/tests/org/jboss/test/remoting/ssl/emptystore/EmptyStoreTestCase.java (rev 0) +++ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/ssl/emptystore/EmptyStoreTestCase.java 2009-12-25 02:08:55 UTC (rev 5624) @@ -0,0 +1,119 @@ +/* +* 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.ssl.emptystore; + +import java.io.IOException; +import java.net.ServerSocket; +import java.net.Socket; +import java.util.HashMap; + +import javax.net.ServerSocketFactory; +import javax.net.SocketFactory; + +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.security.SSLSocketBuilder; + + +/** + * Unit test for JBREM-1172. + * + * @author <a href="mailto:ron.sigal@jboss.com">Ron Sigal</a> + * + * Copyright Dec 19, 2009 + * + * @version $Rev$ + */ +public class EmptyStoreTestCase extends TestCase +{ + private static Logger log = Logger.getLogger(EmptyStoreTestCase.class); + + private static boolean firstTime = true; + + + 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 testNONEKeyStore() throws Throwable + { + log.info("entering " + getName()); + + // Create SSLSocketBuilder. + HashMap config = new HashMap(); + config.put(SSLSocketBuilder.REMOTING_KEY_STORE_TYPE, "JKS"); + config.put(SSLSocketBuilder.REMOTING_KEY_STORE_FILE_PATH, "NONE"); + config.put(SSLSocketBuilder.REMOTING_KEY_STORE_PASSWORD, "dummy"); + config.put(SSLSocketBuilder.REMOTING_TRUST_STORE_TYPE, "JKS"); + config.put(SSLSocketBuilder.REMOTING_TRUST_STORE_FILE_PATH, "NONE"); + config.put(SSLSocketBuilder.REMOTING_TRUST_STORE_PASSWORD, "dummy"); + SSLSocketBuilder socketBuilder = new SSLSocketBuilder(config); + socketBuilder.setUseSSLServerSocketFactory(false); + socketBuilder.setUseSSLSocketFactory(false); + + // Create ServerSocket. + try + { + ServerSocketFactory ssf = socketBuilder.createSSLServerSocketFactory(); + ServerSocket ss = ssf.createServerSocket(); + ss.close(); + } + catch (IOException e) + { + fail("Unable to create ServerSocket"); + } + + // Create Socket. + try + { + SocketFactory sf = socketBuilder.createSSLSocketFactory(); + Socket s = sf.createSocket(); + s.close(); + } + catch (IOException e) + { + fail("Unable to create Socket"); + } + + log.info(getName() + " PASSES"); + } +} \ No newline at end of file

14 years, 5 months

1
0
0 / 0

JBoss Remoting SVN: r5623 - remoting2/branches/2.x/src/main/org/jboss/remoting/security.

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

Author: ron.sigal(a)jboss.com Date: 2009-12-24 21:07:29 -0500 (Thu, 24 Dec 2009) New Revision: 5623 Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/security/SSLSocketBuilder.java Log: JBREM-1172: Can handle keystore / truststore URL set to "NONE". Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/security/SSLSocketBuilder.java =================================================================== --- remoting2/branches/2.x/src/main/org/jboss/remoting/security/SSLSocketBuilder.java 2009-12-24 17:40:34 UTC (rev 5622) +++ remoting2/branches/2.x/src/main/org/jboss/remoting/security/SSLSocketBuilder.java 2009-12-25 02:07:29 UTC (rev 5623) @@ -234,6 +234,8 @@ * when not using custom config. */ public static final String REMOTING_DEFAULT_SOCKET_FACTORY_CLASS = "org.jboss.remoting.defaultSocketFactory"; + + public static final String NONE_STORE = "NONE"; private SSLContext sslContextServerSocketFactory = null; // context that builds the server socket factories private SSLContext sslContextSocketFactory = null; // context that builds the socket factories @@ -267,6 +269,19 @@ private boolean useSSLSocketFactory = true; private static final Logger log = Logger.getLogger(SSLSocketBuilder.class); + + private static URL NONE_STORE_URL; + + static + { + try + { + NONE_STORE_URL = new URL("file:NONE"); + } catch (MalformedURLException e) + { + log.info("unexpected URL exception", e); + } + } /** * Constructor for {@link SSLSocketBuilder} that does not have @@ -1550,13 +1565,18 @@ throw new NullStoreURLException("Can not find store file for url because store url is null."); } + URL url = storePathURL == NONE_STORE_URL ? null : storePathURL; + // now that keystore instance created, need to load data from file InputStream keyStoreInputStream = null; try { - keyStoreInputStream = storePathURL.openStream(); - + if (url != null) + { + keyStoreInputStream = url.openStream(); + } + // is ok for password to be null, as will just be used to check integrity of store char[] password = storePassword != null ? storePassword.toCharArray() : null; keyStore.load(keyStoreInputStream, password); @@ -1596,6 +1616,11 @@ */ protected URL validateStoreURL(String storePath) throws IOException { + if (storePath == NONE_STORE) + { + return NONE_STORE_URL; + } + URL url = null; // First see if this is a URL

14 years, 5 months

1
0
0 / 0

JBoss Remoting SVN: r5622 - remoting2/branches/2.x/src/tests/org/jboss/test/remoting/ipv6.

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

Author: ron.sigal(a)jboss.com Date: 2009-12-24 12:40:34 -0500 (Thu, 24 Dec 2009) New Revision: 5622 Modified: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/ipv6/IPv6HostWithNoBracketsTestCase.java Log: JBREM-1164: Skips tests with "%" field if jdk is version 1.4. Modified: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/ipv6/IPv6HostWithNoBracketsTestCase.java =================================================================== --- remoting2/branches/2.x/src/tests/org/jboss/test/remoting/ipv6/IPv6HostWithNoBracketsTestCase.java 2009-12-21 02:24:03 UTC (rev 5621) +++ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/ipv6/IPv6HostWithNoBracketsTestCase.java 2009-12-24 17:40:34 UTC (rev 5622) @@ -99,7 +99,15 @@ assertTrue(doXMLTest("0:0:0:0:0:0:0:1", ++port)); assertTrue(doXMLTest("0:0:0:0:0:0:127.0.0.1", ++port)); assertTrue(doXMLTest("3ffe:1900:4545:3:200:f8ff:fe21:67cf", ++port)); - assertTrue(doXMLTest("3ffe:1900:4545:3:200:f8ff:fe21:67cf%5", ++port)); + String version = System.getProperty("java.version"); + if (version.startsWith("1.4")) + { + log.info("java version is " + version + ". Skipping test"); + } + else + { + assertTrue(doXMLTest("3ffe:1900:4545:3:200:f8ff:fe21:67cf%5", ++port)); + } log.info(getName() + " PASSES"); } @@ -114,7 +122,15 @@ assertTrue(doXMLTest("[0:0:0:0:0:0:0:1]", ++port)); assertTrue(doXMLTest("[0:0:0:0:0:0:127.0.0.1]", ++port)); assertTrue(doXMLTest("[3ffe:1900:4545:3:200:f8ff:fe21:67cf]", ++port)); - assertTrue(doXMLTest("[3ffe:1900:4545:3:200:f8ff:fe21:67cf%5]", ++port)); + String version = System.getProperty("java.version"); + if (version.startsWith("1.4")) + { + log.info("java version is " + version + ". Skipping test"); + } + else + { + assertTrue(doXMLTest("[3ffe:1900:4545:3:200:f8ff:fe21:67cf%5]", ++port)); + } log.info(getName() + " PASSES"); } @@ -177,8 +193,16 @@ assertTrue(doServerConfigurationTest("0:0:0:0:0:0:0:1", ++port)); assertTrue(doServerConfigurationTest("0:0:0:0:0:0:127.0.0.1", ++port)); assertTrue(doServerConfigurationTest("3ffe:1900:4545:3:200:f8ff:fe21:67cf", ++port)); - assertTrue(doServerConfigurationTest("3ffe:1900:4545:3:200:f8ff:fe21:67cf%5", ++port)); - + String version = System.getProperty("java.version"); + if (version.startsWith("1.4")) + { + log.info("java version is " + version + ". Skipping test"); + } + else + { + assertTrue(doServerConfigurationTest("3ffe:1900:4545:3:200:f8ff:fe21:67cf%5", ++port)); + } + log.info(getName() + " PASSES"); } @@ -192,8 +216,16 @@ assertTrue(doServerConfigurationTest("[0:0:0:0:0:0:0:1]", ++port)); assertTrue(doServerConfigurationTest("[0:0:0:0:0:0:127.0.0.1]", ++port)); assertTrue(doServerConfigurationTest("[3ffe:1900:4545:3:200:f8ff:fe21:67cf]", ++port)); - assertTrue(doServerConfigurationTest("[3ffe:1900:4545:3:200:f8ff:fe21:67cf%5]", ++port)); - + String version = System.getProperty("java.version"); + if (version.startsWith("1.4")) + { + log.info("java version is " + version + ". Skipping test"); + } + else + { + assertTrue(doServerConfigurationTest("[3ffe:1900:4545:3:200:f8ff:fe21:67cf%5]", ++port)); + } + log.info(getName() + " PASSES"); }

14 years, 5 months

1
0
0 / 0

Hello, jboss-remoting-commits!

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

Good Day... I was wondering if you might like to chat with me? I found your profile online and would like to get to know you better. Please email me back Sydney(a)AceMailFast.com

14 years, 5 months

1
0
0 / 0

JBoss Remoting SVN: r5621 - remoting2/branches/2.2/src/tests/org/jboss/test/remoting/ipv6.

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

Author: ron.sigal(a)jboss.com Date: 2009-12-20 21:24:03 -0500 (Sun, 20 Dec 2009) New Revision: 5621 Added: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/ipv6/IPv6HostWithNoBracketsTestCase.java Log: JBREM-1164: New unit tests. Added: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/ipv6/IPv6HostWithNoBracketsTestCase.java =================================================================== --- remoting2/branches/2.2/src/tests/org/jboss/test/remoting/ipv6/IPv6HostWithNoBracketsTestCase.java (rev 0) +++ remoting2/branches/2.2/src/tests/org/jboss/test/remoting/ipv6/IPv6HostWithNoBracketsTestCase.java 2009-12-21 02:24:03 UTC (rev 5621) @@ -0,0 +1,245 @@ +/* + * 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.ipv6; + +import java.io.ByteArrayInputStream; +import java.net.InetAddress; +import java.net.UnknownHostException; + +import javax.management.MBeanServer; +import javax.xml.parsers.DocumentBuilderFactory; + +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.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.w3c.dom.Document; +import org.w3c.dom.Element; + + +/** + * Unit tests for JBREM-1164. + * + * @author <a href="mailto:bclare@tpg.com.au">Ben Clare</a> + * @author <a href="mailto:ron.sigal@jboss.com">Ron Sigal</a> + * + * @version $Rev$ + * + * Copyright Dec 20, 2009 + * + */ +public class IPv6HostWithNoBracketsTestCase extends TestCase +{ + private static Logger log = Logger.getLogger(IPv6HostWithNoBracketsTestCase.class); + private static boolean firstTime = true; + private static int port = 8080; + + + 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 testXMLWithoutBrackets() throws Throwable + { + log.info("entering " + getName()); + + assertTrue(doXMLTest("::", ++port)); + assertTrue(doXMLTest("::1", ++port)); + assertTrue(doXMLTest("0:0:0:0:0:0:0:1", ++port)); + assertTrue(doXMLTest("0:0:0:0:0:0:127.0.0.1", ++port)); + assertTrue(doXMLTest("3ffe:1900:4545:3:200:f8ff:fe21:67cf", ++port)); + assertTrue(doXMLTest("3ffe:1900:4545:3:200:f8ff:fe21:67cf%5", ++port)); + + log.info(getName() + " PASSES"); + } + + + public void testXMLWithBrackets() throws Throwable + { + log.info("entering " + getName()); + + assertTrue(doXMLTest("[::]", ++port)); + assertTrue(doXMLTest("[::1]", ++port)); + assertTrue(doXMLTest("[0:0:0:0:0:0:0:1]", ++port)); + assertTrue(doXMLTest("[0:0:0:0:0:0:127.0.0.1]", ++port)); + assertTrue(doXMLTest("[3ffe:1900:4545:3:200:f8ff:fe21:67cf]", ++port)); + assertTrue(doXMLTest("[3ffe:1900:4545:3:200:f8ff:fe21:67cf%5]", ++port)); + + log.info(getName() + " PASSES"); + } + + + public void testXMLWithoutHost() throws Exception + { + log.info("entering " + getName()); + + String xml = new StringBuffer() + .append("<mbean code=\"org.jboss.remoting.transport.Connector\"\n") + .append(" name=\"jboss.messaging:service=Connector,transport=socket\"\n") + .append(" display-name=\"Connector\">\n") + .append(" <attribute name=\"Configuration\">\n") + .append(" <config>\n") + .append(" <invoker transport=\"socket\">\n") + .append(" <attribute name=\"" + ServerInvoker.SERVER_BIND_PORT_KEY + "\">" + port + "</attribute>\n") + .append(" <attribute name=\"timeout\" isParam=\"true\">10000</attribute>\n") + .append(" </invoker>\n") + .append(" <handlers>\n") + .append(" <handler subsystem=\"test\">" + SampleInvocationHandler.class.getName() + "</handler>\n") + .append(" </handlers>\n") + .append(" </config>\n") + .append(" </attribute>\n") + .append("</mbean>\n").toString(); + Connector connector = new Connector(); + ByteArrayInputStream bais = new ByteArrayInputStream(xml.getBytes()); + Document doc = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(bais); + Element element = doc.getDocumentElement(); + connector.setConfiguration(element); + try + { + connector.create(); + InvokerLocator expected = new InvokerLocator("socket://" + getLocalHost() + ":" + port + "/?timeout=10000"); + InvokerLocator actual = connector.getLocator(); + log.info("Expected: " + expected); + log.info("Actual: " + actual);InetAddress.getLocalHost(); + assertEquals(expected, actual); + } + catch (Exception e) + { + log.error("Exception caught " + e.getMessage()); + } + finally + { + connector.stop(); + } + + log.info(getName() + " PASSES"); + } + + + protected boolean doXMLTest(String host, int port) throws Exception + { + String xml = new StringBuffer() + .append("<mbean code=\"org.jboss.remoting.transport.Connector\"\n") + .append(" name=\"jboss.messaging:service=Connector,transport=socket\"\n") + .append(" display-name=\"Connector\">\n") + .append(" <attribute name=\"Configuration\">\n") + .append(" <config>\n") + .append(" <invoker transport=\"socket\">\n") + .append(" <attribute name=\"" + ServerInvoker.SERVER_BIND_ADDRESS_KEY + "\">" + host + "</attribute>\n") + .append(" <attribute name=\"" + ServerInvoker.SERVER_BIND_PORT_KEY + "\">" + port + "</attribute>\n") + .append(" <attribute name=\"timeout\" isParam=\"true\">10000</attribute>\n") + .append(" </invoker>\n") + .append(" <handlers>\n") + .append(" <handler subsystem=\"test\">" + SampleInvocationHandler.class.getName() + "</handler>\n") + .append(" </handlers>\n") + .append(" </config>\n") + .append(" </attribute>\n") + .append("</mbean>\n").toString(); + Connector connector = new Connector(); + ByteArrayInputStream bais = new ByteArrayInputStream(xml.getBytes()); + Document doc = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(bais); + Element element = doc.getDocumentElement(); + connector.setConfiguration(element); + try + { + connector.create(); + InvokerLocator expected = new InvokerLocator("socket://" + fixHostnameForURL(host) + ":" + port + "/?timeout=10000"); + InvokerLocator actual = connector.getLocator(); + log.info("Expected: " + expected); + log.info("Actual: " + actual); + assertEquals(expected, actual); + return true; + } + catch (Exception e) + { + log.error("Exception caught ", e); + return false; + } + finally + { + connector.stop(); + } + } + + + static protected String fixHostnameForURL(String host) + { + if (host == null) + return host ; + + // if the hostname is an IPv6 literal, enclose it in brackets + if (host.indexOf(':') != -1 && host.indexOf("[") == -1) + { + System.out.println("HOST: [" + host + "]"); + return "[" + host + "]" ; + } + else + { + return host; + } + } + + + static protected String getLocalHost() throws UnknownHostException + { + System.setProperty("java.net.preferIPv6Addresses", "true"); + return InetAddress.getLocalHost().getHostAddress(); + } + + + public static class SampleInvocationHandler implements ServerInvocationHandler + { + public Object invoke(InvocationRequest invocation) throws Throwable + { + return invocation.getParameter(); + } + + public void addListener(InvokerCallbackHandler callbackHandler) {} + public void removeListener(InvokerCallbackHandler callbackHandler) {} + public void setMBeanServer(MBeanServer server) {} + public void setInvoker(ServerInvoker invoker) {} + } +} \ No newline at end of file

14 years, 5 months

1
0
0 / 0

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

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

Author: ron.sigal(a)jboss.com Date: 2009-12-20 21:23:29 -0500 (Sun, 20 Dec 2009) New Revision: 5620 Modified: remoting2/branches/2.2/src/main/org/jboss/remoting/transport/Connector.java Log: JBREM-1164: Adds brackets around IPv6 host addresses when it creates an InvokerLocator. Modified: remoting2/branches/2.2/src/main/org/jboss/remoting/transport/Connector.java =================================================================== --- remoting2/branches/2.2/src/main/org/jboss/remoting/transport/Connector.java 2009-12-21 02:16:24 UTC (rev 5619) +++ remoting2/branches/2.2/src/main/org/jboss/remoting/transport/Connector.java 2009-12-21 02:23:29 UTC (rev 5620) @@ -529,7 +529,7 @@ int port = clientConnectPort != null ? Integer.parseInt(clientConnectPort) : serverBindPort != null ? Integer.parseInt(serverBindPort) : PortUtil.findFreePort(serverBindAddress != null ? serverBindAddress : InetAddress.getLocalHost().getHostAddress()); // finally, let's bild the invoker uri - String tempURI = transport + "://" + host + ":" + port; + String tempURI = transport + "://" + fixHostnameForURL(host) + ":" + port; // append path if there is one if (path != null) @@ -572,6 +572,18 @@ } } + // adds enclosing brackets if an IPv6 literal address + private String fixHostnameForURL(String address) + { + if (address == null) + return address ; + + if (address.indexOf(':') != -1 && address.indexOf("[") == -1) + return "[" + address + "]" ; + else + return address ; + } + private void configureHandlers() throws Exception {

14 years, 5 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 December 2009