[jboss-remoting-commits] JBoss Remoting SVN: r6279 - in remoting2/branches/2.2.3-SP1_JBREM-1261_JBREM-1275: src/main/org/jboss/remoting/transport/bisocket and 9 other directories.

Author: jbertram(a)redhat.com Date: 2011-03-02 16:39:20 -0500 (Wed, 02 Mar 2011) New Revision: 6279 Added: remoting2/branches/2.2.3-SP1_JBREM-1261_JBREM-1275/src/tests/org/jboss/test/remoting/transport/bisocket/dos/ remoting2/branches/2.2.3-SP1_JBREM-1261_JBREM-1275/src/tests/org/jboss/test/remoting/transport/bisocket/dos/DosTestCase.java Removed: remoting2/branches/2.2.3-SP1_JBREM-1261_JBREM-1275/src/tests/org/jboss/test/remoting/transport/bisocket/dos/DosTestCase.java Modified: remoting2/branches/2.2.3-SP1_JBREM-1261_JBREM-1275/ remoting2/branches/2.2.3-SP1_JBREM-1261_JBREM-1275/src/main/org/jboss/remoting/transport/bisocket/Bisocket.java remoting2/branches/2.2.3-SP1_JBREM-1261_JBREM-1275/src/main/org/jboss/remoting/transport/bisocket/BisocketServerInvoker.java remoting2/branches/2.2.3-SP1_JBREM-1261_JBREM-1275/src/tests/org/jboss/test/remoting/connection/ConnectionValidatorTestCase.java remoting2/branches/2.2.3-SP1_JBREM-1261_JBREM-1275/src/tests/org/jboss/test/remoting/connection/params/ConnectionValidatorConfigurationTestCase.java remoting2/branches/2.2.3-SP1_JBREM-1261_JBREM-1275/src/tests/org/jboss/test/remoting/transport/http/marshal/HttpContentTypeTestCase.java remoting2/branches/2.2.3-SP1_JBREM-1261_JBREM-1275/src/tests/org/jboss/test/remoting/transport/servlet/marshal/config/ServletConfigurationMapTestClient.java remoting2/branches/2.2.3-SP1_JBREM-1261_JBREM-1275/src/tests/org/jboss/test/remoting/transport/servlet/marshal/config/WEB-INF/ remoting2/branches/2.2.3-SP1_JBREM-1261_JBREM-1275/src/tests/org/jboss/test/remoting/transport/servlet/marshal/config/remoting-servlet-service.xml remoting2/branches/2.2.3-SP1_JBREM-1261_JBREM-1275/src/tests/org/jboss/test/remoting/transport/servlet/remoting-servlet-service.xml remoting2/branches/2.2.3-SP1_JBREM-1261_JBREM-1275/src/tests/org/jboss/test/remoting/transport/servlet/ssl/keystore remoting2/branches/2.2.3-SP1_JBREM-1261_JBREM-1275/src/tests/org/jboss/test/remoting/transport/servlet/ssl/remoting-sslservlet-service.xml remoting2/branches/2.2.3-SP1_JBREM-1261_JBREM-1275/src/tests/org/jboss/test/remoting/transport/servlet/ssl/truststore Log: JBPAPP-6010 Property changes on: remoting2/branches/2.2.3-SP1_JBREM-1261_JBREM-1275 ___________________________________________________________________ Added: svn:mergeinfo + /remoting2/branches/2.2:6177-6178,6253,6261-6263,6266-6267,6271-6273 Modified: remoting2/branches/2.2.3-SP1_JBREM-1261_JBREM-1275/src/main/org/jboss/remoting/transport/bisocket/Bisocket.java =================================================================== --- remoting2/branches/2.2.3-SP1_JBREM-1261_JBREM-1275/src/main/org/jboss/remoting/transport/bisocket/Bisocket.java 2011-03-02 20:58:05 UTC (rev 6278) +++ remoting2/branches/2.2.3-SP1_JBREM-1261_JBREM-1275/src/main/org/jboss/remoting/transport/bisocket/Bisocket.java 2011-03-02 21:39:20 UTC (rev 6279) @@ -53,7 +53,7 @@ */ public static final String PING_WINDOW_FACTOR = "pingWindowFactor"; public static final int PING_WINDOW_FACTOR_DEFAULT = 2; - + /** * Configuration key and default value for number of retries * BisocketServerInvoker.ControlConnectionThread and @@ -76,4 +76,13 @@ */ public static final String SECONDARY_BIND_PORT = "secondaryBindPort"; public static final String SECONDARY_CONNECT_PORT = "secondaryConnectPort"; + + /** + * Configuration keys and default values for parameters related to DOS attack + * on BisocketServerInvoker.SecondaryServerSocketThread + */ + public static final String SECONDARY_MAX_THREADS = "secondaryMaxThreads"; + public static final String SECONDARY_TIMEOUT = "secondaryTimeout"; + public static final int SECONDARY_MAX_THREADS_DEFAULT = 50; + public static final int SECONDARY_TIMEOUT_DEFAULT = 60000; } Modified: remoting2/branches/2.2.3-SP1_JBREM-1261_JBREM-1275/src/main/org/jboss/remoting/transport/bisocket/BisocketServerInvoker.java =================================================================== --- remoting2/branches/2.2.3-SP1_JBREM-1261_JBREM-1275/src/main/org/jboss/remoting/transport/bisocket/BisocketServerInvoker.java 2011-03-02 20:58:05 UTC (rev 6278) +++ remoting2/branches/2.2.3-SP1_JBREM-1261_JBREM-1275/src/main/org/jboss/remoting/transport/bisocket/BisocketServerInvoker.java 2011-03-02 21:39:20 UTC (rev 6279) @@ -53,7 +53,9 @@ import org.jboss.remoting.transport.socket.SocketServerInvoker; import org.jboss.logging.Logger; +import EDU.oswego.cs.dl.util.concurrent.Semaphore; + /** * * @author <a href=&quot;ron.sigal(a)jboss.com&quot;&gt;Ron Sigal</a> @@ -85,6 +87,8 @@ protected boolean isCallbackServer = false; protected int secondaryBindPort = -1; protected int secondaryConnectPort = -1; + protected int dosMaxThreads = Bisocket.SECONDARY_MAX_THREADS_DEFAULT; + protected int dosTimeout = Bisocket.SECONDARY_TIMEOUT_DEFAULT; public static BisocketServerInvoker getBisocketServerInvoker(String listenerId) @@ -358,6 +362,30 @@ } + public int getDosMaxThreads() + { + return dosMaxThreads; + } + + + public void setDosMaxThreads(int dosMaxThreads) + { + this.dosMaxThreads = dosMaxThreads; + } + + + public int getDosTimeout() + { + return dosTimeout; + } + + + public void setDosTimeout(int dosTimeout) + { + this.dosTimeout = dosTimeout; + } + + public int getPingFrequency() { return pingFrequency; @@ -509,6 +537,42 @@ log.warn("\"" + Bisocket.SECONDARY_CONNECT_PORT + "\" must be specified as a String"); } + o = configuration.get(Bisocket.SECONDARY_MAX_THREADS); + if (o instanceof String && ((String) o).length() > 0) + { + try + { + dosMaxThreads = Integer.valueOf(((String) o)).intValue(); + log.debug(this + " setting dosMaxThreads to " + dosMaxThreads); + } + catch (NumberFormatException e) + { + log.warn("Invalid format for " + "\"" + Bisocket.SECONDARY_MAX_THREADS + "\": " + o); + } + } + else if (o != null) + { + log.warn("\"" + Bisocket.SECONDARY_MAX_THREADS + "\" must be specified as a String"); + } + + o = configuration.get(Bisocket.SECONDARY_TIMEOUT); + if (o instanceof String && ((String) o).length() > 0) + { + try + { + dosTimeout = Integer.valueOf(((String) o)).intValue(); + log.debug(this + " setting dosTimeout to " + dosTimeout); + } + catch (NumberFormatException e) + { + log.warn("Invalid format for " + "\"" + Bisocket.SECONDARY_TIMEOUT + "\": " + o); + } + } + else if (o != null) + { + log.warn("\"" + Bisocket.SECONDARY_TIMEOUT + "\" must be specified as a String"); + } + if (isCallbackServer) { socketFactory = createSocketFactory(configuration); @@ -861,6 +925,8 @@ { private ServerSocket secondaryServerSocket; boolean running = true; + Semaphore maxThreads = new Semaphore(dosMaxThreads); + int localDosTimeout = dosTimeout; SecondaryServerSocketThread(ServerSocket secondaryServerSocket) throws IOException { @@ -881,41 +947,7 @@ { Socket socket = secondaryServerSocket.accept(); if (log.isTraceEnabled()) log.trace("accepted: " + socket); - DataInputStream dis = new DataInputStream(socket.getInputStream()); - int action = dis.read(); - String listenerId = dis.readUTF(); - - switch (action) - { - case Bisocket.CREATE_CONTROL_SOCKET: - BisocketClientInvoker.transferSocket(listenerId, socket, true); - if (log.isTraceEnabled()) - log.trace("SecondaryServerSocketThread: created control socket: (" + socket + ")"+ listenerId); - break; - - case Bisocket.RECREATE_CONTROL_SOCKET: - BisocketClientInvoker invoker = BisocketClientInvoker.getBisocketCallbackClientInvoker(listenerId); - if (invoker == null) - { - log.error("received new control socket for unrecognized listenerId: " + listenerId); - } - else - { - invoker.replaceControlSocket(socket); - if (log.isTraceEnabled()) - log.trace("SecondaryServerSocketThread: recreated control socket: " + listenerId); - } - break; - - case Bisocket.CREATE_ORDINARY_SOCKET: - BisocketClientInvoker.transferSocket(listenerId, socket, false); - if (log.isTraceEnabled()) - log.trace("SecondaryServerSocketThread: transferred socket: " + listenerId); - break; - - default: - log.error("unrecognized action on SecondaryServerSocketThread: " + action); - } + processSocket(socket); } catch (IOException e) { @@ -928,6 +960,86 @@ } } + void processSocket(final Socket socket) throws IOException + { + while (true) + { + try + { + maxThreads.acquire(); + break; + } + catch (InterruptedException e1) + { + log.trace("unexpected interrupt"); + } + } + + new Thread() + { + public void run() + { + setName("processSocketThread: " + socket); + if (log.isTraceEnabled()) log.trace(this + " processing socket: " + socket); + try + { + socket.setSoTimeout(localDosTimeout); + DataInputStream dis = new DataInputStream(socket.getInputStream()); + int action = dis.read(); + String listenerId = dis.readUTF(); + + switch (action) + { + case Bisocket.CREATE_CONTROL_SOCKET: + BisocketClientInvoker.transferSocket(listenerId, socket, true); + if (log.isTraceEnabled()) + log.trace("SecondaryServerSocketThread: created control socket: (" + socket + ")"+ listenerId); + break; + + case Bisocket.RECREATE_CONTROL_SOCKET: + BisocketClientInvoker invoker = BisocketClientInvoker.getBisocketCallbackClientInvoker(listenerId); + if (invoker == null) + { + log.debug("received new control socket for unrecognized listenerId: " + listenerId); + } + else + { + invoker.replaceControlSocket(socket); + if (log.isTraceEnabled()) + log.trace("SecondaryServerSocketThread: recreated control socket: " + listenerId); + } + break; + + case Bisocket.CREATE_ORDINARY_SOCKET: + BisocketClientInvoker.transferSocket(listenerId, socket, false); + if (log.isTraceEnabled()) + log.trace("SecondaryServerSocketThread: transferred socket: " + listenerId); + break; + + default: + log.error("unrecognized action on SecondaryServerSocketThread: " + action); + } + } + catch (IOException e) + { + if (running) + { + log.error(this + " unable to process socket", e); + } + else + { + log.debug(this + " unable to process socket", e); + } + } + finally + { + if (log.isTraceEnabled()) log.trace(this + " processed socket: " + socket); + maxThreads.release(); + } + } + }.start(); + } + ServerSocket getServerSocket() { return secondaryServerSocket; Property changes on: remoting2/branches/2.2.3-SP1_JBREM-1261_JBREM-1275/src/tests/org/jboss/test/remoting/connection/ConnectionValidatorTestCase.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: remoting2/branches/2.2.3-SP1_JBREM-1261_JBREM-1275/src/tests/org/jboss/test/remoting/connection/params/ConnectionValidatorConfigurationTestCase.java ___________________________________________________________________ Deleted: svn:mergeinfo - Deleted: remoting2/branches/2.2.3-SP1_JBREM-1261_JBREM-1275/src/tests/org/jboss/test/remoting/transport/bisocket/dos/DosTestCase.java =================================================================== --- remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/bisocket/dos/DosTestCase.java 2010-12-18 02:23:26 UTC (rev 6178) +++ remoting2/branches/2.2.3-SP1_JBREM-1261_JBREM-1275/src/tests/org/jboss/test/remoting/transport/bisocket/dos/DosTestCase.java 2011-03-02 21:39:20 UTC (rev 6279) @@ -1,287 +0,0 @@ -/* -* 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.bisocket.dos; - -import java.io.IOException; -import java.net.InetAddress; -import java.net.Socket; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.Map; -import java.util.Set; - -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.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.transport.Connector; -import org.jboss.remoting.transport.PortUtil; -import org.jboss.remoting.transport.bisocket.Bisocket; - -/** - * @author <a href="mailto:ron.sigal@jboss.com">Ron Sigal</a> - * @version $Rev$ - * <p> - * Copyright Oct 13, 2010 - * </p> - */ -public class DosTestCase extends TestCase -{ - private static final Logger log = Logger.getLogger(DosTestCase.class); - private static final String CALLBACK_TEST = "callbackTest"; - - private static boolean firstTime = true; - - protected String host; - protected int port; - protected int secondaryPort; - protected String locatorURI; - protected InvokerLocator serverLocator; - protected Connector connector; - protected TestInvocationHandler invocationHandler; - protected Object lock = new Object(); - protected boolean dosAttackThreadRan; - protected boolean secondCallbackRan; - - - 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 testDosAttack() throws Throwable - { - log.info("entering " + getName()); - - // Start server. - setupServer(); - - // Create client. - HashMap clientConfig = new HashMap(); - clientConfig.put(InvokerLocator.FORCE_REMOTE, "true"); - addExtraClientConfig(clientConfig); - final Client client = new Client(serverLocator, clientConfig); - client.connect(); - assertEquals("abc", client.invoke("abc")); - log.info("client is connected"); - - // Add callback handler. - TestCallbackHandler callbackHandler = new TestCallbackHandler(); - HashMap metadata = new HashMap(); - metadata.put(Bisocket.IS_CALLBACK_SERVER, "true"); - client.addListener(callbackHandler, metadata); - client.invoke(CALLBACK_TEST); - assertEquals(1, callbackHandler.counter); - log.info("callback handler is installed"); - - // Test DOS attack. - new Thread() - { - public void run() - { - try - { - Socket s = new Socket(host, secondaryPort); - log.info(this + " created socket " + s); - synchronized (lock) - { - dosAttackThreadRan = true; - } - } - catch (IOException e) - { - log.error("unable to connect to secondaryPort: " + secondaryPort, e); - } - finally - { - synchronized (lock) - { - lock.notifyAll(); - } - } - } - }.start(); - - Thread.sleep(2000); - - synchronized (lock) - { - if (!dosAttackThreadRan) - { - long start = System.currentTimeMillis(); - long end = start + 10000; - while (end - System.currentTimeMillis() > 0) - { - try - { - lock.wait(end - System.currentTimeMillis()); - } - catch (InterruptedException e){ - - } - } - } - } - - if (!dosAttackThreadRan) - { - fail("DOS attack thread did not run"); - } - - - // DOS attack has occurred. Try to add another callback handler. - new Thread() - { - public void run() - { - TestCallbackHandler callbackHandler2 = new TestCallbackHandler(); - try - { - - HashMap metadata = new HashMap(); - metadata.put(Bisocket.IS_CALLBACK_SERVER, "true"); - client.addListener(callbackHandler2, metadata); - secondCallbackRan = true; - log.info(this + " second callback handler installed after DOS attack"); - } - catch (Throwable e) - { - log.info(this + " second callback failed", e); - } - } - }.start(); - - Thread.sleep(10000); - assertTrue(secondCallbackRan); - - client.removeListener(callbackHandler); - client.disconnect(); - connector.stop(); - } - - protected String getTransport() - { - return "bisocket"; - } - - - protected void addExtraClientConfig(Map config) {} - protected void addExtraServerConfig(Map config) {} - - - protected void setupServer() throws Exception - { - host = InetAddress.getLocalHost().getHostAddress(); - port = PortUtil.findFreePort(host); - secondaryPort = PortUtil.findFreePort(host); - locatorURI = getTransport() + "://" + host + ":" + port + "/?secondaryBindPort=" + secondaryPort; - 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 Set listeners = new HashSet(); - - public void addListener(InvokerCallbackHandler callbackHandler) - { - listeners.add(callbackHandler); - } - public Object invoke(final InvocationRequest invocation) throws Throwable - { - if (CALLBACK_TEST.equals(invocation.getParameter())) - { - Iterator it = listeners.iterator(); - while (it.hasNext()) - { - InvokerCallbackHandler handler = (InvokerCallbackHandler) it.next(); - handler.handleCallback(new Callback("test")); - log.info(this + " sent callback"); - } - } - return invocation.getParameter(); - } - public void removeListener(InvokerCallbackHandler callbackHandler) {} - public void setMBeanServer(MBeanServer server) {} - public void setInvoker(ServerInvoker invoker) {} - } - - static class TestCallbackHandler implements InvokerCallbackHandler - { - public int counter; - - public void handleCallback(Callback callback) throws HandleCallbackException - { - log.info(this + " received callback"); - counter++; - } - } -} \ No newline at end of file Copied: remoting2/branches/2.2.3-SP1_JBREM-1261_JBREM-1275/src/tests/org/jboss/test/remoting/transport/bisocket/dos/DosTestCase.java (from rev 6178, remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/bisocket/dos/DosTestCase.java) =================================================================== --- remoting2/branches/2.2.3-SP1_JBREM-1261_JBREM-1275/src/tests/org/jboss/test/remoting/transport/bisocket/dos/DosTestCase.java (rev 0) +++ remoting2/branches/2.2.3-SP1_JBREM-1261_JBREM-1275/src/tests/org/jboss/test/remoting/transport/bisocket/dos/DosTestCase.java 2011-03-02 21:39:20 UTC (rev 6279) @@ -0,0 +1,392 @@ +/* +* 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.bisocket.dos; + +import java.io.IOException; +import java.lang.reflect.Field; +import java.net.InetAddress; +import java.net.Socket; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.Map; +import java.util.Set; + +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.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.transport.Connector; +import org.jboss.remoting.transport.PortUtil; +import org.jboss.remoting.transport.bisocket.Bisocket; +import org.jboss.remoting.transport.bisocket.BisocketServerInvoker; + +import EDU.oswego.cs.dl.util.concurrent.Semaphore; + +/** + * @author <a href="mailto:ron.sigal@jboss.com">Ron Sigal</a> + * @version $Rev$ + * <p> + * Copyright Oct 13, 2010 + * </p> + */ +public class DosTestCase extends TestCase +{ + private static final Logger log = Logger.getLogger(DosTestCase.class); + private static final String CALLBACK_TEST = "callbackTest"; + private static final int dosMaxThreadsValue = 49; + private static final int dosTimeoutValue = 59; + + private static boolean firstTime = true; + + protected String host; + protected int port; + protected int secondaryPort; + protected String locatorURI; + protected InvokerLocator serverLocator; + protected Connector connector; + protected TestInvocationHandler invocationHandler; + protected Object lock = new Object(); + protected boolean dosAttackThreadRan; + protected boolean secondCallbackRan; + + + 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 testDosAttack() throws Throwable + { + log.info("entering " + getName()); + + // Start server. + setupServer(false, false); + + // Create client. + HashMap clientConfig = new HashMap(); + clientConfig.put(InvokerLocator.FORCE_REMOTE, "true"); + addExtraClientConfig(clientConfig); + final Client client = new Client(serverLocator, clientConfig); + client.connect(); + assertEquals("abc", client.invoke("abc")); + log.info("client is connected"); + + // Add callback handler. + TestCallbackHandler callbackHandler = new TestCallbackHandler(); + HashMap metadata = new HashMap(); + metadata.put(Bisocket.IS_CALLBACK_SERVER, "true"); + client.addListener(callbackHandler, metadata); + client.invoke(CALLBACK_TEST); + assertEquals(1, callbackHandler.counter); + log.info("callback handler is installed"); + + // Test DOS attack. + new Thread() + { + public void run() + { + try + { + Socket s = new Socket(host, secondaryPort); + log.info(this + " created socket " + s); + synchronized (lock) + { + dosAttackThreadRan = true; + } + } + catch (IOException e) + { + log.error("unable to connect to secondaryPort: " + secondaryPort, e); + } + finally + { + synchronized (lock) + { + lock.notifyAll(); + } + } + } + }.start(); + + Thread.sleep(2000); + + synchronized (lock) + { + if (!dosAttackThreadRan) + { + long start = System.currentTimeMillis(); + long end = start + 10000; + while (end - System.currentTimeMillis() > 0) + { + try + { + lock.wait(end - System.currentTimeMillis()); + } + catch (InterruptedException e){ + + } + } + } + } + + if (!dosAttackThreadRan) + { + fail("DOS attack thread did not run"); + } + + + // DOS attack has occurred. Try to add another callback handler. + new Thread() + { + public void run() + { + TestCallbackHandler callbackHandler2 = new TestCallbackHandler(); + try + { + + HashMap metadata = new HashMap(); + metadata.put(Bisocket.IS_CALLBACK_SERVER, "true"); + client.addListener(callbackHandler2, metadata); + secondCallbackRan = true; + log.info(this + " second callback handler installed after DOS attack"); + } + catch (Throwable e) + { + log.info(this + " second callback failed", e); + } + } + }.start(); + + Thread.sleep(10000); + assertTrue(secondCallbackRan); + + client.removeListener(callbackHandler); + client.disconnect(); + connector.stop(); + } + + + public void testConfigurationDefault() throws Throwable + { + log.info("entering " + getName()); + doConfigurationTest(false, false, Bisocket.SECONDARY_MAX_THREADS_DEFAULT, Bisocket.SECONDARY_TIMEOUT_DEFAULT); + log.info(getName() + " PASSES"); + } + + + public void testConfigurationMap() throws Throwable + { + log.info("entering " + getName()); + doConfigurationTest(true, false, dosMaxThreadsValue, dosTimeoutValue); + log.info(getName() + " PASSES"); + } + + + public void testConfigurationInvokerLocater() throws Throwable + { + log.info("entering " + getName()); + doConfigurationTest(true, true, dosMaxThreadsValue, dosTimeoutValue); + log.info(getName() + " PASSES"); + } + + + protected void doConfigurationTest(boolean setParameters, boolean useInvokerLocator, int threadCount, int timeout) throws Throwable + { + // Start server. + setupServer(setParameters, useInvokerLocator); + + // Create client. + HashMap clientConfig = new HashMap(); + clientConfig.put(InvokerLocator.FORCE_REMOTE, "true"); + addExtraClientConfig(clientConfig); + final Client client = new Client(serverLocator, clientConfig); + client.connect(); + assertEquals("abc", client.invoke("abc")); + log.info("client is connected"); + + // Add callback handler. + TestCallbackHandler callbackHandler = new TestCallbackHandler(); + HashMap metadata = new HashMap(); + metadata.put(Bisocket.IS_CALLBACK_SERVER, "true"); + client.addListener(callbackHandler, metadata); + client.invoke(CALLBACK_TEST); + assertEquals(1, callbackHandler.counter); + log.info("callback handler is installed"); + + BisocketServerInvoker invoker = (BisocketServerInvoker) connector.getServerInvoker(); + assertEquals(threadCount, invoker.getDosMaxThreads()); + assertEquals(timeout, invoker.getDosTimeout()); + verifyThreadValues(invoker, threadCount, timeout); + + client.removeListener(callbackHandler); + client.disconnect(); + connector.stop(); + } + + + protected boolean verifyThreadValues(ServerInvoker invoker, int threadCount, int timeout) throws Exception + { + Class[] classes = BisocketServerInvoker.class.getDeclaredClasses(); + Class threadClass = null; + for (int i = 0; i < classes.length; i++) + { + if (classes[i].getName().indexOf("SecondaryServerSocketThread") > -1) + { + threadClass = classes[i]; + break; + } + } + log.info("threadClass: " + threadClass); + Field field = BisocketServerInvoker.class.getDeclaredField("secondaryServerSocketThread"); + field.setAccessible(true); + Thread secondaryServerSocketThread = (Thread) field.get(invoker); + Field maxThreads = threadClass.getDeclaredField("maxThreads"); + maxThreads.setAccessible(true); + Field localDosTimeout = threadClass.getDeclaredField("localDosTimeout"); + localDosTimeout.setAccessible(true); + + assertEquals(threadCount, ((Semaphore)maxThreads.get(secondaryServerSocketThread)).permits()); + assertEquals(timeout, ((Integer)localDosTimeout.get(secondaryServerSocketThread)).intValue()); + return true; + } + + + protected String getTransport() + { + return "bisocket"; + } + + + protected void addExtraClientConfig(Map config) {} + protected void addExtraServerConfig(Map config) {} + + + protected void setupServer(boolean setParameters, boolean useInvokerLocator) throws Exception + { + host = InetAddress.getLocalHost().getHostAddress(); + port = PortUtil.findFreePort(host); + secondaryPort = PortUtil.findFreePort(host); + locatorURI = getTransport() + "://" + host + ":" + port + "/?secondaryBindPort=" + secondaryPort; + String metadata = System.getProperty("remoting.metadata"); + if (metadata != null) + { + locatorURI += "&" + metadata; + } + HashMap config = new HashMap(); + config.put(InvokerLocator.FORCE_REMOTE, "true"); + addExtraServerConfig(config); + if (setParameters) + { + if (useInvokerLocator) + { + locatorURI += "&" + Bisocket.SECONDARY_MAX_THREADS + "=" + Integer.toString(dosMaxThreadsValue); + locatorURI += "&" + Bisocket.SECONDARY_TIMEOUT + "=" + Integer.toString(dosTimeoutValue); + } + else + { + config.put(Bisocket.SECONDARY_MAX_THREADS, Integer.toString(dosMaxThreadsValue)); + config.put(Bisocket.SECONDARY_TIMEOUT, Integer.toString(dosTimeoutValue)); + } + } + serverLocator = new InvokerLocator(locatorURI); + log.info("Starting remoting server with locator uri of: " + locatorURI); + 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 Set listeners = new HashSet(); + + public void addListener(InvokerCallbackHandler callbackHandler) + { + listeners.add(callbackHandler); + } + public Object invoke(final InvocationRequest invocation) throws Throwable + { + if (CALLBACK_TEST.equals(invocation.getParameter())) + { + Iterator it = listeners.iterator(); + while (it.hasNext()) + { + InvokerCallbackHandler handler = (InvokerCallbackHandler) it.next(); + handler.handleCallback(new Callback("test")); + log.info(this + " sent callback"); + } + } + return invocation.getParameter(); + } + public void removeListener(InvokerCallbackHandler callbackHandler) {} + public void setMBeanServer(MBeanServer server) {} + public void setInvoker(ServerInvoker invoker) {} + } + + static class TestCallbackHandler implements InvokerCallbackHandler + { + public int counter; + + public void handleCallback(Callback callback) throws HandleCallbackException + { + log.info(this + " received callback"); + counter++; + } + } +} \ No newline at end of file Property changes on: remoting2/branches/2.2.3-SP1_JBREM-1261_JBREM-1275/src/tests/org/jboss/test/remoting/transport/http/marshal/HttpContentTypeTestCase.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: remoting2/branches/2.2.3-SP1_JBREM-1261_JBREM-1275/src/tests/org/jboss/test/remoting/transport/servlet/marshal/config/ServletConfigurationMapTestClient.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: remoting2/branches/2.2.3-SP1_JBREM-1261_JBREM-1275/src/tests/org/jboss/test/remoting/transport/servlet/marshal/config/WEB-INF ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: remoting2/branches/2.2.3-SP1_JBREM-1261_JBREM-1275/src/tests/org/jboss/test/remoting/transport/servlet/marshal/config/remoting-servlet-service.xml ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: remoting2/branches/2.2.3-SP1_JBREM-1261_JBREM-1275/src/tests/org/jboss/test/remoting/transport/servlet/remoting-servlet-service.xml ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: remoting2/branches/2.2.3-SP1_JBREM-1261_JBREM-1275/src/tests/org/jboss/test/remoting/transport/servlet/ssl/keystore ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: remoting2/branches/2.2.3-SP1_JBREM-1261_JBREM-1275/src/tests/org/jboss/test/remoting/transport/servlet/ssl/remoting-sslservlet-service.xml ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: remoting2/branches/2.2.3-SP1_JBREM-1261_JBREM-1275/src/tests/org/jboss/test/remoting/transport/servlet/ssl/truststore ___________________________________________________________________ Deleted: svn:mergeinfo -