Author: jbertram(a)redhat.com Date: 2011-04-25 10:48:31 -0400 (Mon, 25 Apr 2011) New Revision: 6333 Modified: remoting2/branches/2.2.3-SP1_JBREM-1269_JBREM-1275_JBREM-1261_JBREM-1277_JBREM-1280_JBREM-1281/ remoting2/branches/2.2.3-SP1_JBREM-1269_JBREM-1275_JBREM-1261_JBREM-1277_JBREM-1280_JBREM-1281/src/main/org/jboss/remoting/transport/bisocket/Bisocket.java remoting2/branches/2.2.3-SP1_JBREM-1269_JBREM-1275_JBREM-1261_JBREM-1277_JBREM-1280_JBREM-1281/src/main/org/jboss/remoting/transport/bisocket/BisocketServerInvoker.java remoting2/branches/2.2.3-SP1_JBREM-1269_JBREM-1275_JBREM-1261_JBREM-1277_JBREM-1280_JBREM-1281/src/tests/org/jboss/test/remoting/transport/bisocket/dos/DosTestCase.java Log: JBPAPP-6352 Property changes on: remoting2/branches/2.2.3-SP1_JBREM-1269_JBREM-1275_JBREM-1261_JBREM-1277_JBREM-1280_JBREM-1281 ___________________________________________________________________ Modified: svn:mergeinfo - /remoting2/branches/2.2:6177-6178,6226,6253,6266-6267,6271-6273,6281-6284,6291-6292,6297,6313-6320,6322-6324 + /remoting2/branches/2.2:6177-6178,6226,6253,6261-6263,6266-6267,6271-6273,6281-6284,6291-6292,6297,6313-6320,6322-6324 Modified: remoting2/branches/2.2.3-SP1_JBREM-1269_JBREM-1275_JBREM-1261_JBREM-1277_JBREM-1280_JBREM-1281/src/main/org/jboss/remoting/transport/bisocket/Bisocket.java =================================================================== --- remoting2/branches/2.2.3-SP1_JBREM-1269_JBREM-1275_JBREM-1261_JBREM-1277_JBREM-1280_JBREM-1281/src/main/org/jboss/remoting/transport/bisocket/Bisocket.java 2011-04-19 03:12:07 UTC (rev 6332) +++ remoting2/branches/2.2.3-SP1_JBREM-1269_JBREM-1275_JBREM-1261_JBREM-1277_JBREM-1280_JBREM-1281/src/main/org/jboss/remoting/transport/bisocket/Bisocket.java 2011-04-25 14:48:31 UTC (rev 6333) @@ -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 @@ -78,11 +78,11 @@ public static final String SECONDARY_CONNECT_PORT = "secondaryConnectPort"; /** - * Configuration keys and default values for parameters related to DOS attack + * Configuration keys and default valuesfor 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; + public static final String DOS_MAX_THREADS = "dosMaxThreads"; + public static final String DOS_TIMEOUT = "dosTimeout"; + public static final int DOS_MAX_THREADS_DEFAULT = 50; + public static final int DOS_TIMEOUT_DEFAULT = 60; } Modified: remoting2/branches/2.2.3-SP1_JBREM-1269_JBREM-1275_JBREM-1261_JBREM-1277_JBREM-1280_JBREM-1281/src/main/org/jboss/remoting/transport/bisocket/BisocketServerInvoker.java =================================================================== --- remoting2/branches/2.2.3-SP1_JBREM-1269_JBREM-1275_JBREM-1261_JBREM-1277_JBREM-1280_JBREM-1281/src/main/org/jboss/remoting/transport/bisocket/BisocketServerInvoker.java 2011-04-19 03:12:07 UTC (rev 6332) +++ remoting2/branches/2.2.3-SP1_JBREM-1269_JBREM-1275_JBREM-1261_JBREM-1277_JBREM-1280_JBREM-1281/src/main/org/jboss/remoting/transport/bisocket/BisocketServerInvoker.java 2011-04-25 14:48:31 UTC (rev 6333) @@ -87,8 +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; + protected int dosMaxThreads = Bisocket.DOS_MAX_THREADS_DEFAULT; + protected int dosTimeout = Bisocket.DOS_TIMEOUT_DEFAULT; public static BisocketServerInvoker getBisocketServerInvoker(String listenerId) @@ -364,6 +364,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; @@ -515,7 +539,7 @@ log.warn("\"" + Bisocket.SECONDARY_CONNECT_PORT + "\" must be specified as a String"); } - o = configuration.get(Bisocket.SECONDARY_MAX_THREADS); + o = configuration.get(Bisocket.DOS_MAX_THREADS); if (o instanceof String && ((String) o).length() > 0) { try @@ -525,15 +549,15 @@ } catch (NumberFormatException e) { - log.warn("Invalid format for " + "\"" + Bisocket.SECONDARY_MAX_THREADS + "\": " + o); + log.warn("Invalid format for " + "\"" + Bisocket.DOS_MAX_THREADS + "\": " + o); } } else if (o != null) { - log.warn("\"" + Bisocket.SECONDARY_MAX_THREADS + "\" must be specified as a String"); + log.warn("\"" + Bisocket.DOS_MAX_THREADS + "\" must be specified as a String"); } - o = configuration.get(Bisocket.SECONDARY_TIMEOUT); + o = configuration.get(Bisocket.DOS_TIMEOUT); if (o instanceof String && ((String) o).length() > 0) { try @@ -543,12 +567,12 @@ } catch (NumberFormatException e) { - log.warn("Invalid format for " + "\"" + Bisocket.SECONDARY_TIMEOUT + "\": " + o); + log.warn("Invalid format for " + "\"" + Bisocket.DOS_TIMEOUT + "\": " + o); } } else if (o != null) { - log.warn("\"" + Bisocket.SECONDARY_TIMEOUT + "\" must be specified as a String"); + log.warn("\"" + Bisocket.DOS_TIMEOUT + "\" must be specified as a String"); } if (isCallbackServer) @@ -903,7 +927,8 @@ { private ServerSocket secondaryServerSocket; boolean running = true; - Semaphore maxThreads = new Semaphore(maxPoolSize); + Semaphore maxThreads = new Semaphore(dosMaxThreads); + int localDosTimeout = dosTimeout; SecondaryServerSocketThread(ServerSocket secondaryServerSocket) throws IOException { @@ -960,7 +985,7 @@ if (log.isTraceEnabled()) log.trace(this + " processing socket: " + socket); try { - socket.setSoTimeout(DEFAULT_TIMEOUT_PERIOD); + socket.setSoTimeout(localDosTimeout); DataInputStream dis = new DataInputStream(socket.getInputStream()); int action = dis.read(); String listenerId = dis.readUTF(); Modified: remoting2/branches/2.2.3-SP1_JBREM-1269_JBREM-1275_JBREM-1261_JBREM-1277_JBREM-1280_JBREM-1281/src/tests/org/jboss/test/remoting/transport/bisocket/dos/DosTestCase.java =================================================================== --- remoting2/branches/2.2.3-SP1_JBREM-1269_JBREM-1275_JBREM-1261_JBREM-1277_JBREM-1280_JBREM-1281/src/tests/org/jboss/test/remoting/transport/bisocket/dos/DosTestCase.java 2011-04-19 03:12:07 UTC (rev 6332) +++ remoting2/branches/2.2.3-SP1_JBREM-1269_JBREM-1275_JBREM-1261_JBREM-1277_JBREM-1280_JBREM-1281/src/tests/org/jboss/test/remoting/transport/bisocket/dos/DosTestCase.java 2011-04-25 14:48:31 UTC (rev 6333) @@ -22,6 +22,7 @@ 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; @@ -49,7 +50,10 @@ 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$ @@ -61,6 +65,8 @@ { 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; @@ -100,7 +106,7 @@ log.info("entering " + getName()); // Start server. - setupServer(); + setupServer(false, false); // Create client. HashMap clientConfig = new HashMap(); @@ -209,7 +215,7 @@ public void testConfigurationDefault() throws Throwable { log.info("entering " + getName()); - doConfigurationTest(false, false, Bisocket.SECONDARY_MAX_THREADS_DEFAULT, Bisocket.SECONDARY_TIMEOUT_DEFAULT); + doConfigurationTest(false, false, Integer.valueOf(Bisocket.DOS_MAX_THREADS_DEFAULT).intValue(), Integer.valueOf(Bisocket.DOS_TIMEOUT_DEFAULT).intValue()); log.info(getName() + " PASSES"); } @@ -301,7 +307,7 @@ protected void addExtraServerConfig(Map config) {} - protected void setupServer() throws Exception + protected void setupServer(boolean setParameters, boolean useInvokerLocator) throws Exception { host = InetAddress.getLocalHost().getHostAddress(); port = PortUtil.findFreePort(host); @@ -312,8 +318,6 @@ { 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); @@ -321,13 +325,13 @@ { if (useInvokerLocator) { - locatorURI += "&" + Bisocket.SECONDARY_MAX_THREADS + "=" + Integer.toString(dosMaxThreadsValue); - locatorURI += "&" + Bisocket.SECONDARY_TIMEOUT + "=" + Integer.toString(dosTimeoutValue); + locatorURI += "&" + Bisocket.DOS_MAX_THREADS + "=" + Integer.toString(dosMaxThreadsValue); + locatorURI += "&" + Bisocket.DOS_TIMEOUT + "=" + Integer.toString(dosTimeoutValue); } else { - config.put(Bisocket.SECONDARY_MAX_THREADS, Integer.toString(dosMaxThreadsValue)); - config.put(Bisocket.SECONDARY_TIMEOUT, Integer.toString(dosTimeoutValue)); + config.put(Bisocket.DOS_MAX_THREADS, Integer.toString(dosMaxThreadsValue)); + config.put(Bisocket.DOS_TIMEOUT, Integer.toString(dosTimeoutValue)); } } serverLocator = new InvokerLocator(locatorURI);