From 78802c35c203d6d2a1b084ca8035e819872c64e8 Mon Sep 17 00:00:00 2001 From: Simone Bordet Date: Tue, 31 Jul 2012 16:17:24 +0200 Subject: [PATCH 01/13] Jetty9 - SPDY: computing return value for write() and small optimization in fill(). --- .../java/org/eclipse/jetty/spdy/SPDYAsyncConnection.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/jetty-spdy/spdy-jetty/src/main/java/org/eclipse/jetty/spdy/SPDYAsyncConnection.java b/jetty-spdy/spdy-jetty/src/main/java/org/eclipse/jetty/spdy/SPDYAsyncConnection.java index 83c3cc364a1..c3f1e81998d 100644 --- a/jetty-spdy/spdy-jetty/src/main/java/org/eclipse/jetty/spdy/SPDYAsyncConnection.java +++ b/jetty-spdy/spdy-jetty/src/main/java/org/eclipse/jetty/spdy/SPDYAsyncConnection.java @@ -78,6 +78,8 @@ public class SPDYAsyncConnection extends AbstractAsyncConnection implements Cont { try { + if (endPoint.isInputShutdown()) + return -1; return endPoint.fill(buffer); } catch (IOException x) @@ -91,8 +93,9 @@ public class SPDYAsyncConnection extends AbstractAsyncConnection implements Cont public int write(ByteBuffer buffer, final Callback callback, StandardSession.FrameBytes context) { AsyncEndPoint endPoint = getEndPoint(); + int remaining = buffer.remaining(); endPoint.write(context, callback, buffer); - return -1; //TODO: void or have endPoint.write return int + return remaining - buffer.remaining(); } @Override From 08a82609784f443447b9d3cb222600e6a56d46bd Mon Sep 17 00:00:00 2001 From: Simone Bordet Date: Tue, 31 Jul 2012 16:18:16 +0200 Subject: [PATCH 02/13] Jetty9 - Added the thread id to the log statement tag. --- .../main/java/org/eclipse/jetty/util/log/StdErrLog.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/log/StdErrLog.java b/jetty-util/src/main/java/org/eclipse/jetty/util/log/StdErrLog.java index 5551348dc78..70d0e9ac44f 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/log/StdErrLog.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/log/StdErrLog.java @@ -46,7 +46,7 @@ public class StdErrLog extends AbstractLogger static { __props.putAll(Log.__props); - + String deprecatedProperties[] = { "DEBUG", "org.eclipse.jetty.util.log.DEBUG", "org.eclipse.jetty.util.log.stderr.DEBUG" }; @@ -87,7 +87,7 @@ public class StdErrLog extends AbstractLogger // The abbreviated log name (used by default, unless _long is specified) private final String _abbrevname; private boolean _hideStacks = false; - + public static StdErrLog getLogger(Class clazz) { Logger log = Log.getLogger(clazz); @@ -354,7 +354,7 @@ public class StdErrLog extends AbstractLogger else { this._level = this._configuredLevel; - + for (Logger log : Log.getLoggers().values()) { if (log.getName().startsWith(getName()) && log instanceof StdErrLog) @@ -460,6 +460,7 @@ public class StdErrLog extends AbstractLogger buffer.append(_abbrevname); } buffer.append(':'); + buffer.append(Thread.currentThread().getId()).append(": "); if (_source) { Throwable source = new Throwable(); @@ -588,7 +589,7 @@ public class StdErrLog extends AbstractLogger // Let Level come from configured Properties instead - sel.setLevel(_level); logger.setSource(_source); logger._stderr = this._stderr; - + // Force the child to have any programmatic configuration if (_level!=_configuredLevel) logger._level=_level; From 9a34c08b8e53988c708e255412e94bd8c8e9378e Mon Sep 17 00:00:00 2001 From: Simone Bordet Date: Tue, 31 Jul 2012 16:23:43 +0200 Subject: [PATCH 03/13] Jetty9 - Removed unused fields. --- .../eclipse/jetty/io/ssl/SslConnection.java | 27 +++++++++---------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/jetty-io/src/main/java/org/eclipse/jetty/io/ssl/SslConnection.java b/jetty-io/src/main/java/org/eclipse/jetty/io/ssl/SslConnection.java index 025e7aa027c..5933c2e2e9a 100644 --- a/jetty-io/src/main/java/org/eclipse/jetty/io/ssl/SslConnection.java +++ b/jetty-io/src/main/java/org/eclipse/jetty/io/ssl/SslConnection.java @@ -15,6 +15,7 @@ package org.eclipse.jetty.io.ssl; import java.io.IOException; import java.nio.ByteBuffer; +import java.util.Arrays; import java.util.concurrent.Executor; import javax.net.ssl.SSLEngine; import javax.net.ssl.SSLEngineResult; @@ -56,8 +57,6 @@ public class SslConnection extends AbstractAsyncConnection private ByteBuffer _netOut; private final boolean _netDirect = false; private final boolean _appDirect = false; - private SSLEngineResult _unwrapResult; - private SSLEngineResult _wrapResult; public SslConnection(ByteBufferPool byteBufferPool, Executor executor, AsyncEndPoint endPoint, SSLEngine sslEngine) { @@ -268,7 +267,7 @@ public class SslConnection extends AbstractAsyncConnection _netWriting = true; getEndPoint().write(null, _writeCallback, _netOut); } - // TODO test this with _flushInwrap + // TODO test this with _flushUnwrap else if (_sslEngine.getHandshakeStatus() == HandshakeStatus.NEED_UNWRAP) // we are actually read blocked in order to write SslConnection.this.fillInterested(); @@ -338,12 +337,12 @@ public class SslConnection extends AbstractAsyncConnection // Let's try the SSL thang even if we have no net data because in that // case we want to fall through to the handshake handling int pos = BufferUtil.flipToFill(app_in); - _unwrapResult = _sslEngine.unwrap(_netIn, app_in); - LOG.debug("{} unwrap {}", SslConnection.this, _unwrapResult); + SSLEngineResult unwrapResult = _sslEngine.unwrap(_netIn, app_in); + LOG.debug("{} unwrap {}", SslConnection.this, unwrapResult); BufferUtil.flipToFlush(app_in, pos); // and deal with the results - switch (_unwrapResult.getStatus()) + switch (unwrapResult.getStatus()) { case BUFFER_OVERFLOW: throw new IllegalStateException(); @@ -390,10 +389,10 @@ public class SslConnection extends AbstractAsyncConnection default: // if we produced bytes, we don't care about the handshake state - if (_unwrapResult.bytesProduced() > 0) + if (unwrapResult.bytesProduced() > 0) { if (app_in == buffer) - return _unwrapResult.bytesProduced(); + return unwrapResult.bytesProduced(); return BufferUtil.append(_appIn, buffer); } @@ -474,8 +473,8 @@ public class SslConnection extends AbstractAsyncConnection // will return 0 (even if some handshake bytes were flushed and filled). // it is the applications responsibility to call flush again - either in a busy loop // or better yet by using AsyncEndPoint#write to do the flushing. - - LOG.debug("{} flush enter {}", SslConnection.this, appOuts); + + LOG.debug("{} flush enter {}", SslConnection.this, Arrays.toString(appOuts)); try { if (_netWriting) @@ -490,12 +489,12 @@ public class SslConnection extends AbstractAsyncConnection // do the funky SSL thang! BufferUtil.compact(_netOut); int pos = BufferUtil.flipToFill(_netOut); - _wrapResult = _sslEngine.wrap(appOuts, _netOut); - LOG.debug("{} wrap {}", SslConnection.this, _wrapResult); + SSLEngineResult wrapResult = _sslEngine.wrap(appOuts, _netOut); + LOG.debug("{} wrap {}", SslConnection.this, wrapResult); BufferUtil.flipToFlush(_netOut, pos); // and deal with the results - switch (_wrapResult.getStatus()) + switch (wrapResult.getStatus()) { case CLOSED: if (BufferUtil.hasContent(_netOut)) @@ -522,7 +521,7 @@ public class SslConnection extends AbstractAsyncConnection if (BufferUtil.hasContent(_netOut)) { getEndPoint().flush(_netOut); - return _wrapResult.bytesConsumed(); + return wrapResult.bytesConsumed(); } // Dang! we have to deal with handshake state From 9a568514a6c3790bf8cef345532bd3e738736295 Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Tue, 31 Jul 2012 12:52:22 -0700 Subject: [PATCH 04/13] More AB testing, reworked for Fuzzer --- .../jetty/websocket/protocol/Parser.java | 62 +- .../server/WebSocketServerFactory.java | 3 + .../websocket/server/ByteBufferAssert.java | 5 + .../websocket/server/ab/AbstractABCase.java | 10 + .../jetty/websocket/server/ab/AllTests.java | 2 +- .../jetty/websocket/server/ab/Fuzzer.java | 172 ++++++ .../websocket/server/ab/TestABCase1.java | 520 ++++++++++------ .../websocket/server/ab/TestABCase2.java | 562 +++++++----------- .../websocket/server/ab/TestABCase3.java | 216 +++++++ .../server/blockhead/BlockheadClient.java | 40 +- .../test/resources/jetty-logging.properties | 6 +- 11 files changed, 1048 insertions(+), 550 deletions(-) create mode 100644 jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/Fuzzer.java create mode 100644 jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase3.java diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/protocol/Parser.java b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/protocol/Parser.java index 1d6b44597b0..76ef7f4d098 100644 --- a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/protocol/Parser.java +++ b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/protocol/Parser.java @@ -54,16 +54,19 @@ public class Parser private ByteBuffer payload; private int payloadLength; + /** Is there an extension using RSV1 */ + private boolean rsv1InUse = false; + /** Is there an extension using RSV2 */ + private boolean rsv2InUse = false; + /** Is there an extension using RSV3 */ + private boolean rsv3InUse = false; + private static final Logger LOG = Log.getLogger(Parser.class); private IncomingFrames incomingFramesHandler; private WebSocketPolicy policy; public Parser(WebSocketPolicy wspolicy) { - /* - * TODO: Investigate addition of decompression factory similar to SPDY work in situation of negotiated deflate extension? - */ - this.policy = wspolicy; } @@ -107,6 +110,21 @@ public class Parser return policy; } + public boolean isRsv1InUse() + { + return rsv1InUse; + } + + public boolean isRsv2InUse() + { + return rsv2InUse; + } + + public boolean isRsv3InUse() + { + return rsv3InUse; + } + protected void notifyFrame(final WebSocketFrame f) { if (LOG_FRAMES.isDebugEnabled()) @@ -228,6 +246,27 @@ public class Parser LOG.debug("OpCode {}, fin={}",opcode.name(),fin); + /* + * RFC 6455 Section 5.2 + * + * MUST be 0 unless an extension is negotiated that defines meanings for non-zero values. If a nonzero value is received and none of the + * negotiated extensions defines the meaning of such a nonzero value, the receiving endpoint MUST _Fail the WebSocket Connection_. + */ + if (!rsv1InUse && rsv1) + { + throw new ProtocolException("RSV1 not allowed to be set"); + } + + if (!rsv2InUse && rsv2) + { + throw new ProtocolException("RSV2 not allowed to be set"); + } + + if (!rsv3InUse && rsv3) + { + throw new ProtocolException("RSV3 not allowed to be set"); + } + if (opcode.isControlFrame() && !fin) { throw new ProtocolException("Fragmented Control Frame [" + opcode.name() + "]"); @@ -442,6 +481,21 @@ public class Parser this.incomingFramesHandler = incoming; } + public void setRsv1InUse(boolean rsv1InUse) + { + this.rsv1InUse = rsv1InUse; + } + + public void setRsv2InUse(boolean rsv2InUse) + { + this.rsv2InUse = rsv2InUse; + } + + public void setRsv3InUse(boolean rsv3InUse) + { + this.rsv3InUse = rsv3InUse; + } + @Override public String toString() { diff --git a/jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketServerFactory.java b/jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketServerFactory.java index f2e81232048..ab14da7428c 100644 --- a/jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketServerFactory.java +++ b/jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketServerFactory.java @@ -388,14 +388,17 @@ public class WebSocketServerFactory extends AbstractLifeCycle implements WebSock if (ext.useRsv1()) { connection.getGenerator().setRsv1InUse(true); + connection.getParser().setRsv1InUse(true); } if (ext.useRsv2()) { connection.getGenerator().setRsv2InUse(true); + connection.getParser().setRsv2InUse(true); } if (ext.useRsv3()) { connection.getGenerator().setRsv3InUse(true); + connection.getParser().setRsv3InUse(true); } } diff --git a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ByteBufferAssert.java b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ByteBufferAssert.java index b6afbcf6317..6f170aea767 100644 --- a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ByteBufferAssert.java +++ b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ByteBufferAssert.java @@ -42,6 +42,11 @@ public class ByteBufferAssert public static void assertEquals(String message, ByteBuffer expectedBuffer, ByteBuffer actualBuffer) { + if (expectedBuffer == null) + { + Assert.assertThat(message,actualBuffer,nullValue()); + return; + } byte expectedBytes[] = BufferUtil.toArray(expectedBuffer); byte actualBytes[] = BufferUtil.toArray(actualBuffer); assertEquals(message,expectedBytes,actualBytes); diff --git a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/AbstractABCase.java b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/AbstractABCase.java index bba917bfc97..1ce3ca4613e 100644 --- a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/AbstractABCase.java +++ b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/AbstractABCase.java @@ -44,6 +44,16 @@ public abstract class AbstractABCase server.stop(); } + public Generator getLaxGenerator() + { + return laxGenerator; + } + + public SimpleServletServer getServer() + { + return server; + } + protected byte[] masked(final byte[] data) { int len = data.length; diff --git a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/AllTests.java b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/AllTests.java index 360af21c9eb..8f68c1355ed 100644 --- a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/AllTests.java +++ b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/AllTests.java @@ -5,7 +5,7 @@ import org.junit.runners.Suite; @RunWith(Suite.class) @Suite.SuiteClasses( -{ TestABCase1.class, TestABCase5.class, TestABCase7_9.class }) +{ TestABCase1.class, TestABCase2.class, TestABCase3.class, TestABCase5.class, TestABCase7_9.class }) public class AllTests { /* let junit do the rest */ diff --git a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/Fuzzer.java b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/Fuzzer.java new file mode 100644 index 00000000000..b44ac988acc --- /dev/null +++ b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/Fuzzer.java @@ -0,0 +1,172 @@ +package org.eclipse.jetty.websocket.server.ab; + +import static org.hamcrest.Matchers.*; + +import java.io.IOException; +import java.nio.ByteBuffer; +import java.util.Collections; +import java.util.List; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.TimeoutException; + +import org.eclipse.jetty.util.BufferUtil; +import org.eclipse.jetty.util.log.Log; +import org.eclipse.jetty.util.log.Logger; +import org.eclipse.jetty.websocket.protocol.CloseInfo; +import org.eclipse.jetty.websocket.protocol.Generator; +import org.eclipse.jetty.websocket.protocol.OpCode; +import org.eclipse.jetty.websocket.protocol.WebSocketFrame; +import org.eclipse.jetty.websocket.server.ByteBufferAssert; +import org.eclipse.jetty.websocket.server.blockhead.BlockheadClient; +import org.eclipse.jetty.websocket.server.helper.IncomingFramesCapture; +import org.junit.Assert; + +/** + * Fuzzing utility for the AB tests. + */ +public class Fuzzer +{ + public static enum SendMode + { + BULK, + PER_FRAME, + SLOW + } + + private static final Logger LOG = Log.getLogger(Fuzzer.class); + + // Client side framing mask + protected static final byte[] MASK = + { 0x11, 0x22, 0x33, 0x44 }; + + private final BlockheadClient client; + private final Generator generator; + private SendMode sendMode = SendMode.BULK; + private int slowSendSegmentSize = 5; + + public Fuzzer(AbstractABCase testcase) throws Exception + { + this.client = new BlockheadClient(testcase.getServer().getServerUri()); + this.generator = testcase.getLaxGenerator(); + } + + public void close() + { + this.client.disconnect(); + } + + public void connect() throws IOException + { + if (!client.isConnected()) + { + client.connect(); + client.sendStandardRequest(); + client.expectUpgradeResponse(); + } + } + + public void expect(List expect) throws IOException, TimeoutException + { + int expectedCount = expect.size(); + + // Read frames + IncomingFramesCapture capture = client.readFrames(expect.size(),TimeUnit.MILLISECONDS,500); + + String prefix = ""; + for (int i = 0; i < expectedCount; i++) + { + WebSocketFrame expected = expect.get(i); + WebSocketFrame actual = capture.getFrames().pop(); + + prefix = "Frame[" + i + "]"; + + Assert.assertThat(prefix + ".opcode",actual.getOpCode(),is(expected.getOpCode())); + prefix += "/" + actual.getOpCode(); + if (expected.getOpCode() == OpCode.CLOSE) + { + CloseInfo expectedClose = new CloseInfo(expected); + CloseInfo actualClose = new CloseInfo(actual); + Assert.assertThat(prefix + ".statusCode",actualClose.getStatusCode(),is(expectedClose.getStatusCode())); + } + else + { + Assert.assertThat(prefix + ".payloadLength",actual.getPayloadLength(),is(expected.getPayloadLength())); + ByteBufferAssert.assertEquals(prefix + ".payload",expected.getPayload(),actual.getPayload()); + } + } + } + + public void expect(WebSocketFrame expect) throws IOException, TimeoutException + { + expect(Collections.singletonList(expect)); + } + + public SendMode getSendMode() + { + return sendMode; + } + + public int getSlowSendSegmentSize() + { + return slowSendSegmentSize; + } + + public void send(List send) throws IOException + { + Assert.assertThat("Client connected",client.isConnected(),is(true)); + LOG.debug("Sending {} frames (mode {})",send.size(),sendMode); + if ((sendMode == SendMode.BULK) || (sendMode == SendMode.SLOW)) + { + int buflen = 0; + for (WebSocketFrame f : send) + { + buflen += f.getPayloadLength() + Generator.OVERHEAD; + } + ByteBuffer buf = ByteBuffer.allocate(buflen); + BufferUtil.clearToFill(buf); + + // Generate frames + for (WebSocketFrame f : send) + { + f.setMask(MASK); // make sure we have mask set + BufferUtil.put(generator.generate(f),buf); + } + BufferUtil.flipToFlush(buf,0); + + // Write Data Frame + switch (sendMode) + { + case BULK: + client.writeRaw(buf); + break; + case SLOW: + client.writeRawSlowly(buf,slowSendSegmentSize); + break; + } + } + else if (sendMode == SendMode.PER_FRAME) + { + for (WebSocketFrame f : send) + { + // Using lax generator, generate and send + client.writeRaw(generator.generate(f)); + client.flush(); + } + } + } + + public void send(WebSocketFrame send) throws IOException + { + send(Collections.singletonList(send)); + } + + public void setSendMode(SendMode sendMode) + { + this.sendMode = sendMode; + } + + public void setSlowSendSegmentSize(int segmentSize) + { + this.slowSendSegmentSize = segmentSize; + } +} diff --git a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase1.java b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase1.java index 5284068e407..90ed4497ffa 100644 --- a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase1.java +++ b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase1.java @@ -15,201 +15,44 @@ //======================================================================== package org.eclipse.jetty.websocket.server.ab; -import static org.hamcrest.Matchers.*; - -import java.nio.ByteBuffer; +import java.util.ArrayList; import java.util.Arrays; -import java.util.concurrent.TimeUnit; +import java.util.List; -import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.websocket.api.StatusCode; import org.eclipse.jetty.websocket.protocol.CloseInfo; -import org.eclipse.jetty.websocket.protocol.Generator; -import org.eclipse.jetty.websocket.protocol.OpCode; import org.eclipse.jetty.websocket.protocol.WebSocketFrame; -import org.eclipse.jetty.websocket.server.ByteBufferAssert; -import org.eclipse.jetty.websocket.server.blockhead.BlockheadClient; -import org.eclipse.jetty.websocket.server.helper.IncomingFramesCapture; -import org.junit.Assert; +import org.eclipse.jetty.websocket.server.ab.Fuzzer.SendMode; import org.junit.Test; public class TestABCase1 extends AbstractABCase { - private void assertEchoEmptyFrame(OpCode opcode) throws Exception - { - BlockheadClient client = new BlockheadClient(server.getServerUri()); - try - { - client.connect(); - client.sendStandardRequest(); - client.expectUpgradeResponse(); - - ByteBuffer buf = ByteBuffer.allocate(Generator.OVERHEAD); - BufferUtil.clearToFill(buf); - - // Prepare Frame - buf.put((byte)(0x00 | FIN | opcode.getCode())); - putPayloadLength(buf,0); - putMask(buf); - - // Write Data Frame - BufferUtil.flipToFlush(buf,0); - client.writeRaw(buf); - - // Prepare Close Frame - CloseInfo close = new CloseInfo(StatusCode.NORMAL); - buf = strictGenerator.generate(close.asFrame()); - - // Write Close Frame - client.writeRaw(buf); - client.flush(); - - // Read frames - IncomingFramesCapture capture = client.readFrames(2,TimeUnit.MILLISECONDS,500); - - // Validate echo'd frame - WebSocketFrame frame = capture.getFrames().get(0); - Assert.assertThat("frame should be " + opcode + " frame",frame.getOpCode(),is(opcode)); - Assert.assertThat(opcode + ".payloadLength",frame.getPayloadLength(),is(0)); - - // Validate close - frame = capture.getFrames().get(1); - Assert.assertThat("CLOSE.frame.opcode",frame.getOpCode(),is(OpCode.CLOSE)); - close = new CloseInfo(frame); - Assert.assertThat("CLOSE.statusCode",close.getStatusCode(),is(StatusCode.NORMAL)); - } - finally - { - client.disconnect(); - } - } - - private void assertEchoFrame(OpCode opcode, byte[] payload) throws Exception - { - BlockheadClient client = new BlockheadClient(server.getServerUri()); - try - { - client.connect(); - client.sendStandardRequest(); - client.expectUpgradeResponse(); - - ByteBuffer buf = ByteBuffer.allocate(payload.length + Generator.OVERHEAD); - BufferUtil.clearToFill(buf); - - // Prepare Frame - buf.put((byte)(0x00 | FIN | opcode.getCode())); - putPayloadLength(buf,payload.length); - putMask(buf); - buf.put(masked(payload)); - - // Write Data Frame - BufferUtil.flipToFlush(buf,0); - client.writeRaw(buf); - - // Prepare Close Frame - CloseInfo close = new CloseInfo(StatusCode.NORMAL); - WebSocketFrame closeFrame = close.asFrame(); - closeFrame.setMask(MASK); - buf = strictGenerator.generate(closeFrame); - - // Write Close Frame - client.writeRaw(buf); - client.flush(); - - // Read frames - IncomingFramesCapture capture = client.readFrames(2,TimeUnit.MILLISECONDS,1000); - - // Validate echo'd frame - WebSocketFrame frame = capture.getFrames().get(0); - Assert.assertThat("frame should be " + opcode + " frame",frame.getOpCode(),is(opcode)); - Assert.assertThat(opcode + ".payloadLength",frame.getPayloadLength(),is(payload.length)); - ByteBufferAssert.assertEquals(opcode + ".payload",payload,frame.getPayload()); - - // Validate close - frame = capture.getFrames().get(1); - Assert.assertThat("CLOSE.frame.opcode",frame.getOpCode(),is(OpCode.CLOSE)); - close = new CloseInfo(frame); - Assert.assertThat("CLOSE.statusCode",close.getStatusCode(),is(StatusCode.NORMAL)); - } - finally - { - client.disconnect(); - } - } - - private void assertEchoSegmentedFrame(OpCode opcode, byte payload[], int segmentSize) throws Exception - { - BlockheadClient client = new BlockheadClient(server.getServerUri()); - try - { - client.connect(); - client.sendStandardRequest(); - client.expectUpgradeResponse(); - - ByteBuffer buf = ByteBuffer.allocate(payload.length + Generator.OVERHEAD); - BufferUtil.clearToFill(buf); - - // Prepare Frame - buf.put((byte)(0x00 | FIN | opcode.getCode())); - putPayloadLength(buf,payload.length); - putMask(buf); - buf.put(masked(payload)); - - // Write frame, in small blocks of segmentSize - BufferUtil.flipToFlush(buf,0); - int origLimit = buf.limit(); - int limit = buf.limit(); - int len; - int pos = buf.position(); - int overallLeft = buf.remaining(); - while (overallLeft > 0) - { - buf.position(pos); - limit = Math.min(origLimit,pos + segmentSize); - buf.limit(limit); - len = buf.remaining(); - overallLeft -= len; - pos += len; - client.writeRaw(buf); - client.flush(); - } - - // Prepare Close Frame - CloseInfo close = new CloseInfo(StatusCode.NORMAL); - buf = strictGenerator.generate(close.asFrame()); - - // Write Close Frame - client.writeRaw(buf); - client.flush(); - - // Read frames - IncomingFramesCapture capture = client.readFrames(2,TimeUnit.MILLISECONDS,500); - - // Validate echo'd frame - WebSocketFrame frame = capture.getFrames().get(0); - Assert.assertThat("frame should be " + opcode + " frame",frame.getOpCode(),is(opcode)); - Assert.assertThat(opcode + ".payloadLength",frame.getPayloadLength(),is(payload.length)); - ByteBufferAssert.assertEquals(opcode + ".payload",payload,frame.getPayload()); - - // Validate close - frame = capture.getFrames().get(1); - Assert.assertThat("CLOSE.frame.opcode",frame.getOpCode(),is(OpCode.CLOSE)); - close = new CloseInfo(frame); - Assert.assertThat("CLOSE.statusCode",close.getStatusCode(),is(StatusCode.NORMAL)); - } - finally - { - client.disconnect(); - } - } - /** * Echo 0 byte TEXT message */ @Test public void testCase1_1_1() throws Exception { - assertEchoEmptyFrame(OpCode.TEXT); + List send = new ArrayList<>(); + send.add(WebSocketFrame.text()); + send.add(new CloseInfo(StatusCode.NORMAL).asFrame()); + + List expect = new ArrayList<>(); + expect.add(WebSocketFrame.text()); + expect.add(new CloseInfo(StatusCode.NORMAL).asFrame()); + + Fuzzer fuzzer = new Fuzzer(this); + try + { + fuzzer.connect(); + fuzzer.setSendMode(SendMode.BULK); + fuzzer.send(send); + fuzzer.expect(expect); + } + finally + { + fuzzer.close(); + } } /** @@ -221,7 +64,26 @@ public class TestABCase1 extends AbstractABCase byte payload[] = new byte[125]; Arrays.fill(payload,(byte)'*'); - assertEchoFrame(OpCode.TEXT,payload); + List send = new ArrayList<>(); + send.add(WebSocketFrame.text().setPayload(payload)); + send.add(new CloseInfo(StatusCode.NORMAL).asFrame()); + + List expect = new ArrayList<>(); + expect.add(WebSocketFrame.text().setPayload(payload)); + expect.add(new CloseInfo(StatusCode.NORMAL).asFrame()); + + Fuzzer fuzzer = new Fuzzer(this); + try + { + fuzzer.connect(); + fuzzer.setSendMode(SendMode.BULK); + fuzzer.send(send); + fuzzer.expect(expect); + } + finally + { + fuzzer.close(); + } } /** @@ -233,7 +95,26 @@ public class TestABCase1 extends AbstractABCase byte payload[] = new byte[126]; Arrays.fill(payload,(byte)'*'); - assertEchoFrame(OpCode.TEXT,payload); + List send = new ArrayList<>(); + send.add(WebSocketFrame.text().setPayload(payload)); + send.add(new CloseInfo(StatusCode.NORMAL).asFrame()); + + List expect = new ArrayList<>(); + expect.add(WebSocketFrame.text().setPayload(payload)); + expect.add(new CloseInfo(StatusCode.NORMAL).asFrame()); + + Fuzzer fuzzer = new Fuzzer(this); + try + { + fuzzer.connect(); + fuzzer.setSendMode(SendMode.BULK); + fuzzer.send(send); + fuzzer.expect(expect); + } + finally + { + fuzzer.close(); + } } /** @@ -245,7 +126,26 @@ public class TestABCase1 extends AbstractABCase byte payload[] = new byte[127]; Arrays.fill(payload,(byte)'*'); - assertEchoFrame(OpCode.TEXT,payload); + List send = new ArrayList<>(); + send.add(WebSocketFrame.text().setPayload(payload)); + send.add(new CloseInfo(StatusCode.NORMAL).asFrame()); + + List expect = new ArrayList<>(); + expect.add(WebSocketFrame.text().setPayload(payload)); + expect.add(new CloseInfo(StatusCode.NORMAL).asFrame()); + + Fuzzer fuzzer = new Fuzzer(this); + try + { + fuzzer.connect(); + fuzzer.setSendMode(SendMode.BULK); + fuzzer.send(send); + fuzzer.expect(expect); + } + finally + { + fuzzer.close(); + } } /** @@ -257,7 +157,26 @@ public class TestABCase1 extends AbstractABCase byte payload[] = new byte[128]; Arrays.fill(payload,(byte)'*'); - assertEchoFrame(OpCode.TEXT,payload); + List send = new ArrayList<>(); + send.add(WebSocketFrame.text().setPayload(payload)); + send.add(new CloseInfo(StatusCode.NORMAL).asFrame()); + + List expect = new ArrayList<>(); + expect.add(WebSocketFrame.text().setPayload(payload)); + expect.add(new CloseInfo(StatusCode.NORMAL).asFrame()); + + Fuzzer fuzzer = new Fuzzer(this); + try + { + fuzzer.connect(); + fuzzer.setSendMode(SendMode.BULK); + fuzzer.send(send); + fuzzer.expect(expect); + } + finally + { + fuzzer.close(); + } } /** @@ -269,7 +188,26 @@ public class TestABCase1 extends AbstractABCase byte payload[] = new byte[65535]; Arrays.fill(payload,(byte)'*'); - assertEchoFrame(OpCode.TEXT,payload); + List send = new ArrayList<>(); + send.add(WebSocketFrame.text().setPayload(payload)); + send.add(new CloseInfo(StatusCode.NORMAL).asFrame()); + + List expect = new ArrayList<>(); + expect.add(WebSocketFrame.text().setPayload(payload)); + expect.add(new CloseInfo(StatusCode.NORMAL).asFrame()); + + Fuzzer fuzzer = new Fuzzer(this); + try + { + fuzzer.connect(); + fuzzer.setSendMode(SendMode.BULK); + fuzzer.send(send); + fuzzer.expect(expect); + } + finally + { + fuzzer.close(); + } } /** @@ -281,7 +219,26 @@ public class TestABCase1 extends AbstractABCase byte payload[] = new byte[65536]; Arrays.fill(payload,(byte)'*'); - assertEchoFrame(OpCode.TEXT,payload); + List send = new ArrayList<>(); + send.add(WebSocketFrame.text().setPayload(payload)); + send.add(new CloseInfo(StatusCode.NORMAL).asFrame()); + + List expect = new ArrayList<>(); + expect.add(WebSocketFrame.text().setPayload(payload)); + expect.add(new CloseInfo(StatusCode.NORMAL).asFrame()); + + Fuzzer fuzzer = new Fuzzer(this); + try + { + fuzzer.connect(); + fuzzer.setSendMode(SendMode.BULK); + fuzzer.send(send); + fuzzer.expect(expect); + } + finally + { + fuzzer.close(); + } } /** @@ -298,7 +255,27 @@ public class TestABCase1 extends AbstractABCase Arrays.fill(payload,(byte)'*'); int segmentSize = 997; - assertEchoSegmentedFrame(OpCode.TEXT,payload,segmentSize); + List send = new ArrayList<>(); + send.add(WebSocketFrame.text().setPayload(payload)); + send.add(new CloseInfo(StatusCode.NORMAL).asFrame()); + + List expect = new ArrayList<>(); + expect.add(WebSocketFrame.text().setPayload(payload)); + expect.add(new CloseInfo(StatusCode.NORMAL).asFrame()); + + Fuzzer fuzzer = new Fuzzer(this); + try + { + fuzzer.connect(); + fuzzer.setSendMode(SendMode.SLOW); + fuzzer.setSlowSendSegmentSize(segmentSize); + fuzzer.send(send); + fuzzer.expect(expect); + } + finally + { + fuzzer.close(); + } } /** @@ -307,7 +284,26 @@ public class TestABCase1 extends AbstractABCase @Test public void testCase1_2_1() throws Exception { - assertEchoEmptyFrame(OpCode.BINARY); + List send = new ArrayList<>(); + send.add(WebSocketFrame.binary()); + send.add(new CloseInfo(StatusCode.NORMAL).asFrame()); + + List expect = new ArrayList<>(); + expect.add(WebSocketFrame.binary()); + expect.add(new CloseInfo(StatusCode.NORMAL).asFrame()); + + Fuzzer fuzzer = new Fuzzer(this); + try + { + fuzzer.connect(); + fuzzer.setSendMode(SendMode.BULK); + fuzzer.send(send); + fuzzer.expect(expect); + } + finally + { + fuzzer.close(); + } } /** @@ -319,7 +315,26 @@ public class TestABCase1 extends AbstractABCase byte payload[] = new byte[125]; Arrays.fill(payload,(byte)0xFE); - assertEchoFrame(OpCode.BINARY,payload); + List send = new ArrayList<>(); + send.add(WebSocketFrame.binary().setPayload(payload)); + send.add(new CloseInfo(StatusCode.NORMAL).asFrame()); + + List expect = new ArrayList<>(); + expect.add(WebSocketFrame.binary().setPayload(payload)); + expect.add(new CloseInfo(StatusCode.NORMAL).asFrame()); + + Fuzzer fuzzer = new Fuzzer(this); + try + { + fuzzer.connect(); + fuzzer.setSendMode(SendMode.BULK); + fuzzer.send(send); + fuzzer.expect(expect); + } + finally + { + fuzzer.close(); + } } /** @@ -331,7 +346,26 @@ public class TestABCase1 extends AbstractABCase byte payload[] = new byte[126]; Arrays.fill(payload,(byte)0xFE); - assertEchoFrame(OpCode.BINARY,payload); + List send = new ArrayList<>(); + send.add(WebSocketFrame.binary().setPayload(payload)); + send.add(new CloseInfo(StatusCode.NORMAL).asFrame()); + + List expect = new ArrayList<>(); + expect.add(WebSocketFrame.binary().setPayload(payload)); + expect.add(new CloseInfo(StatusCode.NORMAL).asFrame()); + + Fuzzer fuzzer = new Fuzzer(this); + try + { + fuzzer.connect(); + fuzzer.setSendMode(SendMode.BULK); + fuzzer.send(send); + fuzzer.expect(expect); + } + finally + { + fuzzer.close(); + } } /** @@ -343,7 +377,26 @@ public class TestABCase1 extends AbstractABCase byte payload[] = new byte[127]; Arrays.fill(payload,(byte)0xFE); - assertEchoFrame(OpCode.BINARY,payload); + List send = new ArrayList<>(); + send.add(WebSocketFrame.binary().setPayload(payload)); + send.add(new CloseInfo(StatusCode.NORMAL).asFrame()); + + List expect = new ArrayList<>(); + expect.add(WebSocketFrame.binary().setPayload(payload)); + expect.add(new CloseInfo(StatusCode.NORMAL).asFrame()); + + Fuzzer fuzzer = new Fuzzer(this); + try + { + fuzzer.connect(); + fuzzer.setSendMode(SendMode.BULK); + fuzzer.send(send); + fuzzer.expect(expect); + } + finally + { + fuzzer.close(); + } } /** @@ -355,7 +408,26 @@ public class TestABCase1 extends AbstractABCase byte payload[] = new byte[128]; Arrays.fill(payload,(byte)0xFE); - assertEchoFrame(OpCode.BINARY,payload); + List send = new ArrayList<>(); + send.add(WebSocketFrame.binary().setPayload(payload)); + send.add(new CloseInfo(StatusCode.NORMAL).asFrame()); + + List expect = new ArrayList<>(); + expect.add(WebSocketFrame.binary().setPayload(payload)); + expect.add(new CloseInfo(StatusCode.NORMAL).asFrame()); + + Fuzzer fuzzer = new Fuzzer(this); + try + { + fuzzer.connect(); + fuzzer.setSendMode(SendMode.BULK); + fuzzer.send(send); + fuzzer.expect(expect); + } + finally + { + fuzzer.close(); + } } /** @@ -367,7 +439,26 @@ public class TestABCase1 extends AbstractABCase byte payload[] = new byte[65535]; Arrays.fill(payload,(byte)0xFE); - assertEchoFrame(OpCode.BINARY,payload); + List send = new ArrayList<>(); + send.add(WebSocketFrame.binary().setPayload(payload)); + send.add(new CloseInfo(StatusCode.NORMAL).asFrame()); + + List expect = new ArrayList<>(); + expect.add(WebSocketFrame.binary().setPayload(payload)); + expect.add(new CloseInfo(StatusCode.NORMAL).asFrame()); + + Fuzzer fuzzer = new Fuzzer(this); + try + { + fuzzer.connect(); + fuzzer.setSendMode(SendMode.BULK); + fuzzer.send(send); + fuzzer.expect(expect); + } + finally + { + fuzzer.close(); + } } /** @@ -379,7 +470,26 @@ public class TestABCase1 extends AbstractABCase byte payload[] = new byte[65536]; Arrays.fill(payload,(byte)0xFE); - assertEchoFrame(OpCode.BINARY,payload); + List send = new ArrayList<>(); + send.add(WebSocketFrame.binary().setPayload(payload)); + send.add(new CloseInfo(StatusCode.NORMAL).asFrame()); + + List expect = new ArrayList<>(); + expect.add(WebSocketFrame.binary().setPayload(payload)); + expect.add(new CloseInfo(StatusCode.NORMAL).asFrame()); + + Fuzzer fuzzer = new Fuzzer(this); + try + { + fuzzer.connect(); + fuzzer.setSendMode(SendMode.BULK); + fuzzer.send(send); + fuzzer.expect(expect); + } + finally + { + fuzzer.close(); + } } /** @@ -396,6 +506,26 @@ public class TestABCase1 extends AbstractABCase Arrays.fill(payload,(byte)0xFE); int segmentSize = 997; - assertEchoSegmentedFrame(OpCode.BINARY,payload,segmentSize); + List send = new ArrayList<>(); + send.add(WebSocketFrame.binary().setPayload(payload)); + send.add(new CloseInfo(StatusCode.NORMAL).asFrame()); + + List expect = new ArrayList<>(); + expect.add(WebSocketFrame.binary().setPayload(payload)); + expect.add(new CloseInfo(StatusCode.NORMAL).asFrame()); + + Fuzzer fuzzer = new Fuzzer(this); + try + { + fuzzer.connect(); + fuzzer.setSendMode(SendMode.SLOW); + fuzzer.setSlowSendSegmentSize(segmentSize); + fuzzer.send(send); + fuzzer.expect(expect); + } + finally + { + fuzzer.close(); + } } } diff --git a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase2.java b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase2.java index 98d9a9b5281..00b3f1f2235 100644 --- a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase2.java +++ b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase2.java @@ -1,224 +1,40 @@ package org.eclipse.jetty.websocket.server.ab; -import static org.hamcrest.Matchers.*; - -import java.nio.ByteBuffer; +import java.util.ArrayList; import java.util.Arrays; -import java.util.concurrent.TimeUnit; +import java.util.List; -import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.StringUtil; import org.eclipse.jetty.websocket.api.StatusCode; import org.eclipse.jetty.websocket.protocol.CloseInfo; -import org.eclipse.jetty.websocket.protocol.Generator; import org.eclipse.jetty.websocket.protocol.OpCode; import org.eclipse.jetty.websocket.protocol.WebSocketFrame; -import org.eclipse.jetty.websocket.server.ByteBufferAssert; -import org.eclipse.jetty.websocket.server.blockhead.BlockheadClient; -import org.eclipse.jetty.websocket.server.helper.IncomingFramesCapture; -import org.junit.Assert; import org.junit.Test; public class TestABCase2 extends AbstractABCase { - private void assertPingFrame(byte[] payload) throws Exception - { - boolean hasPayload = ((payload != null) && (payload.length > 0)); - - BlockheadClient client = new BlockheadClient(server.getServerUri()); - try - { - client.connect(); - client.sendStandardRequest(); - client.expectUpgradeResponse(); - - int len = 0; - if (hasPayload) - { - len = payload.length; - } - - ByteBuffer buf = ByteBuffer.allocate(len + Generator.OVERHEAD); - BufferUtil.clearToFill(buf); - - // Prepare PING Frame - buf.put((byte)(0x00 | FIN | OpCode.PING.getCode())); - putPayloadLength(buf,len); - putMask(buf); - if (hasPayload) - { - buf.put(masked(payload)); - } - - // Prepare CLOSE Frame - buf.put((byte)(0x00 | FIN | OpCode.CLOSE.getCode())); - putPayloadLength(buf,2); - putMask(buf); - buf.put(masked(new byte[] - { 0x03, (byte)0xE8 })); - - // Write Data Frame - BufferUtil.flipToFlush(buf,0); - client.writeRaw(buf); - client.flush(); - - // Read frames - IncomingFramesCapture capture = client.readFrames(2,TimeUnit.MILLISECONDS,500); - - // Validate echo'd frame - WebSocketFrame frame = capture.getFrames().get(0); - Assert.assertThat("frame should be PONG frame",frame.getOpCode(),is(OpCode.PONG)); - if (hasPayload) - { - Assert.assertThat("PONG.payloadLength",frame.getPayloadLength(),is(payload.length)); - ByteBufferAssert.assertEquals("PONG.payload",payload,frame.getPayload()); - } - else - { - Assert.assertThat("PONG.payloadLength",frame.getPayloadLength(),is(0)); - } - - // Validate close - frame = capture.getFrames().get(1); - Assert.assertThat("CLOSE.frame.opcode",frame.getOpCode(),is(OpCode.CLOSE)); - CloseInfo close = new CloseInfo(frame); - Assert.assertThat("CLOSE.statusCode",close.getStatusCode(),is(StatusCode.NORMAL)); - } - finally - { - client.disconnect(); - } - } - - private void assertProtocolError(byte[] payload) throws Exception - { - BlockheadClient client = new BlockheadClient(server.getServerUri()); - try - { - client.connect(); - client.sendStandardRequest(); - client.expectUpgradeResponse(); - - ByteBuffer buf = ByteBuffer.allocate(payload.length + Generator.OVERHEAD); - BufferUtil.clearToFill(buf); - - // Prepare PING Frame - buf.put((byte)(0x00 | FIN | OpCode.PING.getCode())); - putPayloadLength(buf,payload.length); - putMask(buf); - buf.put(masked(payload)); - - // Prepare CLOSE Frame - buf.put((byte)(0x00 | FIN | OpCode.CLOSE.getCode())); - putPayloadLength(buf,2); - putMask(buf); - buf.put(masked(new byte[] - { 0x03, (byte)0xE8 })); - - // Write Data Frame - BufferUtil.flipToFlush(buf,0); - client.writeRaw(buf); - client.flush(); - - // Read frames - IncomingFramesCapture capture = client.readFrames(1,TimeUnit.MILLISECONDS,500); - - // Validate close w/ Protocol Error - WebSocketFrame frame = capture.getFrames().pop(); - Assert.assertThat("CLOSE.frame.opcode",frame.getOpCode(),is(OpCode.CLOSE)); - CloseInfo close = new CloseInfo(frame); - Assert.assertThat("CLOSE.statusCode",close.getStatusCode(),is(StatusCode.PROTOCOL)); - } - finally - { - client.disconnect(); - } - } - - /** - * Send a ping frame as separate segments, in an inefficient way. - * - * @param payload - * the payload - * @param segmentSize - * the segment size for each inefficient segment (flush between) - */ - private void assertSegmentedPingFrame(byte[] payload, int segmentSize) throws Exception - { - Assert.assertThat("payload exists for segmented send",payload,notNullValue()); - Assert.assertThat("payload exists for segmented send",payload.length,greaterThan(0)); - - BlockheadClient client = new BlockheadClient(server.getServerUri()); - try - { - client.connect(); - client.sendStandardRequest(); - client.expectUpgradeResponse(); - - ByteBuffer buf = ByteBuffer.allocate(payload.length + Generator.OVERHEAD); - BufferUtil.clearToFill(buf); - - // Prepare PING Frame - buf.put((byte)(0x00 | FIN | OpCode.PING.getCode())); - putPayloadLength(buf,payload.length); - putMask(buf); - buf.put(masked(payload)); - - // Prepare CLOSE Frame - buf.put((byte)(0x00 | FIN | OpCode.CLOSE.getCode())); - putPayloadLength(buf,2); - putMask(buf); - buf.put(masked(new byte[] - { 0x03, (byte)0xE8 })); - - // Write Data Frame - BufferUtil.flipToFlush(buf,0); - int origLimit = buf.limit(); - int limit = buf.limit(); - int len; - int pos = buf.position(); - int overallLeft = buf.remaining(); - while (overallLeft > 0) - { - buf.position(pos); - limit = Math.min(origLimit,pos + segmentSize); - buf.limit(limit); - len = buf.remaining(); - overallLeft -= len; - pos += len; - client.writeRaw(buf); - client.flush(); - } - - // Read frames - IncomingFramesCapture capture = client.readFrames(2,TimeUnit.MILLISECONDS,500); - - // Validate echo'd frame - WebSocketFrame frame = capture.getFrames().get(0); - Assert.assertThat("frame should be PONG frame",frame.getOpCode(),is(OpCode.PONG)); - Assert.assertThat("PONG.payloadLength",frame.getPayloadLength(),is(payload.length)); - ByteBufferAssert.assertEquals("PONG.payload",payload,frame.getPayload()); - - // Validate close - frame = capture.getFrames().get(1); - Assert.assertThat("CLOSE.frame.opcode",frame.getOpCode(),is(OpCode.CLOSE)); - CloseInfo close = new CloseInfo(frame); - Assert.assertThat("CLOSE.statusCode",close.getStatusCode(),is(StatusCode.NORMAL)); - } - finally - { - client.disconnect(); - } - } - /** * Ping without payload */ @Test public void testCase2_1() throws Exception { - byte payload[] = new byte[0]; - assertPingFrame(payload); + WebSocketFrame send = WebSocketFrame.ping(); + + WebSocketFrame expect = WebSocketFrame.pong(); + + Fuzzer fuzzer = new Fuzzer(this); + try + { + fuzzer.connect(); + fuzzer.setSendMode(Fuzzer.SendMode.BULK); + fuzzer.send(send); + fuzzer.expect(expect); + } + finally + { + fuzzer.close(); + } } /** @@ -229,8 +45,35 @@ public class TestABCase2 extends AbstractABCase { // send 10 pings each with unique payload // send close - // expect 10 pongs with OUR payload + // expect 10 pongs with our unique payload // expect close + + int pingCount = 10; + + List send = new ArrayList<>(); + List expect = new ArrayList<>(); + + for (int i = 0; i < pingCount; i++) + { + String payload = String.format("ping-%d[%X]",i,i); + send.add(WebSocketFrame.ping().setPayload(payload)); + expect.add(WebSocketFrame.pong().setPayload(payload)); + } + send.add(new CloseInfo(StatusCode.NORMAL).asFrame()); + expect.add(new CloseInfo(StatusCode.NORMAL).asFrame()); + + Fuzzer fuzzer = new Fuzzer(this); + try + { + fuzzer.connect(); + fuzzer.setSendMode(Fuzzer.SendMode.BULK); + fuzzer.send(send); + fuzzer.expect(expect); + } + finally + { + fuzzer.close(); + } } /** @@ -243,6 +86,34 @@ public class TestABCase2 extends AbstractABCase // send close // expect 10 pongs with OUR payload // expect close + + int pingCount = 10; + + List send = new ArrayList<>(); + List expect = new ArrayList<>(); + + for (int i = 0; i < pingCount; i++) + { + String payload = String.format("ping-%d[%X]",i,i); + send.add(WebSocketFrame.ping().setPayload(payload)); + expect.add(WebSocketFrame.pong().setPayload(payload)); + } + send.add(new CloseInfo(StatusCode.NORMAL).asFrame()); + expect.add(new CloseInfo(StatusCode.NORMAL).asFrame()); + + Fuzzer fuzzer = new Fuzzer(this); + try + { + fuzzer.connect(); + fuzzer.setSendMode(Fuzzer.SendMode.SLOW); + fuzzer.setSlowSendSegmentSize(5); + fuzzer.send(send); + fuzzer.expect(expect); + } + finally + { + fuzzer.close(); + } } /** @@ -252,7 +123,27 @@ public class TestABCase2 extends AbstractABCase public void testCase2_2() throws Exception { byte payload[] = StringUtil.getUtf8Bytes("Hello world"); - assertPingFrame(payload); + + List send = new ArrayList<>(); + send.add(WebSocketFrame.ping().setPayload(payload)); + send.add(new CloseInfo(StatusCode.NORMAL).asFrame()); + + List expect = new ArrayList<>(); + expect.add(WebSocketFrame.pong().setPayload(payload)); + expect.add(new CloseInfo(StatusCode.NORMAL).asFrame()); + + Fuzzer fuzzer = new Fuzzer(this); + try + { + fuzzer.connect(); + fuzzer.setSendMode(Fuzzer.SendMode.BULK); + fuzzer.send(send); + fuzzer.expect(expect); + } + finally + { + fuzzer.close(); + } } /** @@ -263,7 +154,27 @@ public class TestABCase2 extends AbstractABCase { byte payload[] = new byte[] { 0x00, (byte)0xFF, (byte)0xFE, (byte)0xFD, (byte)0xFC, (byte)0xFB, 0x00, (byte)0xFF }; - assertPingFrame(payload); + + List send = new ArrayList<>(); + send.add(WebSocketFrame.ping().setPayload(payload)); + send.add(new CloseInfo(StatusCode.NORMAL).asFrame()); + + List expect = new ArrayList<>(); + expect.add(WebSocketFrame.pong().setPayload(payload)); + expect.add(new CloseInfo(StatusCode.NORMAL).asFrame()); + + Fuzzer fuzzer = new Fuzzer(this); + try + { + fuzzer.connect(); + fuzzer.setSendMode(Fuzzer.SendMode.BULK); + fuzzer.send(send); + fuzzer.expect(expect); + } + finally + { + fuzzer.close(); + } } /** @@ -274,7 +185,27 @@ public class TestABCase2 extends AbstractABCase { byte payload[] = new byte[125]; Arrays.fill(payload,(byte)0xFE); - assertPingFrame(payload); + + List send = new ArrayList<>(); + send.add(WebSocketFrame.ping().setPayload(payload)); + send.add(new CloseInfo(StatusCode.NORMAL).asFrame()); + + List expect = new ArrayList<>(); + expect.add(WebSocketFrame.pong().setPayload(payload)); + expect.add(new CloseInfo(StatusCode.NORMAL).asFrame()); + + Fuzzer fuzzer = new Fuzzer(this); + try + { + fuzzer.connect(); + fuzzer.setSendMode(Fuzzer.SendMode.BULK); + fuzzer.send(send); + fuzzer.expect(expect); + } + finally + { + fuzzer.close(); + } } /** @@ -283,9 +214,29 @@ public class TestABCase2 extends AbstractABCase @Test public void testCase2_5() throws Exception { - byte payload[] = new byte[126]; + byte payload[] = new byte[126]; // intentionally too big Arrays.fill(payload,(byte)0xFE); - assertProtocolError(payload); + + List send = new ArrayList<>(); + // trick websocket frame into making extra large payload for ping + send.add(WebSocketFrame.binary(payload).setOpCode(OpCode.PING)); + send.add(new CloseInfo(StatusCode.NORMAL).asFrame()); + + List expect = new ArrayList<>(); + expect.add(new CloseInfo(StatusCode.PROTOCOL).asFrame()); + + Fuzzer fuzzer = new Fuzzer(this); + try + { + fuzzer.connect(); + fuzzer.setSendMode(Fuzzer.SendMode.BULK); + fuzzer.send(send); + fuzzer.expect(expect); + } + finally + { + fuzzer.close(); + } } /** @@ -296,7 +247,28 @@ public class TestABCase2 extends AbstractABCase { byte payload[] = new byte[125]; Arrays.fill(payload,(byte)0xFE); - assertSegmentedPingFrame(payload,1); + + List send = new ArrayList<>(); + send.add(WebSocketFrame.ping().setPayload(payload)); + send.add(new CloseInfo(StatusCode.NORMAL).asFrame()); + + List expect = new ArrayList<>(); + expect.add(WebSocketFrame.pong().setPayload(payload)); + expect.add(new CloseInfo(StatusCode.NORMAL).asFrame()); + + Fuzzer fuzzer = new Fuzzer(this); + try + { + fuzzer.connect(); + fuzzer.setSendMode(Fuzzer.SendMode.SLOW); + fuzzer.setSlowSendSegmentSize(1); + fuzzer.send(send); + fuzzer.expect(expect); + } + finally + { + fuzzer.close(); + } } /** @@ -305,50 +277,25 @@ public class TestABCase2 extends AbstractABCase @Test public void testCase2_7() throws Exception { - BlockheadClient client = new BlockheadClient(server.getServerUri()); + List send = new ArrayList<>(); + send.add(WebSocketFrame.pong()); // unsolicited pong + send.add(new CloseInfo(StatusCode.NORMAL).asFrame()); + + List expect = new ArrayList<>(); + expect.add(new CloseInfo(StatusCode.NORMAL).asFrame()); + + Fuzzer fuzzer = new Fuzzer(this); try { - client.connect(); - client.sendStandardRequest(); - client.expectUpgradeResponse(); - - byte payload[] = new byte[0]; - - ByteBuffer buf = ByteBuffer.allocate(256); - BufferUtil.clearToFill(buf); - - // Prepare Unsolicited PONG Frame - buf.put((byte)(0x00 | FIN | OpCode.PONG.getCode())); - putPayloadLength(buf,payload.length); - putMask(buf); - // buf.put(masked(payload)); - - // Prepare CLOSE Frame - buf.put((byte)(0x00 | FIN | OpCode.CLOSE.getCode())); - putPayloadLength(buf,2); - putMask(buf); - buf.put(masked(new byte[] - { 0x03, (byte)0xE8 })); - - // Write Data Frame - BufferUtil.flipToFlush(buf,0); - client.writeRaw(buf); - client.flush(); - - // Read frames - IncomingFramesCapture capture = client.readFrames(1,TimeUnit.MILLISECONDS,500); - - // Validate close - WebSocketFrame frame = capture.getFrames().pop(); - Assert.assertThat("CLOSE.frame.opcode",frame.getOpCode(),is(OpCode.CLOSE)); - CloseInfo close = new CloseInfo(frame); - Assert.assertThat("CLOSE.statusCode",close.getStatusCode(),is(StatusCode.NORMAL)); + fuzzer.connect(); + fuzzer.setSendMode(Fuzzer.SendMode.BULK); + fuzzer.send(send); + fuzzer.expect(expect); } finally { - client.disconnect(); + fuzzer.close(); } - } /** @@ -357,48 +304,24 @@ public class TestABCase2 extends AbstractABCase @Test public void testCase2_8() throws Exception { - BlockheadClient client = new BlockheadClient(server.getServerUri()); + List send = new ArrayList<>(); + send.add(WebSocketFrame.pong().setPayload("unsolicited")); // unsolicited pong + send.add(new CloseInfo(StatusCode.NORMAL).asFrame()); + + List expect = new ArrayList<>(); + expect.add(new CloseInfo(StatusCode.NORMAL).asFrame()); + + Fuzzer fuzzer = new Fuzzer(this); try { - client.connect(); - client.sendStandardRequest(); - client.expectUpgradeResponse(); - - byte payload[] = StringUtil.getUtf8Bytes("unsolicited"); - - ByteBuffer buf = ByteBuffer.allocate(256); - BufferUtil.clearToFill(buf); - - // Prepare Unsolicited PONG Frame - buf.put((byte)(0x00 | FIN | OpCode.PONG.getCode())); - putPayloadLength(buf,payload.length); - putMask(buf); - buf.put(masked(payload)); - - // Prepare CLOSE Frame - buf.put((byte)(0x00 | FIN | OpCode.CLOSE.getCode())); - putPayloadLength(buf,2); - putMask(buf); - buf.put(masked(new byte[] - { 0x03, (byte)0xE8 })); - - // Write Data Frame - BufferUtil.flipToFlush(buf,0); - client.writeRaw(buf); - client.flush(); - - // Read frames - IncomingFramesCapture capture = client.readFrames(1,TimeUnit.MILLISECONDS,500); - - // Validate close - WebSocketFrame frame = capture.getFrames().pop(); - Assert.assertThat("CLOSE.frame.opcode",frame.getOpCode(),is(OpCode.CLOSE)); - CloseInfo close = new CloseInfo(frame); - Assert.assertThat("CLOSE.statusCode",close.getStatusCode(),is(StatusCode.NORMAL)); + fuzzer.connect(); + fuzzer.setSendMode(Fuzzer.SendMode.BULK); + fuzzer.send(send); + fuzzer.expect(expect); } finally { - client.disconnect(); + fuzzer.close(); } } @@ -408,69 +331,26 @@ public class TestABCase2 extends AbstractABCase @Test public void testCase2_9() throws Exception { - // send unsolicited pong with payload. - // send OUR ping with payload - // send close - // expect pong with OUR payload - // expect close + List send = new ArrayList<>(); + send.add(WebSocketFrame.pong().setPayload("unsolicited")); // unsolicited pong + send.add(WebSocketFrame.ping().setPayload("our ping")); // our ping + send.add(new CloseInfo(StatusCode.NORMAL).asFrame()); - BlockheadClient client = new BlockheadClient(server.getServerUri()); + List expect = new ArrayList<>(); + expect.add(WebSocketFrame.pong().setPayload("our ping")); // our pong + expect.add(new CloseInfo(StatusCode.NORMAL).asFrame()); + + Fuzzer fuzzer = new Fuzzer(this); try { - client.connect(); - client.sendStandardRequest(); - client.expectUpgradeResponse(); - - byte pongPayload[] = StringUtil.getUtf8Bytes("unsolicited"); - - ByteBuffer buf = ByteBuffer.allocate(512); - BufferUtil.clearToFill(buf); - - // Prepare Unsolicited PONG Frame - buf.put((byte)(0x00 | FIN | OpCode.PONG.getCode())); - putPayloadLength(buf,pongPayload.length); - putMask(buf); - buf.put(masked(pongPayload)); - - // Prepare our PING with payload - byte pingPayload[] = StringUtil.getUtf8Bytes("ping me"); - buf.put((byte)(0x00 | FIN | OpCode.PING.getCode())); - putPayloadLength(buf,pingPayload.length); - putMask(buf); - buf.put(masked(pingPayload)); - - // Prepare CLOSE Frame - buf.put((byte)(0x00 | FIN | OpCode.CLOSE.getCode())); - putPayloadLength(buf,2); - putMask(buf); - buf.put(masked(new byte[] - { 0x03, (byte)0xE8 })); - - // Write Data Frame - BufferUtil.flipToFlush(buf,0); - client.writeRaw(buf); - client.flush(); - - // Read frames - IncomingFramesCapture capture = client.readFrames(2,TimeUnit.MILLISECONDS,500); - - // Validate PONG - WebSocketFrame frame = capture.getFrames().pop(); - Assert.assertThat("frame should be PONG frame",frame.getOpCode(),is(OpCode.PONG)); - Assert.assertThat("PONG.payloadLength",frame.getPayloadLength(),is(pingPayload.length)); - ByteBufferAssert.assertEquals("PONG.payload",pingPayload,frame.getPayload()); - - // Validate close - frame = capture.getFrames().pop(); - Assert.assertThat("CLOSE.frame.opcode",frame.getOpCode(),is(OpCode.CLOSE)); - CloseInfo close = new CloseInfo(frame); - Assert.assertThat("CLOSE.statusCode",close.getStatusCode(),is(StatusCode.NORMAL)); + fuzzer.connect(); + fuzzer.setSendMode(Fuzzer.SendMode.BULK); + fuzzer.send(send); + fuzzer.expect(expect); } finally { - client.disconnect(); + fuzzer.close(); } - } - } diff --git a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase3.java b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase3.java new file mode 100644 index 00000000000..6e2e0754504 --- /dev/null +++ b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase3.java @@ -0,0 +1,216 @@ +package org.eclipse.jetty.websocket.server.ab; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import org.eclipse.jetty.websocket.api.StatusCode; +import org.eclipse.jetty.websocket.protocol.CloseInfo; +import org.eclipse.jetty.websocket.protocol.WebSocketFrame; +import org.junit.Test; + +public class TestABCase3 extends AbstractABCase +{ + /** + * Send small text frame, with RSV1 == true, with no extensions defined. + */ + @Test + public void testCase3_1() throws Exception + { + WebSocketFrame send = WebSocketFrame.text("small").setRsv1(true); // intentionally bad + + WebSocketFrame expect = new CloseInfo(StatusCode.PROTOCOL).asFrame(); + + Fuzzer fuzzer = new Fuzzer(this); + try + { + fuzzer.connect(); + fuzzer.setSendMode(Fuzzer.SendMode.BULK); + fuzzer.send(send); + fuzzer.expect(expect); + } + finally + { + fuzzer.close(); + } + } + + /** + * Send small text frame, send again with RSV2 == true, then ping, with no extensions defined. + */ + @Test + public void testCase3_2() throws Exception + { + List send = new ArrayList<>(); + send.add(WebSocketFrame.text("small")); + send.add(WebSocketFrame.text("small").setRsv2(true)); // intentionally bad + send.add(WebSocketFrame.ping().setPayload("ping")); + + List expect = new ArrayList<>(); + expect.add(WebSocketFrame.text("small")); // echo on good frame + expect.add(new CloseInfo(StatusCode.PROTOCOL).asFrame()); + + Fuzzer fuzzer = new Fuzzer(this); + try + { + fuzzer.connect(); + fuzzer.setSendMode(Fuzzer.SendMode.BULK); + fuzzer.send(send); + fuzzer.expect(expect); + } + finally + { + fuzzer.close(); + } + } + + /** + * Send small text frame, send again with (RSV1 & RSV2), then ping, with no extensions defined. + */ + @Test + public void testCase3_3() throws Exception + { + List send = new ArrayList<>(); + send.add(WebSocketFrame.text("small")); + send.add(WebSocketFrame.text("small").setRsv1(true).setRsv2(true)); // intentionally bad + send.add(WebSocketFrame.ping().setPayload("ping")); + + List expect = new ArrayList<>(); + expect.add(WebSocketFrame.text("small")); // echo on good frame + expect.add(new CloseInfo(StatusCode.PROTOCOL).asFrame()); + + Fuzzer fuzzer = new Fuzzer(this); + try + { + fuzzer.connect(); + fuzzer.setSendMode(Fuzzer.SendMode.PER_FRAME); + fuzzer.send(send); + fuzzer.expect(expect); + } + finally + { + fuzzer.close(); + } + } + + /** + * Send small text frame, send again with (RSV3), then ping, with no extensions defined. + */ + @Test + public void testCase3_4() throws Exception + { + List send = new ArrayList<>(); + send.add(WebSocketFrame.text("small")); + send.add(WebSocketFrame.text("small").setRsv3(true)); // intentionally bad + send.add(WebSocketFrame.ping().setPayload("ping")); + + List expect = new ArrayList<>(); + expect.add(WebSocketFrame.text("small")); // echo on good frame + expect.add(new CloseInfo(StatusCode.PROTOCOL).asFrame()); + + Fuzzer fuzzer = new Fuzzer(this); + try + { + fuzzer.connect(); + fuzzer.setSendMode(Fuzzer.SendMode.SLOW); + fuzzer.setSlowSendSegmentSize(1); + fuzzer.send(send); + fuzzer.expect(expect); + } + finally + { + fuzzer.close(); + } + } + + /** + * Send binary frame with (RSV3 & RSV1), with no extensions defined. + */ + @Test + public void testCase3_5() throws Exception + { + byte payload[] = new byte[8]; + Arrays.fill(payload,(byte)0xFF); + + List send = new ArrayList<>(); + send.add(WebSocketFrame.binary(payload).setRsv3(true).setRsv1(true)); // intentionally bad + + List expect = new ArrayList<>(); + expect.add(new CloseInfo(StatusCode.PROTOCOL).asFrame()); + + Fuzzer fuzzer = new Fuzzer(this); + try + { + fuzzer.connect(); + fuzzer.setSendMode(Fuzzer.SendMode.BULK); + fuzzer.send(send); + fuzzer.expect(expect); + } + finally + { + fuzzer.close(); + } + } + + /** + * Send ping frame with (RSV3 & RSV2), with no extensions defined. + */ + @Test + public void testCase3_6() throws Exception + { + byte payload[] = new byte[8]; + Arrays.fill(payload,(byte)0xFF); + + List send = new ArrayList<>(); + send.add(WebSocketFrame.ping().setPayload(payload).setRsv3(true).setRsv2(true)); // intentionally bad + + List expect = new ArrayList<>(); + expect.add(new CloseInfo(StatusCode.PROTOCOL).asFrame()); + + Fuzzer fuzzer = new Fuzzer(this); + try + { + fuzzer.connect(); + fuzzer.setSendMode(Fuzzer.SendMode.BULK); + fuzzer.send(send); + fuzzer.expect(expect); + } + finally + { + fuzzer.close(); + } + } + + /** + * Send close frame with (RSV3 & RSV2 & RSV1), with no extensions defined. + */ + @Test + public void testCase3_7() throws Exception + { + byte payload[] = new byte[8]; + Arrays.fill(payload,(byte)0xFF); + + List send = new ArrayList<>(); + WebSocketFrame frame = new CloseInfo(StatusCode.NORMAL).asFrame(); + frame.setRsv1(true); + frame.setRsv2(true); + frame.setRsv3(true); + send.add(frame); // intentionally bad + + List expect = new ArrayList<>(); + expect.add(new CloseInfo(StatusCode.PROTOCOL).asFrame()); + + Fuzzer fuzzer = new Fuzzer(this); + try + { + fuzzer.connect(); + fuzzer.setSendMode(Fuzzer.SendMode.BULK); + fuzzer.send(send); + fuzzer.expect(expect); + } + finally + { + fuzzer.close(); + } + } +} diff --git a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/blockhead/BlockheadClient.java b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/blockhead/BlockheadClient.java index 5989117cdbe..759a22bae29 100644 --- a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/blockhead/BlockheadClient.java +++ b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/blockhead/BlockheadClient.java @@ -174,13 +174,16 @@ public class BlockheadClient implements IncomingFrames, OutgoingFrames LOG.debug("disconnect"); IO.close(in); IO.close(out); - try + if (socket != null) { - socket.close(); - } - catch (IOException ignore) - { - /* ignore */ + try + { + socket.close(); + } + catch (IOException ignore) + { + /* ignore */ + } } } @@ -318,6 +321,11 @@ public class BlockheadClient implements IncomingFrames, OutgoingFrames incomingFrameQueue.incoming(copy); } + public boolean isConnected() + { + return (socket != null) && (socket.isConnected()); + } + public void lookFor(String string) throws IOException { String orig = string; @@ -547,4 +555,24 @@ public class BlockheadClient implements IncomingFrames, OutgoingFrames LOG.debug("write((String)[{}]){}{})",str.length(),'\n',str); out.write(StringUtil.getBytes(str,StringUtil.__ISO_8859_1)); } + + public void writeRawSlowly(ByteBuffer buf, int segmentSize) throws IOException + { + int origLimit = buf.limit(); + int limit = buf.limit(); + int len; + int pos = buf.position(); + int overallLeft = buf.remaining(); + while (overallLeft > 0) + { + buf.position(pos); + limit = Math.min(origLimit,pos + segmentSize); + buf.limit(limit); + len = buf.remaining(); + overallLeft -= len; + pos += len; + writeRaw(buf); + flush(); + } + } } diff --git a/jetty-websocket/websocket-server/src/test/resources/jetty-logging.properties b/jetty-websocket/websocket-server/src/test/resources/jetty-logging.properties index 887eeadef16..7000875148c 100644 --- a/jetty-websocket/websocket-server/src/test/resources/jetty-logging.properties +++ b/jetty-websocket/websocket-server/src/test/resources/jetty-logging.properties @@ -1,15 +1,15 @@ org.eclipse.jetty.util.log.class=org.eclipse.jetty.util.log.StdErrLog -org.eclipse.jetty.io.LEVEL=WARN +org.eclipse.jetty.LEVEL=WARN org.eclipse.jetty.server.LEVEL=WARN # org.eclipse.jetty.websocket.LEVEL=WARN org.eclipse.jetty.websocket.server.helper.RFCSocket.LEVEL=OFF # See the read/write traffic -org.eclipse.jetty.websocket.io.Frames.LEVEL=DEBUG +# org.eclipse.jetty.websocket.io.Frames.LEVEL=DEBUG # org.eclipse.jetty.websocket.io.LEVEL=DEBUG # org.eclipse.jetty.websocket.io.WebSocketAsyncConnection.LEVEL=DEBUG # org.eclipse.jetty.util.thread.QueuedThreadPool.LEVEL=DEBUG # org.eclipse.jetty.io.SelectorManager.LEVEL=INFO -org.eclipse.jetty.websocket.LEVEL=DEBUG +# org.eclipse.jetty.websocket.LEVEL=DEBUG # org.eclipse.jetty.websocket.driver.WebSocketEventDriver.LEVEL=DEBUG # org.eclipse.jetty.websocket.extensions.LEVEL=DEBUG # org.eclipse.jetty.websocket.protocol.Generator.LEVEL=INFO From a97fe106f9b11d6d3f3791ad10b36101736c0c17 Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Tue, 31 Jul 2012 15:15:21 -0700 Subject: [PATCH 05/13] Reworking OpCode from enum to static class --- .../websocket/client/examples/TestClient.java | 10 +-- .../driver/WebSocketEventDriver.java | 8 +- .../deflate/DeflateFrameExtension.java | 4 +- .../fragment/FragmentExtension.java | 4 +- .../jetty/websocket/io/ControlFrameBytes.java | 2 +- .../io/WebSocketAsyncConnection.java | 2 +- .../jetty/websocket/protocol/Frame.java | 2 +- .../jetty/websocket/protocol/Generator.java | 6 +- .../jetty/websocket/protocol/OpCode.java | 73 ++++++++-------- .../jetty/websocket/protocol/Parser.java | 22 ++--- .../websocket/protocol/WebSocketFrame.java | 39 +++++---- .../protocol/ClosePayloadParserTest.java | 5 +- .../protocol/IncomingFramesCapture.java | 10 +-- .../protocol/OutgoingFramesCapture.java | 10 +-- .../jetty/websocket/server/ab/AllTests.java | 2 +- .../jetty/websocket/server/ab/Fuzzer.java | 14 +++ .../websocket/server/ab/TestABCase4.java | 85 +++++++++++++++++++ .../websocket/server/ab/TestABCase5.java | 20 ++--- .../websocket/server/ab/TestABCase7_9.java | 4 +- .../examples/echo/EchoFragmentSocket.java | 7 +- .../server/helper/IncomingFramesCapture.java | 10 +-- .../server/helper/OutgoingFramesCapture.java | 10 +-- .../test/resources/jetty-logging.properties | 2 +- 23 files changed, 227 insertions(+), 124 deletions(-) create mode 100644 jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase4.java diff --git a/jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/examples/TestClient.java b/jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/examples/TestClient.java index f51782127c7..b1b5a607ad2 100644 --- a/jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/examples/TestClient.java +++ b/jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/examples/TestClient.java @@ -67,7 +67,7 @@ public class TestClient } } - public void send(OpCode op, byte[] data, int maxFragmentLength) + public void send(byte op, byte[] data, int maxFragmentLength) { _starts.add(System.nanoTime()); @@ -215,7 +215,7 @@ public class TestClient { long next = System.currentTimeMillis() + delay; - OpCode op = OpCode.TEXT; + byte op = OpCode.TEXT; if (binary) { op = OpCode.BINARY; @@ -225,7 +225,7 @@ public class TestClient switch (op) { - case TEXT: + case OpCode.TEXT: { StringBuilder b = new StringBuilder(); while (b.length() < size) @@ -235,7 +235,7 @@ public class TestClient data = b.toString().getBytes(StringUtil.__UTF8_CHARSET); break; } - case BINARY: + case OpCode.BINARY: { data = new byte[size]; __random.nextBytes(data); @@ -328,7 +328,7 @@ public class TestClient client.connect(wsUri,socket).get(10,TimeUnit.SECONDS); } - private void send(OpCode op, byte[] data, int fragment) + private void send(byte op, byte[] data, int fragment) { socket.send(op,data,fragment); } diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/driver/WebSocketEventDriver.java b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/driver/WebSocketEventDriver.java index bcc45924c5d..dc8bc85e101 100644 --- a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/driver/WebSocketEventDriver.java +++ b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/driver/WebSocketEventDriver.java @@ -179,7 +179,7 @@ public class WebSocketEventDriver implements IncomingFrames { switch (frame.getOpCode()) { - case CLOSE: + case OpCode.CLOSE: { CloseInfo close = new CloseInfo(frame); if (events.onClose != null) @@ -188,7 +188,7 @@ public class WebSocketEventDriver implements IncomingFrames } throw new CloseException(close.getStatusCode(),close.getReason()); } - case PING: + case OpCode.PING: { WebSocketFrame pong = new WebSocketFrame(OpCode.PONG); if (frame.getPayloadLength() > 0) @@ -203,7 +203,7 @@ public class WebSocketEventDriver implements IncomingFrames session.output("pong",new FutureCallback(),pong); break; } - case BINARY: + case OpCode.BINARY: { if (events.onBinary == null) { @@ -273,7 +273,7 @@ public class WebSocketEventDriver implements IncomingFrames } return; } - case TEXT: + case OpCode.TEXT: { if (events.onText == null) { diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/extensions/deflate/DeflateFrameExtension.java b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/extensions/deflate/DeflateFrameExtension.java index 15a4a00ddf6..5c83ec3eb86 100644 --- a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/extensions/deflate/DeflateFrameExtension.java +++ b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/extensions/deflate/DeflateFrameExtension.java @@ -114,7 +114,7 @@ public class DeflateFrameExtension extends Extension @Override public void incoming(WebSocketFrame frame) { - if (frame.getOpCode().isControlFrame() || !frame.isRsv1()) + if (frame.isControlFrame() || !frame.isRsv1()) { // Cannot modify incoming control frames or ones with RSV1 set. super.incoming(frame); @@ -183,7 +183,7 @@ public class DeflateFrameExtension extends Extension @Override public void output(C context, Callback callback, WebSocketFrame frame) throws IOException { - if (frame.getOpCode().isControlFrame()) + if (frame.isControlFrame()) { // skip, cannot compress control frames. nextOutput(context,callback,frame); diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/extensions/fragment/FragmentExtension.java b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/extensions/fragment/FragmentExtension.java index 187585cee4d..b4210a17993 100644 --- a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/extensions/fragment/FragmentExtension.java +++ b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/extensions/fragment/FragmentExtension.java @@ -31,7 +31,7 @@ public class FragmentExtension extends Extension @Override public void output(C context, Callback callback, WebSocketFrame frame) throws IOException { - if (frame.getOpCode().isControlFrame()) + if (frame.isControlFrame()) { // Cannot fragment Control Frames nextOutput(context,callback,frame); @@ -40,7 +40,7 @@ public class FragmentExtension extends Extension int length = frame.getPayloadLength(); - OpCode opcode = frame.getOpCode(); // original opcode + byte opcode = frame.getOpCode(); // original opcode ByteBuffer payload = frame.getPayload().slice(); int originalLimit = payload.limit(); int currentPosition = payload.position(); diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/io/ControlFrameBytes.java b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/io/ControlFrameBytes.java index 59c62a71841..188436c1aad 100644 --- a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/io/ControlFrameBytes.java +++ b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/io/ControlFrameBytes.java @@ -36,7 +36,7 @@ public class ControlFrameBytes extends FrameBytes super.completed(context); - if(frame.getOpCode() == OpCode.CLOSE) + if (frame.getOpCode() == OpCode.CLOSE) { // Disconnect the connection (no more packets/frames) connection.disconnect(false); diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/io/WebSocketAsyncConnection.java b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/io/WebSocketAsyncConnection.java index ab9e7d79d02..48b5b2f1957 100644 --- a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/io/WebSocketAsyncConnection.java +++ b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/io/WebSocketAsyncConnection.java @@ -244,7 +244,7 @@ public abstract class WebSocketAsyncConnection extends AbstractAsyncConnection i { FrameBytes bytes = null; - if (frame.getOpCode().isControlFrame()) + if (frame.isControlFrame()) { bytes = new ControlFrameBytes(this,callback,context,frame); } diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/protocol/Frame.java b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/protocol/Frame.java index 048dd0abf21..40a4186354b 100644 --- a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/protocol/Frame.java +++ b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/protocol/Frame.java @@ -26,7 +26,7 @@ public interface Frame { public byte[] getMask(); - public OpCode getOpCode(); + public byte getOpCode(); public ByteBuffer getPayload(); diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/protocol/Generator.java b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/protocol/Generator.java index e57d921bb6b..02fea82c277 100644 --- a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/protocol/Generator.java +++ b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/protocol/Generator.java @@ -125,7 +125,7 @@ public class Generator throw new ProtocolException("RSV3 not allowed to be set"); } - if (frame.getOpCode().isControlFrame()) + if (frame.isControlFrame()) { /* * RFC 6455 Section 5.5 @@ -229,12 +229,12 @@ public class Generator b |= 0x10; } - byte opcode = frame.getOpCode().getCode(); + byte opcode = frame.getOpCode(); if (frame.isContinuation()) { // Continuations are not the same OPCODE - opcode = OpCode.CONTINUATION.getCode(); + opcode = OpCode.CONTINUATION; } b |= opcode & 0x0F; diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/protocol/OpCode.java b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/protocol/OpCode.java index 4b9fb321b16..40f5967252d 100644 --- a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/protocol/OpCode.java +++ b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/protocol/OpCode.java @@ -15,89 +15,92 @@ //======================================================================== package org.eclipse.jetty.websocket.protocol; -import java.util.HashMap; -import java.util.Map; -public enum OpCode +public final class OpCode { /** * OpCode for a Continuation Frame * * @see RFC 6455, Section 11.8 (WebSocket Opcode Registry */ - CONTINUATION((byte)0x00), + public static final byte CONTINUATION = (byte)0x00; /** * OpCode for a Text Frame * * @see RFC 6455, Section 11.8 (WebSocket Opcode Registry */ - TEXT((byte)0x01), + public static final byte TEXT = (byte)0x01; /** * OpCode for a Binary Frame * * @see RFC 6455, Section 11.8 (WebSocket Opcode Registry */ - BINARY((byte)0x02), + public static final byte BINARY = (byte)0x02; /** * OpCode for a Close Frame * * @see RFC 6455, Section 11.8 (WebSocket Opcode Registry */ - CLOSE((byte)0x08), + public static final byte CLOSE = (byte)0x08; /** * OpCode for a Ping Frame * * @see RFC 6455, Section 11.8 (WebSocket Opcode Registry */ - PING((byte)0x09), + public static final byte PING = (byte)0x09; /** * OpCode for a Pong Frame * * @see RFC 6455, Section 11.8 (WebSocket Opcode Registry */ - PONG((byte)0x0A); + public static final byte PONG = (byte)0x0A; - private static class Codes + public static boolean isControlFrame(byte opcode) { - private static final Map codes = new HashMap<>(); + return (opcode >= CLOSE); + } + + public static boolean isDataFrame(byte opcode) + { + return (opcode == TEXT) || (opcode == BINARY); } /** - * Get OpCode from specified value. + * Test for known opcodes (per the RFC spec) * * @param opcode - * @return + * the opcode to test + * @return true if known. false if unknown, undefined, or reserved */ - public static OpCode from(byte opcode) + public static boolean isKnown(byte opcode) { - return Codes.codes.get(opcode); + return (opcode == CONTINUATION) || (opcode == TEXT) || (opcode == BINARY) || (opcode == CLOSE) || (opcode == PING) || (opcode == PONG); } - private byte opcode; - - private OpCode(byte opcode) + public static String name(byte opcode) { - this.opcode = opcode; - Codes.codes.put(opcode,this); - } - - public byte getCode() - { - return this.opcode; - } - - public boolean isControlFrame() - { - return (opcode >= CLOSE.opcode); - } - - public boolean isDataFrame() - { - return (this == TEXT) || (this == BINARY); + switch (opcode) + { + case -1: + return "NO-OP"; + case CONTINUATION: + return "CONTINUATION"; + case TEXT: + return "TEXT"; + case BINARY: return "BINARY"; + case CLOSE: + return "CLOSE"; + case PING: + return "PING"; + case PONG: + return "PONG"; + default: + return "NON-SPEC[" + opcode + "]"; + } } } diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/protocol/Parser.java b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/protocol/Parser.java index 76ef7f4d098..7e9e5c94df7 100644 --- a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/protocol/Parser.java +++ b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/protocol/Parser.java @@ -49,7 +49,7 @@ public class Parser private int cursor = 0; // Frame private WebSocketFrame frame; - private OpCode lastDataOpcode; + private byte lastDataOpcode; // payload specific private ByteBuffer payload; private int payloadLength; @@ -83,14 +83,14 @@ public class Parser switch (frame.getOpCode()) { - case CLOSE: + case OpCode.CLOSE: if (len == 1) { throw new ProtocolException("Invalid close frame payload length, [" + payloadLength + "]"); } // fall thru - case PING: - case PONG: + case OpCode.PING: + case OpCode.PONG: if (len > WebSocketFrame.MAX_CONTROL_PAYLOAD) { throw new ProtocolException("Invalid control frame payload length, [" + payloadLength + "] cannot exceed [" @@ -237,14 +237,14 @@ public class Parser boolean rsv2 = ((b & 0x20) != 0); boolean rsv3 = ((b & 0x10) != 0); byte opc = (byte)(b & 0x0F); - OpCode opcode = OpCode.from(opc); + byte opcode = opc; - if (opcode == null) + if (!OpCode.isKnown(opcode)) { - throw new WebSocketException("Unknown opcode: " + opc); + throw new ProtocolException("Unknown opcode: " + opc); } - LOG.debug("OpCode {}, fin={}",opcode.name(),fin); + LOG.debug("OpCode {}, fin={}",OpCode.name(opcode),fin); /* * RFC 6455 Section 5.2 @@ -267,9 +267,9 @@ public class Parser throw new ProtocolException("RSV3 not allowed to be set"); } - if (opcode.isControlFrame() && !fin) + if (OpCode.isControlFrame(opcode) && !fin) { - throw new ProtocolException("Fragmented Control Frame [" + opcode.name() + "]"); + throw new ProtocolException("Fragmented Control Frame [" + OpCode.name(opcode) + "]"); } if (opcode == OpCode.CONTINUATION) @@ -290,7 +290,7 @@ public class Parser frame.setRsv3(rsv3); frame.setOpCode(opcode); - if (opcode.isDataFrame()) + if (frame.isDataFrame()) { lastDataOpcode = opcode; } diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/protocol/WebSocketFrame.java b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/protocol/WebSocketFrame.java index 9594dd1e754..53657f6fd82 100644 --- a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/protocol/WebSocketFrame.java +++ b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/protocol/WebSocketFrame.java @@ -84,7 +84,7 @@ public class WebSocketFrame implements Frame private boolean rsv1 = false; private boolean rsv2 = false; private boolean rsv3 = false; - private OpCode opcode = null; + private byte opcode = -1; private boolean masked = false; private byte mask[]; /** @@ -111,7 +111,7 @@ public class WebSocketFrame implements Frame /** * Construct form opcode */ - public WebSocketFrame(OpCode opcode) + public WebSocketFrame(byte opcode) { reset(); this.opcode = opcode; @@ -151,7 +151,7 @@ public class WebSocketFrame implements Frame public void assertValid() { - if (opcode.isControlFrame()) + if (OpCode.isControlFrame(opcode)) { if (getPayloadLength() > WebSocketFrame.MAX_CONTROL_PAYLOAD) { @@ -211,7 +211,7 @@ public class WebSocketFrame implements Frame } @Override - public final OpCode getOpCode() + public final byte getOpCode() { return opcode; } @@ -275,6 +275,16 @@ public class WebSocketFrame implements Frame return continuation; } + public boolean isControlFrame() + { + return OpCode.isControlFrame(opcode); + } + + public boolean isDataFrame() + { + return OpCode.isDataFrame(opcode); + } + @Override public boolean isFin() { @@ -348,7 +358,7 @@ public class WebSocketFrame implements Frame rsv1 = false; rsv2 = false; rsv3 = false; - opcode = null; + opcode = -1; masked = false; data = null; payloadLength = 0; @@ -388,9 +398,9 @@ public class WebSocketFrame implements Frame return this; } - public WebSocketFrame setOpCode(OpCode opCode) + public WebSocketFrame setOpCode(byte op) { - this.opcode = opCode; + this.opcode = op; return this; } @@ -408,7 +418,7 @@ public class WebSocketFrame implements Frame return this; } - if (opcode.isControlFrame()) + if (OpCode.isControlFrame(opcode)) { if (buf.length > WebSocketFrame.MAX_CONTROL_PAYLOAD) { @@ -436,7 +446,7 @@ public class WebSocketFrame implements Frame return this; } - if (opcode.isControlFrame()) + if (OpCode.isControlFrame(opcode)) { if (len > WebSocketFrame.MAX_CONTROL_PAYLOAD) { @@ -468,7 +478,7 @@ public class WebSocketFrame implements Frame return this; } - if (opcode.isControlFrame()) + if (OpCode.isControlFrame(opcode)) { if (buf.remaining() > WebSocketFrame.MAX_CONTROL_PAYLOAD) { @@ -510,14 +520,7 @@ public class WebSocketFrame implements Frame public String toString() { StringBuilder b = new StringBuilder(); - if (opcode != null) - { - b.append(opcode.name()); - } - else - { - b.append("NO-OP"); - } + b.append(OpCode.name(opcode)); b.append('['); b.append("len=").append(payloadLength); b.append(",fin=").append(fin); diff --git a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/protocol/ClosePayloadParserTest.java b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/protocol/ClosePayloadParserTest.java index 848af0f6169..5e3e4955b89 100644 --- a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/protocol/ClosePayloadParserTest.java +++ b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/protocol/ClosePayloadParserTest.java @@ -23,9 +23,6 @@ import org.eclipse.jetty.util.StringUtil; import org.eclipse.jetty.websocket.api.StatusCode; import org.eclipse.jetty.websocket.api.WebSocketBehavior; import org.eclipse.jetty.websocket.api.WebSocketPolicy; -import org.eclipse.jetty.websocket.protocol.CloseInfo; -import org.eclipse.jetty.websocket.protocol.OpCode; -import org.eclipse.jetty.websocket.protocol.Parser; import org.junit.Assert; import org.junit.Test; @@ -43,7 +40,7 @@ public class ClosePayloadParserTest payload.flip(); ByteBuffer buf = ByteBuffer.allocate(24); - buf.put((byte)(0x80 | OpCode.CLOSE.getCode())); // fin + close + buf.put((byte)(0x80 | OpCode.CLOSE)); // fin + close buf.put((byte)(0x80 | payload.remaining())); MaskedByteBuffer.putMask(buf); MaskedByteBuffer.putPayload(buf,payload); diff --git a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/protocol/IncomingFramesCapture.java b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/protocol/IncomingFramesCapture.java index 301590e7d0a..56b9c15fbec 100644 --- a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/protocol/IncomingFramesCapture.java +++ b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/protocol/IncomingFramesCapture.java @@ -47,14 +47,14 @@ public class IncomingFramesCapture implements IncomingFrames Assert.assertThat(errorType.getSimpleName(),getErrorCount(errorType),is(expectedCount)); } - public void assertHasFrame(OpCode op) + public void assertHasFrame(byte op) { - Assert.assertThat(op.name(),getFrameCount(op),greaterThanOrEqualTo(1)); + Assert.assertThat(OpCode.name(op),getFrameCount(op),greaterThanOrEqualTo(1)); } - public void assertHasFrame(OpCode op, int expectedCount) + public void assertHasFrame(byte op, int expectedCount) { - Assert.assertThat(op.name(),getFrameCount(op),is(expectedCount)); + Assert.assertThat(OpCode.name(op),getFrameCount(op),is(expectedCount)); } public void assertHasNoFrames() @@ -95,7 +95,7 @@ public class IncomingFramesCapture implements IncomingFrames return errors; } - public int getFrameCount(OpCode op) + public int getFrameCount(byte op) { int count = 0; for(WebSocketFrame frame: frames) { diff --git a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/protocol/OutgoingFramesCapture.java b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/protocol/OutgoingFramesCapture.java index 0d17cb7b800..91cfc313319 100644 --- a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/protocol/OutgoingFramesCapture.java +++ b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/protocol/OutgoingFramesCapture.java @@ -40,14 +40,14 @@ public class OutgoingFramesCapture implements OutgoingFrames Assert.assertThat("Captured frame count",writes.size(),is(expectedCount)); } - public void assertHasFrame(OpCode op) + public void assertHasFrame(byte op) { - Assert.assertThat(op.name(),getFrameCount(op),greaterThanOrEqualTo(1)); + Assert.assertThat(OpCode.name(op),getFrameCount(op),greaterThanOrEqualTo(1)); } - public void assertHasFrame(OpCode op, int expectedCount) + public void assertHasFrame(byte op, int expectedCount) { - Assert.assertThat(op.name(),getFrameCount(op),is(expectedCount)); + Assert.assertThat(OpCode.name(op),getFrameCount(op),is(expectedCount)); } public void assertHasNoFrames() @@ -66,7 +66,7 @@ public class OutgoingFramesCapture implements OutgoingFrames } } - public int getFrameCount(OpCode op) + public int getFrameCount(byte op) { int count = 0; for (Write write : writes) diff --git a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/AllTests.java b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/AllTests.java index 8f68c1355ed..35f02c7b947 100644 --- a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/AllTests.java +++ b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/AllTests.java @@ -5,7 +5,7 @@ import org.junit.runners.Suite; @RunWith(Suite.class) @Suite.SuiteClasses( -{ TestABCase1.class, TestABCase2.class, TestABCase3.class, TestABCase5.class, TestABCase7_9.class }) +{ TestABCase1.class, TestABCase2.class, TestABCase3.class, TestABCase4.class, TestABCase5.class, TestABCase7_9.class }) public class AllTests { /* let junit do the rest */ diff --git a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/Fuzzer.java b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/Fuzzer.java index b44ac988acc..89183d12306 100644 --- a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/Fuzzer.java +++ b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/Fuzzer.java @@ -111,6 +111,20 @@ public class Fuzzer return slowSendSegmentSize; } + public void send(ByteBuffer buf) throws IOException + { + Assert.assertThat("Client connected",client.isConnected(),is(true)); + LOG.debug("Sending bytes {}",BufferUtil.toDetailString(buf)); + if (sendMode == SendMode.SLOW) + { + client.writeRawSlowly(buf,slowSendSegmentSize); + } + else + { + client.writeRaw(buf); + } + } + public void send(List send) throws IOException { Assert.assertThat("Client connected",client.isConnected(),is(true)); diff --git a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase4.java b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase4.java new file mode 100644 index 00000000000..0e0682a52e4 --- /dev/null +++ b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase4.java @@ -0,0 +1,85 @@ +package org.eclipse.jetty.websocket.server.ab; + +import java.nio.ByteBuffer; +import java.util.ArrayList; +import java.util.List; + +import org.eclipse.jetty.util.BufferUtil; +import org.eclipse.jetty.util.StringUtil; +import org.eclipse.jetty.websocket.api.StatusCode; +import org.eclipse.jetty.websocket.protocol.CloseInfo; +import org.eclipse.jetty.websocket.protocol.WebSocketFrame; +import org.junit.Test; + +public class TestABCase4 extends AbstractABCase +{ + /** + * Send opcode 3 (reserved) + */ + @Test + public void testCase4_1_1() throws Exception + { + ByteBuffer buf = ByteBuffer.allocate(32); + BufferUtil.clearToFill(buf); + + // Construct bad frame by hand + byte opcode = 3; + buf.put((byte)(0x00 | FIN | opcode)); // bad + putPayloadLength(buf,0); + putMask(buf); + BufferUtil.flipToFlush(buf,0); + + // Expectations + List expect = new ArrayList<>(); + expect.add(new CloseInfo(StatusCode.PROTOCOL).asFrame()); + + Fuzzer fuzzer = new Fuzzer(this); + try + { + fuzzer.connect(); + fuzzer.setSendMode(Fuzzer.SendMode.BULK); + fuzzer.send(buf); + fuzzer.expect(expect); + } + finally + { + fuzzer.close(); + } + } + + /** + * Send opcode 4 (reserved), with payload + */ + @Test + public void testCase4_1_2() throws Exception + { + byte payload[] = StringUtil.getUtf8Bytes("reserved payload"); + ByteBuffer buf = ByteBuffer.allocate(32); + BufferUtil.clearToFill(buf); + + // Construct bad frame by hand + byte opcode = 4; + buf.put((byte)(0x00 | FIN | opcode)); // bad + putPayloadLength(buf,payload.length); + putMask(buf); + buf.put(masked(payload)); + BufferUtil.flipToFlush(buf,0); + + // Expectations + List expect = new ArrayList<>(); + expect.add(new CloseInfo(StatusCode.PROTOCOL).asFrame()); + + Fuzzer fuzzer = new Fuzzer(this); + try + { + fuzzer.connect(); + fuzzer.setSendMode(Fuzzer.SendMode.BULK); + fuzzer.send(buf); + fuzzer.expect(expect); + } + finally + { + fuzzer.close(); + } + } +} diff --git a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase5.java b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase5.java index 42fb849392c..18a719d66a6 100644 --- a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase5.java +++ b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase5.java @@ -85,7 +85,7 @@ public class TestABCase5 String fragment1 = "fragment1"; // Intentionally bad PING (spec says control frames must be FIN==true) - buf.put((byte)(NOFIN | OpCode.PING.getCode())); + buf.put((byte)(NOFIN | OpCode.PING)); byte b = 0x00; // no masking b |= fragment1.length() & 0x7F; @@ -100,7 +100,7 @@ public class TestABCase5 String fragment2 = "fragment2"; - buf2.put((byte)(FIN | OpCode.PING.getCode())); + buf2.put((byte)(FIN | OpCode.PING)); b = 0x00; // no masking b |= fragment2.length() & 0x7F; buf2.put(b); @@ -172,7 +172,7 @@ public class TestABCase5 String fragment1 = "fragment1"; - buf.put((byte)(NOFIN | OpCode.PONG.getCode())); + buf.put((byte)(NOFIN | OpCode.PONG)); byte b = 0x00; // no masking b |= fragment1.length() & 0x7F; @@ -187,7 +187,7 @@ public class TestABCase5 String fragment2 = "fragment2"; - buf2.put((byte)(FIN | OpCode.CONTINUATION.getCode())); + buf2.put((byte)(FIN | OpCode.CONTINUATION)); b = 0x00; // no masking b |= fragment2.length() & 0x7F; buf2.put(b); @@ -258,7 +258,7 @@ public class TestABCase5 String fragment1 = "fragment1"; - buf.put((byte)(NOFIN | OpCode.TEXT.getCode())); + buf.put((byte)(NOFIN | OpCode.TEXT)); byte b = 0x00; // no masking b |= fragment1.length() & 0x7F; @@ -273,7 +273,7 @@ public class TestABCase5 String fragment2 = "fragment2"; - buf2.put((byte)(FIN | OpCode.CONTINUATION.getCode())); + buf2.put((byte)(FIN | OpCode.CONTINUATION)); b = 0x00; // no masking b |= fragment2.length() & 0x7F; buf2.put(b); @@ -313,7 +313,7 @@ public class TestABCase5 String fragment1 = "fragment1"; - buf.put((byte)(NOFIN | OpCode.TEXT.getCode())); + buf.put((byte)(NOFIN | OpCode.TEXT)); byte b = 0x00; // no masking b |= fragment1.length() & 0x7F; @@ -330,7 +330,7 @@ public class TestABCase5 String pingPayload = "ping payload"; - pingBuf.put((byte)(FIN | OpCode.PING.getCode())); + pingBuf.put((byte)(FIN | OpCode.PING)); b = 0x00; // no masking b |= pingPayload.length() & 0x7F; @@ -347,7 +347,7 @@ public class TestABCase5 String fragment2 = "fragment2"; - buf2.put((byte)(FIN | OpCode.CONTINUATION.getCode())); + buf2.put((byte)(FIN | OpCode.CONTINUATION)); b = 0x00; // no masking b |= fragment2.length() & 0x7F; buf2.put(b); @@ -445,7 +445,7 @@ public class TestABCase5 // continuation w / FIN - buf.put((byte)(FIN | OpCode.CONTINUATION.getCode())); + buf.put((byte)(FIN | OpCode.CONTINUATION)); byte b = 0x00; // no masking b |= fragment1.length() & 0x7F; diff --git a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase7_9.java b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase7_9.java index d883122ffd2..6c70281a6b3 100644 --- a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase7_9.java +++ b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase7_9.java @@ -118,7 +118,7 @@ public class TestABCase7_9 BufferUtil.clearToFill(buf); // Create Close Frame manually, as we are testing the server's behavior of a bad client. - buf.put((byte)(0x80 | OpCode.CLOSE.getCode())); + buf.put((byte)(0x80 | OpCode.CLOSE)); buf.put((byte)(0x80 | 2)); byte mask[] = new byte[] { 0x44, 0x44, 0x44, 0x44 }; @@ -159,7 +159,7 @@ public class TestABCase7_9 BufferUtil.clearToFill(buf); // Create Close Frame manually, as we are testing the server's behavior of a bad client. - buf.put((byte)(0x80 | OpCode.CLOSE.getCode())); + buf.put((byte)(0x80 | OpCode.CLOSE)); buf.put((byte)(0x80 | (2 + reason.length()))); byte mask[] = new byte[] { 0x44, 0x44, 0x44, 0x44 }; diff --git a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/examples/echo/EchoFragmentSocket.java b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/examples/echo/EchoFragmentSocket.java index 8613594f454..56b92645cd7 100644 --- a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/examples/echo/EchoFragmentSocket.java +++ b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/examples/echo/EchoFragmentSocket.java @@ -25,6 +25,7 @@ import org.eclipse.jetty.websocket.annotations.OnWebSocketFrame; import org.eclipse.jetty.websocket.annotations.WebSocket; import org.eclipse.jetty.websocket.api.WebSocketConnection; import org.eclipse.jetty.websocket.protocol.Frame; +import org.eclipse.jetty.websocket.protocol.OpCode; /** * Echo back the incoming text or binary as 2 frames of (roughly) equal size. @@ -35,7 +36,7 @@ public class EchoFragmentSocket @OnWebSocketFrame public void onFrame(WebSocketConnection conn, Frame frame) { - if (!frame.getOpCode().isDataFrame()) + if (!OpCode.isDataFrame(frame.getOpCode())) { return; } @@ -55,11 +56,11 @@ public class EchoFragmentSocket { switch (frame.getOpCode()) { - case BINARY: + case OpCode.BINARY: conn.write(null,nop,buf1); conn.write(null,nop,buf2); break; - case TEXT: + case OpCode.TEXT: // NOTE: This impl is not smart enough to split on a UTF8 boundary conn.write(null,nop,BufferUtil.toUTF8String(buf1)); conn.write(null,nop,BufferUtil.toUTF8String(buf2)); diff --git a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/helper/IncomingFramesCapture.java b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/helper/IncomingFramesCapture.java index facf6b45650..864ed3b96a6 100644 --- a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/helper/IncomingFramesCapture.java +++ b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/helper/IncomingFramesCapture.java @@ -49,14 +49,14 @@ public class IncomingFramesCapture implements IncomingFrames Assert.assertThat(errorType.getSimpleName(),getErrorCount(errorType),is(expectedCount)); } - public void assertHasFrame(OpCode op) + public void assertHasFrame(byte op) { - Assert.assertThat(op.name(),getFrameCount(op),greaterThanOrEqualTo(1)); + Assert.assertThat(OpCode.name(op),getFrameCount(op),greaterThanOrEqualTo(1)); } - public void assertHasFrame(OpCode op, int expectedCount) + public void assertHasFrame(byte op, int expectedCount) { - Assert.assertThat(op.name(),getFrameCount(op),is(expectedCount)); + Assert.assertThat(OpCode.name(op),getFrameCount(op),is(expectedCount)); } public void assertHasNoFrames() @@ -98,7 +98,7 @@ public class IncomingFramesCapture implements IncomingFrames return errors; } - public int getFrameCount(OpCode op) + public int getFrameCount(byte op) { int count = 0; for (WebSocketFrame frame : frames) diff --git a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/helper/OutgoingFramesCapture.java b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/helper/OutgoingFramesCapture.java index 3a75c3ba96e..a26b11c8d7e 100644 --- a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/helper/OutgoingFramesCapture.java +++ b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/helper/OutgoingFramesCapture.java @@ -42,14 +42,14 @@ public class OutgoingFramesCapture implements OutgoingFrames Assert.assertThat("Captured frame count",writes.size(),is(expectedCount)); } - public void assertHasFrame(OpCode op) + public void assertHasFrame(byte op) { - Assert.assertThat(op.name(),getFrameCount(op),greaterThanOrEqualTo(1)); + Assert.assertThat(OpCode.name(op),getFrameCount(op),greaterThanOrEqualTo(1)); } - public void assertHasFrame(OpCode op, int expectedCount) + public void assertHasFrame(byte op, int expectedCount) { - Assert.assertThat(op.name(),getFrameCount(op),is(expectedCount)); + Assert.assertThat(OpCode.name(op),getFrameCount(op),is(expectedCount)); } public void assertHasNoFrames() @@ -68,7 +68,7 @@ public class OutgoingFramesCapture implements OutgoingFrames } } - public int getFrameCount(OpCode op) + public int getFrameCount(byte op) { int count = 0; for (Write write : writes) diff --git a/jetty-websocket/websocket-server/src/test/resources/jetty-logging.properties b/jetty-websocket/websocket-server/src/test/resources/jetty-logging.properties index 7000875148c..71cc4f86bba 100644 --- a/jetty-websocket/websocket-server/src/test/resources/jetty-logging.properties +++ b/jetty-websocket/websocket-server/src/test/resources/jetty-logging.properties @@ -9,7 +9,7 @@ org.eclipse.jetty.websocket.server.helper.RFCSocket.LEVEL=OFF # org.eclipse.jetty.websocket.io.WebSocketAsyncConnection.LEVEL=DEBUG # org.eclipse.jetty.util.thread.QueuedThreadPool.LEVEL=DEBUG # org.eclipse.jetty.io.SelectorManager.LEVEL=INFO -# org.eclipse.jetty.websocket.LEVEL=DEBUG +org.eclipse.jetty.websocket.LEVEL=DEBUG # org.eclipse.jetty.websocket.driver.WebSocketEventDriver.LEVEL=DEBUG # org.eclipse.jetty.websocket.extensions.LEVEL=DEBUG # org.eclipse.jetty.websocket.protocol.Generator.LEVEL=INFO From ab89924261bb2465a370929cb34917cef302b668 Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Tue, 31 Jul 2012 15:24:33 -0700 Subject: [PATCH 06/13] Fleshing out more AB case 4 tests --- .../jetty/websocket/server/ab/Fuzzer.java | 1 + .../websocket/server/ab/TestABCase4.java | 117 ++++++++++++++---- 2 files changed, 94 insertions(+), 24 deletions(-) diff --git a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/Fuzzer.java b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/Fuzzer.java index 89183d12306..46ccb7e8d7a 100644 --- a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/Fuzzer.java +++ b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/Fuzzer.java @@ -162,6 +162,7 @@ public class Fuzzer { for (WebSocketFrame f : send) { + f.setMask(MASK); // make sure we have mask set // Using lax generator, generate and send client.writeRaw(generator.generate(f)); client.flush(); diff --git a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase4.java b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase4.java index 0e0682a52e4..5c4e6c23f78 100644 --- a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase4.java +++ b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase4.java @@ -1,10 +1,8 @@ package org.eclipse.jetty.websocket.server.ab; -import java.nio.ByteBuffer; import java.util.ArrayList; import java.util.List; -import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.StringUtil; import org.eclipse.jetty.websocket.api.StatusCode; import org.eclipse.jetty.websocket.protocol.CloseInfo; @@ -19,17 +17,9 @@ public class TestABCase4 extends AbstractABCase @Test public void testCase4_1_1() throws Exception { - ByteBuffer buf = ByteBuffer.allocate(32); - BufferUtil.clearToFill(buf); + List send = new ArrayList<>(); + send.add(new WebSocketFrame((byte)3)); // intentionally bad - // Construct bad frame by hand - byte opcode = 3; - buf.put((byte)(0x00 | FIN | opcode)); // bad - putPayloadLength(buf,0); - putMask(buf); - BufferUtil.flipToFlush(buf,0); - - // Expectations List expect = new ArrayList<>(); expect.add(new CloseInfo(StatusCode.PROTOCOL).asFrame()); @@ -38,7 +28,7 @@ public class TestABCase4 extends AbstractABCase { fuzzer.connect(); fuzzer.setSendMode(Fuzzer.SendMode.BULK); - fuzzer.send(buf); + fuzzer.send(send); fuzzer.expect(expect); } finally @@ -54,18 +44,10 @@ public class TestABCase4 extends AbstractABCase public void testCase4_1_2() throws Exception { byte payload[] = StringUtil.getUtf8Bytes("reserved payload"); - ByteBuffer buf = ByteBuffer.allocate(32); - BufferUtil.clearToFill(buf); - // Construct bad frame by hand - byte opcode = 4; - buf.put((byte)(0x00 | FIN | opcode)); // bad - putPayloadLength(buf,payload.length); - putMask(buf); - buf.put(masked(payload)); - BufferUtil.flipToFlush(buf,0); + List send = new ArrayList<>(); + send.add(new WebSocketFrame((byte)4).setPayload(payload)); // intentionally bad - // Expectations List expect = new ArrayList<>(); expect.add(new CloseInfo(StatusCode.PROTOCOL).asFrame()); @@ -74,7 +56,94 @@ public class TestABCase4 extends AbstractABCase { fuzzer.connect(); fuzzer.setSendMode(Fuzzer.SendMode.BULK); - fuzzer.send(buf); + fuzzer.send(send); + fuzzer.expect(expect); + } + finally + { + fuzzer.close(); + } + } + + /** + * Send small text, then frame with opcode 5 (reserved), then ping + */ + @Test + public void testCase4_1_3() throws Exception + { + List send = new ArrayList<>(); + send.add(WebSocketFrame.text("hello")); + send.add(new WebSocketFrame((byte)5)); // intentionally bad + send.add(WebSocketFrame.ping()); + + List expect = new ArrayList<>(); + expect.add(WebSocketFrame.text("hello")); // echo + expect.add(new CloseInfo(StatusCode.PROTOCOL).asFrame()); + + Fuzzer fuzzer = new Fuzzer(this); + try + { + fuzzer.connect(); + fuzzer.setSendMode(Fuzzer.SendMode.BULK); + fuzzer.send(send); + fuzzer.expect(expect); + } + finally + { + fuzzer.close(); + } + } + + /** + * Send small text, then frame with opcode 6 (reserved) w/payload, then ping + */ + @Test + public void testCase4_1_4() throws Exception + { + List send = new ArrayList<>(); + send.add(WebSocketFrame.text("hello")); + send.add(new WebSocketFrame((byte)6).setPayload("bad")); // intentionally bad + send.add(WebSocketFrame.ping()); + + List expect = new ArrayList<>(); + expect.add(WebSocketFrame.text("hello")); // echo + expect.add(new CloseInfo(StatusCode.PROTOCOL).asFrame()); + + Fuzzer fuzzer = new Fuzzer(this); + try + { + fuzzer.connect(); + fuzzer.setSendMode(Fuzzer.SendMode.BULK); + fuzzer.send(send); + fuzzer.expect(expect); + } + finally + { + fuzzer.close(); + } + } + + /** + * Send small text, then frame with opcode 7 (reserved) w/payload, then ping + */ + @Test + public void testCase4_1_5() throws Exception + { + List send = new ArrayList<>(); + send.add(WebSocketFrame.text("hello")); + send.add(new WebSocketFrame((byte)7).setPayload("bad")); // intentionally bad + send.add(WebSocketFrame.ping()); + + List expect = new ArrayList<>(); + expect.add(WebSocketFrame.text("hello")); // echo + expect.add(new CloseInfo(StatusCode.PROTOCOL).asFrame()); + + Fuzzer fuzzer = new Fuzzer(this); + try + { + fuzzer.connect(); + fuzzer.setSendMode(Fuzzer.SendMode.BULK); + fuzzer.send(send); fuzzer.expect(expect); } finally From b2a8fc02dcd3ede89c77d20ce8cc9d285695e39f Mon Sep 17 00:00:00 2001 From: Greg Wilkins Date: Wed, 1 Aug 2012 15:52:51 +1000 Subject: [PATCH 07/13] jetty-9 renaming and javadoc to improve the understandability of SslConnection --- .../eclipse/jetty/io/ssl/SslConnection.java | 418 +++++++++++------- .../server/ssl/SslSelectChannelConnector.java | 2 +- .../jetty/server/ConnectorTimeoutTest.java | 8 +- 3 files changed, 258 insertions(+), 170 deletions(-) diff --git a/jetty-io/src/main/java/org/eclipse/jetty/io/ssl/SslConnection.java b/jetty-io/src/main/java/org/eclipse/jetty/io/ssl/SslConnection.java index 5933c2e2e9a..ab7f45456bf 100644 --- a/jetty-io/src/main/java/org/eclipse/jetty/io/ssl/SslConnection.java +++ b/jetty-io/src/main/java/org/eclipse/jetty/io/ssl/SslConnection.java @@ -20,6 +20,7 @@ import java.util.concurrent.Executor; import javax.net.ssl.SSLEngine; import javax.net.ssl.SSLEngineResult; import javax.net.ssl.SSLEngineResult.HandshakeStatus; +import javax.net.ssl.SSLEngineResult.Status; import javax.net.ssl.SSLException; import org.eclipse.jetty.io.AbstractAsyncConnection; @@ -39,31 +40,54 @@ import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.log.Logger; /** - * An AsyncConnection that acts as an interceptor between and EndPoint and another - * Connection, that implements TLS encryption using an {@link SSLEngine}. - *

- * The connector uses an {@link EndPoint} (like {@link SelectChannelEndPoint}) as - * it's source/sink of encrypted data. It then provides {@link #getSslEndPoint()} to + * An AsyncConnection that acts as an intercepter between an AsyncEndPoint providing SSL encrypted data + * and another consumer of an AsyncEndPoint (typically an {@link AsyncConnection} like HttpConnection) that + * wants unencrypted data. + *

+ * The connector uses an {@link AsyncEndPoint} (typically {@link SelectChannelEndPoint}) as + * it's source/sink of encrypted data. It then provides an endpoint via {@link #getSslEndPoint()} to * expose a source/sink of unencrypted data to another connection (eg HttpConnection). + *

+ * The design of this class is based on a clear separation between the passive methods, which do not block nor schedule any + * asynchronous callbacks, and active methods that do schedule asynchronous callbacks. + *

+ * The passive methods are {@link DecryptedEndPoint#fill(ByteBuffer)} and {@link DecryptedEndPoint#flush(ByteBuffer...)}. They make best + * effort attempts to progress the connection using only calls to the encrypted {@link AsyncEndPoint#fill(ByteBuffer)} and {@link AsyncEndPoint#flush(ByteBuffer...)} + * methods. They will never block nor schedule any readInterest or write callbacks. If a fill/flush cannot progress either because + * of network congestion or waiting for an SSL handshake message, then the fill/flush will simply return with zero bytes filled/flushed. + * Specifically, if a flush cannot proceed because it needs to receive a handshake message, then the flush will attempt to fill bytes from the + * encrypted endpoint, but if insufficient bytes are read it will NOT call {@link AsyncEndPoint#fillInterested(Object, Callback)}. + *

+ * It is only the active methods : {@link DecryptedEndPoint#fillInterested(Object, Callback)} and + * {@link DecryptedEndPoint#write(Object, Callback, ByteBuffer...)} that may schedule callbacks by calling the encrypted + * {@link AsyncEndPoint#fillInterested(Object, Callback)} and {@link AsyncEndPoint#write(Object, Callback, ByteBuffer...)} + * methods. For normal data handling, the decrypted fillInterest method will result in an encrypted fillInterest and a decrypted + * write will result in an encrypted write. However, due to SSL handshaking requirements, it is also possible for a decrypted fill + * to call the encrypted write and for the decrypted flush to call the encrypted fillInterested methods. + *

+ * MOST IMPORTANTLY, the encrypted callbacks from the active methods (#onFillable() and WriteFlusher#completeWrite()) do no filling or flushing + * themselves. Instead they simple make the callbacks to the decrypted callbacks, so that the passive encyrpted fill/flush will + * be called again and make another best effort attempt to progress the connection. + * */ public class SslConnection extends AbstractAsyncConnection { private static final Logger LOG = Log.getLogger(SslConnection.class); private final ByteBufferPool _bufferPool; private final SSLEngine _sslEngine; - private final SslEndPoint _appEndPoint; - private ByteBuffer _appIn; - private ByteBuffer _netIn; - private ByteBuffer _netOut; - private final boolean _netDirect = false; - private final boolean _appDirect = false; + private final DecryptedEndPoint _decryptedEndPoint; + private ByteBuffer _decryptedInput; + private ByteBuffer _encryptedInput; + private ByteBuffer _encryptedOutput; + private final boolean _encryptedDirectBuffers = false; + private final boolean _decryptedDirectBuffers = false; public SslConnection(ByteBufferPool byteBufferPool, Executor executor, AsyncEndPoint endPoint, SSLEngine sslEngine) { super(endPoint, executor, true); this._bufferPool = byteBufferPool; this._sslEngine = sslEngine; - this._appEndPoint = new SslEndPoint(); + this._decryptedEndPoint = new DecryptedEndPoint(); } public SSLEngine getSSLEngine() @@ -73,7 +97,7 @@ public class SslConnection extends AbstractAsyncConnection public AsyncEndPoint getSslEndPoint() { - return _appEndPoint; + return _decryptedEndPoint; } @Override @@ -87,7 +111,7 @@ public class SslConnection extends AbstractAsyncConnection _sslEngine.beginHandshake(); if (_sslEngine.getUseClientMode()) - _appEndPoint.write(null, new Callback.Empty<>(), BufferUtil.EMPTY_BUFFER); + _decryptedEndPoint.write(null, new Callback.Empty<>(), BufferUtil.EMPTY_BUFFER); } catch (SSLException x) { @@ -100,18 +124,27 @@ public class SslConnection extends AbstractAsyncConnection @Override public void onFillable() { + // onFillable means that there are encrypted bytes ready to be filled. + // however we do not fill them here on this callback, but instead wakeup + // the decrypted readInterest and/or writeFlusher so that they will attempt + // to do the fill and/or flush again and these calls will do the actually + // filling. + LOG.debug("{} onReadable", this); - // wake up whoever is doing the fill or the flush so they can - // do all the filling, unwrapping ,wrapping and flushing - if (_appEndPoint._readInterest.isInterested()) - _appEndPoint._readInterest.readable(); - - // If we are handshaking, then wake up any waiting write as well as it may have been blocked on the read - if (_appEndPoint._writeFlusher.isWriting() && _appEndPoint._flushUnwrap) + synchronized(_decryptedEndPoint) { - _appEndPoint._flushUnwrap = false; - _appEndPoint._writeFlusher.completeWrite(); + // wake up whoever is doing the fill or the flush so they can + // do all the filling, unwrapping ,wrapping and flushing + if (_decryptedEndPoint._readInterest.isInterested()) + _decryptedEndPoint._readInterest.readable(); + + // If we are handshaking, then wake up any waiting write as well as it may have been blocked on the read + if ( _decryptedEndPoint._flushRequiresFillToProgress) + { + _decryptedEndPoint._flushRequiresFillToProgress = false; + _decryptedEndPoint._writeFlusher.completeWrite(); + } } } @@ -119,17 +152,25 @@ public class SslConnection extends AbstractAsyncConnection @Override public void onFillInterestedFailed(Throwable cause) { + // this means that the fill interest in encrypted bytes has failed. + // However we do not handle that here on this callback, but instead wakeup + // the decrypted readInterest and/or writeFlusher so that they will attempt + // to do the fill and/or flush again and these calls will do the actually + // handle the cause. + super.onFillInterestedFailed(cause); - if (_appEndPoint._readInterest.isInterested()) - _appEndPoint._readInterest.failed(cause); - - if (_appEndPoint._writeFlusher.isWriting() && _appEndPoint._flushUnwrap) + synchronized(_decryptedEndPoint) { - _appEndPoint._flushUnwrap = false; - _appEndPoint._writeFlusher.failed(cause); - } + if (_decryptedEndPoint._readInterest.isInterested()) + _decryptedEndPoint._readInterest.failed(cause); + if (_decryptedEndPoint._flushRequiresFillToProgress) + { + _decryptedEndPoint._flushRequiresFillToProgress = false; + _decryptedEndPoint._writeFlusher.failed(cause); + } + } } /* ------------------------------------------------------------ */ @@ -139,18 +180,18 @@ public class SslConnection extends AbstractAsyncConnection return String.format("SslConnection@%x{%s,%s%s}", hashCode(), _sslEngine.getHandshakeStatus(), - _appEndPoint._readInterest.isInterested() ? "R" : "", - _appEndPoint._writeFlusher.isWriting() ? "W" : ""); + _decryptedEndPoint._readInterest.isInterested() ? "R" : "", + _decryptedEndPoint._writeFlusher.isWriting() ? "W" : ""); } /* ------------------------------------------------------------ */ - public class SslEndPoint extends AbstractEndPoint implements AsyncEndPoint + public class DecryptedEndPoint extends AbstractEndPoint implements AsyncEndPoint { private AsyncConnection _connection; - private boolean _fillWrap; - private boolean _flushUnwrap; - private boolean _netWriting; - private boolean _underflown; + private boolean _fillRequiresFlushToProgress; + private boolean _flushRequiresFillToProgress; + private boolean _cannotAcceptMoreAppDataToFlush; + private boolean _needToFillMoreDataToProgress; private boolean _ishut = false; @Override @@ -169,16 +210,20 @@ public class SslConnection extends AbstractAsyncConnection @Override public void completed(Void context) { - synchronized (SslEndPoint.this) + // This means that a write of data has completed. Writes are done + // only if there is an active writeflusher or a read needed to write + // data. In either case the appropriate callback is passed on. + synchronized (DecryptedEndPoint.this) { - LOG.debug("{} write.complete {}", SslConnection.this, _netWriting ? (_fillWrap ? "FW" : "F") : (_fillWrap ? "W" : "")); + LOG.debug("{} write.complete {}", SslConnection.this, _cannotAcceptMoreAppDataToFlush ? (_fillRequiresFlushToProgress ? "FW" : "F") : (_fillRequiresFlushToProgress ? "W" : "")); releaseNetOut(); - _netWriting = false; - if (_fillWrap) + _cannotAcceptMoreAppDataToFlush = false; + + if (_fillRequiresFlushToProgress) { - _fillWrap = false; + _fillRequiresFlushToProgress = false; _readInterest.readable(); } @@ -190,16 +235,21 @@ public class SslConnection extends AbstractAsyncConnection @Override public void failed(Void context, Throwable x) { - synchronized (SslEndPoint.this) + // This means that a write of data has failed. Writes are done + // only if there is an active writeflusher or a read needed to write + // data. In either case the appropriate callback is passed on. + synchronized (DecryptedEndPoint.this) { LOG.debug("{} write.failed", SslConnection.this, x); - if (_netOut != null) - BufferUtil.clear(_netOut); + if (_encryptedOutput != null) + BufferUtil.clear(_encryptedOutput); releaseNetOut(); - _netWriting = false; - if (_fillWrap) + + _cannotAcceptMoreAppDataToFlush = false; + + if (_fillRequiresFlushToProgress) { - _fillWrap = false; + _fillRequiresFlushToProgress = false; _readInterest.failed(x); } @@ -216,39 +266,54 @@ public class SslConnection extends AbstractAsyncConnection @Override protected boolean needsFill() throws IOException { - synchronized (SslEndPoint.this) + // This means that the decrypted data consumer has called the fillInterested + // method on the DecryptedEndPoint, so we have to work out if there is + // decrypted data to be filled or what callbacks to setup to be told when there + // might be more encrypted data available to attempt another call to fill + + synchronized (DecryptedEndPoint.this) { - // Do we already have some app data - if (BufferUtil.hasContent(_appIn)) + // Do we already have some app data, then app can fill now so return true + if (BufferUtil.hasContent(_decryptedInput)) return true; - // If we are not underflown and have net data - if (!_underflown && BufferUtil.hasContent(_netIn)) - return true; - - // So we are not read ready - - // Are we actually write blocked? - if (_fillWrap) + // If we have no encrypted data to decrypt OR we have some, but it is not enough + if (BufferUtil.isEmpty(_encryptedInput) || _needToFillMoreDataToProgress) { - // we must be blocked trying to write before we can read - // If we have written the net data - if (BufferUtil.isEmpty(_netOut)) - { - // pretend we are readable so the wrap is done by next readable callback - _fillWrap = false; - return true; - } + // We are not ready to read data - // otherwise write the net data - _netWriting = true; - getEndPoint().write(null, _writeCallback, _netOut); + // Are we actually write blocked? + if (_fillRequiresFlushToProgress) + { + // we must be blocked trying to write before we can read + + // Do we have data to write + if (BufferUtil.hasContent(_encryptedOutput)) + { + // write it + _cannotAcceptMoreAppDataToFlush = true; + getEndPoint().write(null, _writeCallback, _encryptedOutput); + } + else + { + // we have already written the net data + // pretend we are readable so the wrap is done by next readable callback + _fillRequiresFlushToProgress = false; + return true; + } + } + else + // Normal readable callback + // Get called back on onfillable when then is more data to fill + SslConnection.this.fillInterested(); + + return false; } else - // Normal readable callback - SslConnection.this.fillInterested(); - - return false; + { + // We are ready to read data + return true; + } } } }; @@ -258,16 +323,19 @@ public class SslConnection extends AbstractAsyncConnection @Override protected void onIncompleteFlushed() { - synchronized (SslEndPoint.this) + // This means that the decripted endpoint write method was called and not + // all data could be wrapped. So either we need to write some encrypted data, + // OR if we are handshaking we need to read some encrypted data OR + // if neither than we should just try the flush again. + synchronized (DecryptedEndPoint.this) { // If we have pending output data, - if (BufferUtil.hasContent(_netOut)) + if (BufferUtil.hasContent(_encryptedOutput)) { // write it - _netWriting = true; - getEndPoint().write(null, _writeCallback, _netOut); + _cannotAcceptMoreAppDataToFlush = true; + getEndPoint().write(null, _writeCallback, _encryptedOutput); } - // TODO test this with _flushUnwrap else if (_sslEngine.getHandshakeStatus() == HandshakeStatus.NEED_UNWRAP) // we are actually read blocked in order to write SslConnection.this.fillInterested(); @@ -278,7 +346,7 @@ public class SslConnection extends AbstractAsyncConnection } }; - public SslEndPoint() + public DecryptedEndPoint() { super(getEndPoint().getLocalAddress(), getEndPoint().getRemoteAddress()); } @@ -307,37 +375,37 @@ public class SslConnection extends AbstractAsyncConnection try { // Do we already have some decrypted data? - if (BufferUtil.hasContent(_appIn)) - return BufferUtil.append(_appIn, buffer); + if (BufferUtil.hasContent(_decryptedInput)) + return BufferUtil.append(_decryptedInput, buffer); // We will need a network buffer - if (_netIn == null) - _netIn = _bufferPool.acquire(_sslEngine.getSession().getPacketBufferSize(), _netDirect); + if (_encryptedInput == null) + _encryptedInput = _bufferPool.acquire(_sslEngine.getSession().getPacketBufferSize(), _encryptedDirectBuffers); else - BufferUtil.compact(_netIn); + BufferUtil.compact(_encryptedInput); // We also need an app buffer, but can use the passed buffer if it is big enough ByteBuffer app_in; if (BufferUtil.space(buffer) > _sslEngine.getSession().getApplicationBufferSize()) app_in = buffer; - else if (_appIn == null) - app_in = _appIn = _bufferPool.acquire(_sslEngine.getSession().getApplicationBufferSize(), _appDirect); + else if (_decryptedInput == null) + app_in = _decryptedInput = _bufferPool.acquire(_sslEngine.getSession().getApplicationBufferSize(), _decryptedDirectBuffers); else - app_in = _appIn; + app_in = _decryptedInput; // loop filling and unwrapping until we have something while (true) { // Let's try reading some encrypted data... even if we have some already. - int net_filled = getEndPoint().fill(_netIn); + int net_filled = getEndPoint().fill(_encryptedInput); LOG.debug("{} filled {} encrypted bytes", SslConnection.this, net_filled); if (net_filled > 0) - _underflown = false; + _needToFillMoreDataToProgress = false; // Let's try the SSL thang even if we have no net data because in that // case we want to fall through to the handshake handling int pos = BufferUtil.flipToFill(app_in); - SSLEngineResult unwrapResult = _sslEngine.unwrap(_netIn, app_in); + SSLEngineResult unwrapResult = _sslEngine.unwrap(_encryptedInput, app_in); LOG.debug("{} unwrap {}", SslConnection.this, unwrapResult); BufferUtil.flipToFlush(app_in, pos); @@ -348,10 +416,11 @@ public class SslConnection extends AbstractAsyncConnection throw new IllegalStateException(); case CLOSED: - // Dang! we have to care about the handshake state + // Dang! we have to care about the handshake state specially for close switch (_sslEngine.getHandshakeStatus()) { case NOT_HANDSHAKING: + // We were not handshaking, so just tell the app we are closed return -1; case NEED_TASK: @@ -360,40 +429,47 @@ public class SslConnection extends AbstractAsyncConnection continue; case NEED_WRAP: - // we need to send some handshake data - if (!_flushUnwrap) + // we need to send some handshake data (probably to send a close handshake). + if (_flushRequiresFillToProgress) + return -1; // we were called from flush, so it can deal with sending the close handshake + + // We need to call flush to cause the wrap to happen + _fillRequiresFlushToProgress = true; + try { - _fillWrap = true; - try - { - flush(BufferUtil.EMPTY_BUFFER); - } - catch(IOException e) + // flushing an empty buffer will invoke the wrap mechanisms + flush(BufferUtil.EMPTY_BUFFER); + // If encrypted output is all written, we can proceed with close + if (BufferUtil.isEmpty(_encryptedOutput)) { + _fillRequiresFlushToProgress = false; return -1; } - if (BufferUtil.hasContent(_netOut)) - return 0; - _fillWrap = false; + + // Otherwise return as if a normal fill and let a subsequent call + // return -1 to the caller. + return unwrapResult.bytesProduced(); + } + catch(IOException e) + { + LOG.debug(e); + // The flush failed, oh well nothing more to do than tell the app + // that the connection is closed. + return -1; } - return -1; - - default: - throw new IllegalStateException(); } - - case BUFFER_UNDERFLOW: - _underflown = true; - - //$FALL-THROUGH$ to deal with handshaking stuff - + throw new IllegalStateException(); + default: - // if we produced bytes, we don't care about the handshake state + if (unwrapResult.getStatus()==Status.BUFFER_UNDERFLOW) + _needToFillMoreDataToProgress=true; + + // if we produced bytes, we don't care about the handshake state for now and it can be dealt with on another call to fill or flush if (unwrapResult.bytesProduced() > 0) { if (app_in == buffer) return unwrapResult.bytesProduced(); - return BufferUtil.append(_appIn, buffer); + return BufferUtil.append(_decryptedInput, buffer); } // Dang! we have to care about the handshake state @@ -412,14 +488,17 @@ public class SslConnection extends AbstractAsyncConnection case NEED_WRAP: // we need to send some handshake data - if (_flushUnwrap) + if (_flushRequiresFillToProgress) return 0; - _fillWrap = true; + _fillRequiresFlushToProgress = true; flush(BufferUtil.EMPTY_BUFFER); - if (BufferUtil.hasContent(_netOut)) - return 0; - _fillWrap = false; - continue; + if (BufferUtil.isEmpty(_encryptedOutput)) + { + // the flush completed so continue + _fillRequiresFlushToProgress = false; + continue; + } + return 0; case NEED_UNWRAP: // if we just filled some net data @@ -450,15 +529,15 @@ public class SslConnection extends AbstractAsyncConnection } finally { - if (_netIn != null && !_netIn.hasRemaining()) + if (_encryptedInput != null && !_encryptedInput.hasRemaining()) { - _bufferPool.release(_netIn); - _netIn = null; + _bufferPool.release(_encryptedInput); + _encryptedInput = null; } - if (_appIn != null && !_appIn.hasRemaining()) + if (_decryptedInput != null && !_decryptedInput.hasRemaining()) { - _bufferPool.release(_appIn); - _appIn = null; + _bufferPool.release(_decryptedInput); + _decryptedInput = null; } LOG.debug("{} fill exit", SslConnection.this); } @@ -477,77 +556,86 @@ public class SslConnection extends AbstractAsyncConnection LOG.debug("{} flush enter {}", SslConnection.this, Arrays.toString(appOuts)); try { - if (_netWriting) + if (_cannotAcceptMoreAppDataToFlush) return 0; // We will need a network buffer - if (_netOut == null) - _netOut = _bufferPool.acquire(_sslEngine.getSession().getPacketBufferSize() * 2, _netDirect); + if (_encryptedOutput == null) + _encryptedOutput = _bufferPool.acquire(_sslEngine.getSession().getPacketBufferSize() * 2, _encryptedDirectBuffers); + int consumed=0; while (true) { // do the funky SSL thang! - BufferUtil.compact(_netOut); - int pos = BufferUtil.flipToFill(_netOut); - SSLEngineResult wrapResult = _sslEngine.wrap(appOuts, _netOut); + // We call sslEngine.wrap to try to take bytes from appOut buffers and encrypt them into the _netOut buffer + BufferUtil.compact(_encryptedOutput); + int pos = BufferUtil.flipToFill(_encryptedOutput); + SSLEngineResult wrapResult = _sslEngine.wrap(appOuts, _encryptedOutput); LOG.debug("{} wrap {}", SslConnection.this, wrapResult); - BufferUtil.flipToFlush(_netOut, pos); + BufferUtil.flipToFlush(_encryptedOutput, pos); + consumed+=wrapResult.bytesConsumed(); - // and deal with the results + // and deal with the results returned from the sslEngineWrap switch (wrapResult.getStatus()) { case CLOSED: - if (BufferUtil.hasContent(_netOut)) + // The SSL engine has close, but there may be close handshake that needs to be written + if (BufferUtil.hasContent(_encryptedOutput)) { - _netWriting = true; - getEndPoint().flush(_netOut); - if (BufferUtil.hasContent(_netOut)) - return 0; + _cannotAcceptMoreAppDataToFlush = true; + getEndPoint().flush(_encryptedOutput); + // If we failed to flush the close handshake then we will just pretend that + // the write has progressed normally and let a subsequent call to flush (or WriteFlusher#onIncompleteFlushed) + // to finish writing the close handshake. The caller will find out about the close on a subsequent flush or fill. + if (BufferUtil.hasContent(_encryptedOutput)) + return consumed; } - if (_fillWrap) - return 0; + + // If we we flushing because of a fill needing to wrap, return normally and it will handle the closed state. + if (_fillRequiresFlushToProgress) + return consumed; + + // otherwise it is an exception to write to a closed endpoint throw new EofException(); case BUFFER_UNDERFLOW: throw new IllegalStateException(); - case BUFFER_OVERFLOW: - if (LOG.isDebugEnabled()) - LOG.debug("{} OVERFLOW {}", this, BufferUtil.toDetailString(_netOut)); - - //$FALL-THROUGH$ default: + if (LOG.isDebugEnabled()) + LOG.debug("{} {} {}", this, wrapResult.getStatus(), BufferUtil.toDetailString(_encryptedOutput)); + // if we have net bytes, let's try to flush them - if (BufferUtil.hasContent(_netOut)) - { - getEndPoint().flush(_netOut); - return wrapResult.bytesConsumed(); - } + if (BufferUtil.hasContent(_encryptedOutput)) + getEndPoint().flush(_encryptedOutput); - // Dang! we have to deal with handshake state + // But we also might have more to do for the handshaking state. switch (_sslEngine.getHandshakeStatus()) { case NOT_HANDSHAKING: - // we just didn't write anything. Strange? - return 0; + // Return with the number of bytes consumed (which may be 0) + return consumed; case NEED_TASK: - // run the task + // run the task and continue _sslEngine.getDelegatedTask().run(); continue; case NEED_WRAP: - // Hey we just wrapped! + // Hey we just wrapped! Oh well who knows what the sslEngine is thinking, so continue and we will wrap again continue; case NEED_UNWRAP: - // Were we were not called from fill and not reading anyway - if (!_fillWrap && !_readInterest.isInterested()) + // Ah we need to fill some data so we can write. + // So if we were not called from fill and the app is not reading anyway + if (!_fillRequiresFlushToProgress && !_readInterest.isInterested()) { - _flushUnwrap = true; + // Tell the onFillable method that there might be a write to complete + // TODO move this to the writeFlusher? + _flushRequiresFillToProgress = true; fill(BufferUtil.EMPTY_BUFFER); } - return 0; + return consumed; case FINISHED: throw new IllegalStateException(); @@ -570,10 +658,10 @@ public class SslConnection extends AbstractAsyncConnection private void releaseNetOut() { - if (_netOut != null && !_netOut.hasRemaining()) + if (_encryptedOutput != null && !_encryptedOutput.hasRemaining()) { - _bufferPool.release(_netOut); - _netOut = null; + _bufferPool.release(_encryptedOutput); + _encryptedOutput = null; if (_sslEngine.isOutboundDone()) getEndPoint().shutdownOutput(); } @@ -639,7 +727,7 @@ public class SslConnection extends AbstractAsyncConnection @Override public String toString() { - return String.format("%s{%s%s%s}", super.toString(), _readInterest.isInterested() ? "R" : "", _writeFlusher.isWriting() ? "W" : "", _netWriting ? "w" : ""); + return String.format("%s{%s%s%s}", super.toString(), _readInterest.isInterested() ? "R" : "", _writeFlusher.isWriting() ? "W" : "", _cannotAcceptMoreAppDataToFlush ? "w" : ""); } } diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/ssl/SslSelectChannelConnector.java b/jetty-server/src/main/java/org/eclipse/jetty/server/ssl/SslSelectChannelConnector.java index fcbac101887..91698ebd69f 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/ssl/SslSelectChannelConnector.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/ssl/SslSelectChannelConnector.java @@ -88,7 +88,7 @@ public class SslSelectChannelConnector extends SelectChannelConnector implements request.setScheme(HttpScheme.HTTPS.asString()); super.customize(request); - SslConnection.SslEndPoint ssl_endp = (SslConnection.SslEndPoint)request.getHttpChannel().getEndPoint(); + SslConnection.DecryptedEndPoint ssl_endp = (SslConnection.DecryptedEndPoint)request.getHttpChannel().getEndPoint(); SslConnection sslConnection = ssl_endp.getSslConnection(); SSLEngine sslEngine=sslConnection.getSSLEngine(); SslCertificates.customize(sslEngine,request); diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/ConnectorTimeoutTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/ConnectorTimeoutTest.java index 624651d55bf..4cf56be084b 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/ConnectorTimeoutTest.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/ConnectorTimeoutTest.java @@ -149,8 +149,8 @@ public abstract class ConnectorTimeoutTest extends HttpServerTestFixture // Get the server side endpoint EndPoint endp = endpoint.exchange(null,10,TimeUnit.SECONDS); - if (endp instanceof SslConnection.SslEndPoint) - endp=((SslConnection.SslEndPoint)endp).getAsyncConnection().getEndPoint(); + if (endp instanceof SslConnection.DecryptedEndPoint) + endp=((SslConnection.DecryptedEndPoint)endp).getAsyncConnection().getEndPoint(); // read the response String result=IO.toString(is); @@ -222,8 +222,8 @@ public abstract class ConnectorTimeoutTest extends HttpServerTestFixture // Get the server side endpoint EndPoint endp = endpoint.exchange(null,10,TimeUnit.SECONDS); - if (endp instanceof SslConnection.SslEndPoint) - endp=((SslConnection.SslEndPoint)endp).getAsyncConnection().getEndPoint(); + if (endp instanceof SslConnection.DecryptedEndPoint) + endp=((SslConnection.DecryptedEndPoint)endp).getAsyncConnection().getEndPoint(); // read the response String result=IO.toString(is); From 7c742ee4e81635de0fdd8c5fc930313f0a030243 Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Wed, 1 Aug 2012 09:59:50 -0700 Subject: [PATCH 08/13] More AB tests around bad/reserved opcodes --- .../websocket/server/ab/TestABCase4.java | 139 ++++++++++++++++++ 1 file changed, 139 insertions(+) diff --git a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase4.java b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase4.java index 5c4e6c23f78..a270ea3094c 100644 --- a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase4.java +++ b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase4.java @@ -151,4 +151,143 @@ public class TestABCase4 extends AbstractABCase fuzzer.close(); } } + + /** + * Send opcode 11 (reserved) + */ + @Test + public void testCase4_2_1() throws Exception + { + List send = new ArrayList<>(); + send.add(new WebSocketFrame((byte)11)); // intentionally bad + + List expect = new ArrayList<>(); + expect.add(new CloseInfo(StatusCode.PROTOCOL).asFrame()); + + Fuzzer fuzzer = new Fuzzer(this); + try + { + fuzzer.connect(); + fuzzer.setSendMode(Fuzzer.SendMode.BULK); + fuzzer.send(send); + fuzzer.expect(expect); + } + finally + { + fuzzer.close(); + } + } + + /** + * Send opcode 12 (reserved) + */ + @Test + public void testCase4_2_2() throws Exception + { + List send = new ArrayList<>(); + send.add(new WebSocketFrame((byte)12).setPayload("bad")); // intentionally bad + + List expect = new ArrayList<>(); + expect.add(new CloseInfo(StatusCode.PROTOCOL).asFrame()); + + Fuzzer fuzzer = new Fuzzer(this); + try + { + fuzzer.connect(); + fuzzer.setSendMode(Fuzzer.SendMode.BULK); + fuzzer.send(send); + fuzzer.expect(expect); + } + finally + { + fuzzer.close(); + } + } + + /** + * Send small text, then frame with opcode 13 (reserved), then ping + */ + @Test + public void testCase4_2_3() throws Exception + { + List send = new ArrayList<>(); + send.add(WebSocketFrame.text("hello")); + send.add(new WebSocketFrame((byte)13)); // intentionally bad + send.add(WebSocketFrame.ping()); + + List expect = new ArrayList<>(); + expect.add(WebSocketFrame.text("hello")); // echo + expect.add(new CloseInfo(StatusCode.PROTOCOL).asFrame()); + + Fuzzer fuzzer = new Fuzzer(this); + try + { + fuzzer.connect(); + fuzzer.setSendMode(Fuzzer.SendMode.BULK); + fuzzer.send(send); + fuzzer.expect(expect); + } + finally + { + fuzzer.close(); + } + } + + /** + * Send small text, then frame with opcode 14 (reserved), then ping + */ + @Test + public void testCase4_2_4() throws Exception + { + List send = new ArrayList<>(); + send.add(WebSocketFrame.text("hello")); + send.add(new WebSocketFrame((byte)14).setPayload("bad")); // intentionally bad + send.add(WebSocketFrame.ping()); + + List expect = new ArrayList<>(); + expect.add(WebSocketFrame.text("hello")); // echo + expect.add(new CloseInfo(StatusCode.PROTOCOL).asFrame()); + + Fuzzer fuzzer = new Fuzzer(this); + try + { + fuzzer.connect(); + fuzzer.setSendMode(Fuzzer.SendMode.BULK); + fuzzer.send(send); + fuzzer.expect(expect); + } + finally + { + fuzzer.close(); + } + } + + /** + * Send small text, then frame with opcode 15 (reserved), then ping + */ + @Test + public void testCase4_2_5() throws Exception + { + List send = new ArrayList<>(); + send.add(WebSocketFrame.text("hello")); + send.add(new WebSocketFrame((byte)15).setPayload("bad")); // intentionally bad + send.add(WebSocketFrame.ping()); + + List expect = new ArrayList<>(); + expect.add(WebSocketFrame.text("hello")); // echo + expect.add(new CloseInfo(StatusCode.PROTOCOL).asFrame()); + + Fuzzer fuzzer = new Fuzzer(this); + try + { + fuzzer.connect(); + fuzzer.setSendMode(Fuzzer.SendMode.BULK); + fuzzer.send(send); + fuzzer.expect(expect); + } + finally + { + fuzzer.close(); + } + } } From 07929fee884bf3a115f954bbb6ecaf89e398b914 Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Wed, 1 Aug 2012 10:46:15 -0700 Subject: [PATCH 09/13] Fleshing out more fragment tests --- .../jetty/websocket/server/ab/Fuzzer.java | 2 +- .../websocket/server/ab/TestABCase5.java | 999 +++++++++++------- 2 files changed, 631 insertions(+), 370 deletions(-) diff --git a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/Fuzzer.java b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/Fuzzer.java index 46ccb7e8d7a..fa21f7908e4 100644 --- a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/Fuzzer.java +++ b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/Fuzzer.java @@ -80,7 +80,7 @@ public class Fuzzer prefix = "Frame[" + i + "]"; - Assert.assertThat(prefix + ".opcode",actual.getOpCode(),is(expected.getOpCode())); + Assert.assertThat(prefix + ".opcode",OpCode.name(actual.getOpCode()),is(OpCode.name(expected.getOpCode()))); prefix += "/" + actual.getOpCode(); if (expected.getOpCode() == OpCode.CLOSE) { diff --git a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase5.java b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase5.java index 18a719d66a6..a3783cf528d 100644 --- a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase5.java +++ b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase5.java @@ -15,460 +15,721 @@ //======================================================================== package org.eclipse.jetty.websocket.server.ab; -import static org.hamcrest.Matchers.*; - -import java.nio.ByteBuffer; +import java.net.SocketException; +import java.util.ArrayList; +import java.util.List; import java.util.concurrent.TimeUnit; -import org.eclipse.jetty.io.ByteBufferPool; -import org.eclipse.jetty.io.StandardByteBufferPool; -import org.eclipse.jetty.util.BufferUtil; -import org.eclipse.jetty.util.StringUtil; -import org.eclipse.jetty.websocket.api.WebSocketPolicy; +import org.eclipse.jetty.websocket.api.StatusCode; import org.eclipse.jetty.websocket.protocol.CloseInfo; -import org.eclipse.jetty.websocket.protocol.Generator; import org.eclipse.jetty.websocket.protocol.OpCode; import org.eclipse.jetty.websocket.protocol.WebSocketFrame; -import org.eclipse.jetty.websocket.server.ByteBufferAssert; -import org.eclipse.jetty.websocket.server.SimpleServletServer; -import org.eclipse.jetty.websocket.server.blockhead.BlockheadClient; -import org.eclipse.jetty.websocket.server.examples.MyEchoServlet; -import org.eclipse.jetty.websocket.server.helper.IncomingFramesCapture; -import org.junit.AfterClass; -import org.junit.Assert; -import org.junit.BeforeClass; -import org.junit.Ignore; import org.junit.Test; -public class TestABCase5 +/** + * Fragmentation Tests + */ +public class TestABCase5 extends AbstractABCase { - private static final byte FIN = (byte)0x80; - private static final byte NOFIN = 0x00; - - private static SimpleServletServer server; - private static Generator laxGenerator; - - @BeforeClass - public static void initGenerators() - { - WebSocketPolicy policy = WebSocketPolicy.newServerPolicy(); - ByteBufferPool bufferPool = new StandardByteBufferPool(); - laxGenerator = new Generator(policy,bufferPool,false); - } - - @BeforeClass - public static void startServer() throws Exception - { - server = new SimpleServletServer(new MyEchoServlet()); - server.start(); - } - - @AfterClass - public static void stopServer() - { - server.stop(); - } - + /** + * Send ping fragmented in 2 packets + */ @Test - public void testCase5_1PingIn2Packets() throws Exception + public void testCase5_1() throws Exception { - BlockheadClient client = new BlockheadClient(server.getServerUri()); + List send = new ArrayList<>(); + send.add(new WebSocketFrame(OpCode.PING).setPayload("hello, ").setFin(false)); + send.add(new WebSocketFrame(OpCode.CONTINUATION).setPayload("world")); + send.add(new CloseInfo(StatusCode.NORMAL).asFrame()); + + List expect = new ArrayList<>(); + expect.add(new CloseInfo(StatusCode.PROTOCOL).asFrame()); + + Fuzzer fuzzer = new Fuzzer(this); try { - client.connect(); - client.sendStandardRequest(); - client.expectUpgradeResponse(); - - ByteBuffer buf = ByteBuffer.allocate(Generator.OVERHEAD + 2); - BufferUtil.clearToFill(buf); - - String fragment1 = "fragment1"; - - // Intentionally bad PING (spec says control frames must be FIN==true) - buf.put((byte)(NOFIN | OpCode.PING)); - - byte b = 0x00; // no masking - b |= fragment1.length() & 0x7F; - buf.put(b); - buf.put(fragment1.getBytes()); - BufferUtil.flipToFlush(buf,0); - - client.writeRaw(buf); - - ByteBuffer buf2 = ByteBuffer.allocate(Generator.OVERHEAD + 2); - BufferUtil.clearToFill(buf2); - - String fragment2 = "fragment2"; - - buf2.put((byte)(FIN | OpCode.PING)); - b = 0x00; // no masking - b |= fragment2.length() & 0x7F; - buf2.put(b); - buf2.put(fragment2.getBytes()); - BufferUtil.flipToFlush(buf2,0); - - client.writeRaw(buf2); - - // Read frame - IncomingFramesCapture capture = client.readFrames(1,TimeUnit.MILLISECONDS,500); - WebSocketFrame frame = capture.getFrames().get(0); - - Assert.assertThat("frame should be close frame",frame.getOpCode(),is(OpCode.CLOSE)); - - Assert.assertThat("CloseFrame.status code",new CloseInfo(frame).getStatusCode(),is(1002)); + fuzzer.connect(); + fuzzer.setSendMode(Fuzzer.SendMode.BULK); + fuzzer.send(send); + fuzzer.expect(expect); } finally { - client.close(); + fuzzer.close(); } } + /** + * Send continuation+fin, then text+fin (framewise) + */ @Test - public void testCase5_1PingIn2PacketsWithBuilder() throws Exception + public void testCase5_10() throws Exception { - BlockheadClient client = new BlockheadClient(server.getServerUri()); + List send = new ArrayList<>(); + send.add(new WebSocketFrame(OpCode.CONTINUATION).setPayload("sorry").setFin(true)); + send.add(new WebSocketFrame(OpCode.TEXT).setPayload("hello, world")); + send.add(new CloseInfo(StatusCode.NORMAL).asFrame()); + + List expect = new ArrayList<>(); + expect.add(new CloseInfo(StatusCode.PROTOCOL).asFrame()); + + Fuzzer fuzzer = new Fuzzer(this); try { - client.connect(); - client.sendStandardRequest(); - client.expectUpgradeResponse(); - - String fragment1 = "fragment1"; - WebSocketFrame frame1 = WebSocketFrame.ping().setFin(false).setPayload(fragment1); - ByteBuffer buf1 = laxGenerator.generate(frame1); - client.writeRaw(buf1); - - String fragment2 = "fragment2"; - WebSocketFrame frame2 = WebSocketFrame.ping().setPayload(fragment2); - ByteBuffer buf2 = laxGenerator.generate(frame2); - client.writeRaw(buf2); - - // Read frame - IncomingFramesCapture capture = client.readFrames(1,TimeUnit.MILLISECONDS,500); - WebSocketFrame frame = capture.getFrames().pop(); - - Assert.assertThat("frame should be close frame",frame.getOpCode(),is(OpCode.CLOSE)); - - Assert.assertThat("CloseFrame.status code",new CloseInfo(frame).getStatusCode(),is(1002)); + fuzzer.connect(); + fuzzer.setSendMode(Fuzzer.SendMode.PER_FRAME); + fuzzer.send(send); + fuzzer.expect(expect); } finally { - client.close(); + fuzzer.close(); } } + /** + * Send continuation+fin, then text+fin (slowly) + */ @Test - public void testCase5_2PongIn2Packets() throws Exception + public void testCase5_11() throws Exception { - BlockheadClient client = new BlockheadClient(server.getServerUri()); + List send = new ArrayList<>(); + send.add(new WebSocketFrame(OpCode.CONTINUATION).setPayload("sorry").setFin(true)); + send.add(new WebSocketFrame(OpCode.TEXT).setPayload("hello, world")); + send.add(new CloseInfo(StatusCode.NORMAL).asFrame()); + + List expect = new ArrayList<>(); + expect.add(new CloseInfo(StatusCode.PROTOCOL).asFrame()); + + Fuzzer fuzzer = new Fuzzer(this); try { - client.connect(); - client.sendStandardRequest(); - client.expectUpgradeResponse(); - - ByteBuffer buf = ByteBuffer.allocate(Generator.OVERHEAD + 2); - BufferUtil.clearToFill(buf); - - String fragment1 = "fragment1"; - - buf.put((byte)(NOFIN | OpCode.PONG)); - - byte b = 0x00; // no masking - b |= fragment1.length() & 0x7F; - buf.put(b); - buf.put(fragment1.getBytes()); - BufferUtil.flipToFlush(buf,0); - - client.writeRaw(buf); - - ByteBuffer buf2 = ByteBuffer.allocate(Generator.OVERHEAD + 2); - BufferUtil.clearToFill(buf2); - - String fragment2 = "fragment2"; - - buf2.put((byte)(FIN | OpCode.CONTINUATION)); - b = 0x00; // no masking - b |= fragment2.length() & 0x7F; - buf2.put(b); - buf2.put(fragment2.getBytes()); - BufferUtil.flipToFlush(buf2,0); - - client.writeRaw(buf2); - - // Read frame - IncomingFramesCapture capture = client.readFrames(1,TimeUnit.MILLISECONDS,500); - WebSocketFrame frame = capture.getFrames().pop(); - - Assert.assertThat("frame should be close frame",frame.getOpCode(),is(OpCode.CLOSE)); - - Assert.assertThat("CloseFrame.status code",new CloseInfo(frame).getStatusCode(),is(1002)); + fuzzer.connect(); + fuzzer.setSendMode(Fuzzer.SendMode.SLOW); + fuzzer.setSlowSendSegmentSize(1); + try + { + fuzzer.send(send); + } + catch (SocketException ignore) + { + // Potential for SocketException (Broken Pipe) here. + // But not in 100% of testing scenarios. It is a safe + // exception to ignore in this testing scenario, as the + // slow writing of the frames can result in the server + // throwing a PROTOCOL ERROR termination/close when it + // encounters the bad continuation frame above (this + // termination is the expected behavior), and this + // early socket close can propagate back to the client + // before it has a chance to finish writing out the + // remaining frame octets + } + fuzzer.expect(expect); } finally { - client.close(); + fuzzer.close(); } } + /** + * Send continuation+!fin, then text+fin + */ @Test - public void testCase5_2PongIn2PacketsWithBuilder() throws Exception + public void testCase5_12() throws Exception { - BlockheadClient client = new BlockheadClient(server.getServerUri()); + List send = new ArrayList<>(); + send.add(new WebSocketFrame(OpCode.CONTINUATION).setPayload("sorry").setFin(false)); + send.add(new WebSocketFrame(OpCode.TEXT).setPayload("hello, world")); + send.add(new CloseInfo(StatusCode.NORMAL).asFrame()); + + List expect = new ArrayList<>(); + expect.add(new CloseInfo(StatusCode.PROTOCOL).asFrame()); + + Fuzzer fuzzer = new Fuzzer(this); try { - client.connect(); - client.sendStandardRequest(); - client.expectUpgradeResponse(); - - String fragment1 = "fragment1"; - WebSocketFrame frame1 = WebSocketFrame.pong().setFin(false).setPayload(fragment1); - ByteBuffer buf1 = laxGenerator.generate(frame1); - client.writeRaw(buf1); - - String fragment2 = "fragment2"; - WebSocketFrame frame2 = new WebSocketFrame(OpCode.CONTINUATION).setFin(false).setPayload(fragment2); - ByteBuffer buf2 = laxGenerator.generate(frame2); - client.writeRaw(buf2); - - // Read frame - IncomingFramesCapture capture = client.readFrames(1,TimeUnit.MILLISECONDS,500); - WebSocketFrame frame = capture.getFrames().pop(); - - Assert.assertThat("frame should be close frame",frame.getOpCode(),is(OpCode.CLOSE)); - Assert.assertThat("CloseFrame.status code",new CloseInfo(frame).getStatusCode(),is(1002)); + fuzzer.connect(); + fuzzer.setSendMode(Fuzzer.SendMode.BULK); + fuzzer.send(send); + fuzzer.expect(expect); } finally { - client.disconnect(); + fuzzer.close(); } } + /** + * Send continuation+!fin, then text+fin (framewise) + */ @Test - public void testCase5_3TextIn2Packets() throws Exception + public void testCase5_13() throws Exception { - BlockheadClient client = new BlockheadClient(server.getServerUri()); + List send = new ArrayList<>(); + send.add(new WebSocketFrame(OpCode.CONTINUATION).setPayload("sorry").setFin(false)); + send.add(new WebSocketFrame(OpCode.TEXT).setPayload("hello, world")); + send.add(new CloseInfo(StatusCode.NORMAL).asFrame()); + + List expect = new ArrayList<>(); + expect.add(new CloseInfo(StatusCode.PROTOCOL).asFrame()); + + Fuzzer fuzzer = new Fuzzer(this); try { - client.connect(); - client.sendStandardRequest(); - client.expectUpgradeResponse(); - - ByteBuffer buf = ByteBuffer.allocate(Generator.OVERHEAD + 2); - BufferUtil.clearToFill(buf); - - String fragment1 = "fragment1"; - - buf.put((byte)(NOFIN | OpCode.TEXT)); - - byte b = 0x00; // no masking - b |= fragment1.length() & 0x7F; - buf.put(b); - buf.put(fragment1.getBytes()); - BufferUtil.flipToFlush(buf,0); - - client.writeRaw(buf); - - ByteBuffer buf2 = ByteBuffer.allocate(Generator.OVERHEAD + 2); - BufferUtil.clearToFill(buf2); - - String fragment2 = "fragment2"; - - buf2.put((byte)(FIN | OpCode.CONTINUATION)); - b = 0x00; // no masking - b |= fragment2.length() & 0x7F; - buf2.put(b); - buf2.put(fragment2.getBytes()); - BufferUtil.flipToFlush(buf2,0); - - client.writeRaw(buf2); - - // Read frame - IncomingFramesCapture capture = client.readFrames(1,TimeUnit.MILLISECONDS,500); - WebSocketFrame frame = capture.getFrames().pop(); - - Assert.assertThat("frame should be text frame",frame.getOpCode(),is(OpCode.TEXT)); - - Assert.assertThat("TextFrame.payload",frame.getPayloadAsUTF8(),is(fragment1 + fragment2)); + fuzzer.connect(); + fuzzer.setSendMode(Fuzzer.SendMode.PER_FRAME); + fuzzer.send(send); + fuzzer.expect(expect); } finally { - client.close(); + fuzzer.close(); } } + /** + * Send continuation+!fin, then text+fin (slowly) + */ @Test - public void testCase5_6TextPingRemainingText() throws Exception + public void testCase5_14() throws Exception { - BlockheadClient client = new BlockheadClient(server.getServerUri()); + List send = new ArrayList<>(); + send.add(new WebSocketFrame(OpCode.CONTINUATION).setPayload("sorry").setFin(false)); + send.add(new WebSocketFrame(OpCode.TEXT).setPayload("hello, world")); + send.add(new CloseInfo(StatusCode.NORMAL).asFrame()); + + List expect = new ArrayList<>(); + expect.add(new CloseInfo(StatusCode.PROTOCOL).asFrame()); + + Fuzzer fuzzer = new Fuzzer(this); try { - client.connect(); - client.sendStandardRequest(); - client.expectUpgradeResponse(); - - // Send a text packet - - ByteBuffer buf = ByteBuffer.allocate(Generator.OVERHEAD + 2); - BufferUtil.clearToFill(buf); - - String fragment1 = "fragment1"; - - buf.put((byte)(NOFIN | OpCode.TEXT)); - - byte b = 0x00; // no masking - b |= fragment1.length() & 0x7F; - buf.put(b); - buf.put(fragment1.getBytes()); - BufferUtil.flipToFlush(buf,0); - - client.writeRaw(buf); - - // Send a ping with payload - - ByteBuffer pingBuf = ByteBuffer.allocate(Generator.OVERHEAD + 2); - BufferUtil.clearToFill(pingBuf); - - String pingPayload = "ping payload"; - - pingBuf.put((byte)(FIN | OpCode.PING)); - - b = 0x00; // no masking - b |= pingPayload.length() & 0x7F; - pingBuf.put(b); - pingBuf.put(pingPayload.getBytes()); - BufferUtil.flipToFlush(pingBuf,0); - - client.writeRaw(pingBuf); - - // Send remaining text as continuation - - ByteBuffer buf2 = ByteBuffer.allocate(Generator.OVERHEAD + 2); - BufferUtil.clearToFill(buf2); - - String fragment2 = "fragment2"; - - buf2.put((byte)(FIN | OpCode.CONTINUATION)); - b = 0x00; // no masking - b |= fragment2.length() & 0x7F; - buf2.put(b); - buf2.put(fragment2.getBytes()); - BufferUtil.flipToFlush(buf2,0); - - client.writeRaw(buf2); - - // Should be 2 frames, pong frame followed by combined echo'd text frame - IncomingFramesCapture capture = client.readFrames(2,TimeUnit.SECONDS,1); - WebSocketFrame frame = capture.getFrames().pop(); - - Assert.assertThat("first frame should be pong frame",frame.getOpCode(),is(OpCode.PONG)); - - ByteBuffer payload1 = BufferUtil.toBuffer(pingPayload,StringUtil.__UTF8_CHARSET); - - ByteBufferAssert.assertEquals("payloads should be equal",payload1,frame.getPayload()); - frame = capture.getFrames().pop(); - - Assert.assertThat("second frame should be text frame",frame.getOpCode(),is(OpCode.TEXT)); - Assert.assertThat("TextFrame.payload",frame.getPayloadAsUTF8(),is(fragment1 + fragment2)); + fuzzer.connect(); + fuzzer.setSendMode(Fuzzer.SendMode.SLOW); + fuzzer.setSlowSendSegmentSize(1); + try + { + fuzzer.send(send); + } + catch (SocketException ignore) + { + // Potential for SocketException (Broken Pipe) here. + // But not in 100% of testing scenarios. It is a safe + // exception to ignore in this testing scenario, as the + // slow writing of the frames can result in the server + // throwing a PROTOCOL ERROR termination/close when it + // encounters the bad continuation frame above (this + // termination is the expected behavior), and this + // early socket close can propagate back to the client + // before it has a chance to finish writing out the + // remaining frame octets + } + fuzzer.expect(expect); } finally { - client.close(); + fuzzer.close(); } } + /** + * Send text fragmented properly in 2 frames, then continuation!fin, then text unfragmented. + */ @Test - public void testCase5_6TextPingRemainingTextWithBuilder() throws Exception + public void testCase5_15() throws Exception { - BlockheadClient client = new BlockheadClient(server.getServerUri()); + List send = new ArrayList<>(); + send.add(new WebSocketFrame(OpCode.TEXT).setPayload("fragment1").setFin(false)); + send.add(new WebSocketFrame(OpCode.CONTINUATION).setPayload("fragment2").setFin(true)); + send.add(new WebSocketFrame(OpCode.CONTINUATION).setPayload("fragment3").setFin(false)); // bad frame + send.add(new WebSocketFrame(OpCode.TEXT).setPayload("fragment4").setFin(true)); + send.add(new CloseInfo(StatusCode.NORMAL).asFrame()); + + List expect = new ArrayList<>(); + send.add(WebSocketFrame.text("fragment1fragment2")); + expect.add(new CloseInfo(StatusCode.PROTOCOL).asFrame()); + + Fuzzer fuzzer = new Fuzzer(this); try { - client.connect(); - client.sendStandardRequest(); - client.expectUpgradeResponse(); - - // Send a text packet - String textPayload1 = "fragment1"; - WebSocketFrame frame1 = WebSocketFrame.text().setFin(false).setPayload(textPayload1); - ByteBuffer buf1 = laxGenerator.generate(frame1); - client.writeRaw(buf1); - - // Send a ping with payload - String pingPayload = "ping payload"; - WebSocketFrame frame2 = WebSocketFrame.ping().setPayload(pingPayload); - ByteBuffer buf2 = laxGenerator.generate(frame2); - client.writeRaw(buf2); - - // Send remaining text as continuation - String textPayload2 = "fragment2"; - WebSocketFrame frame3 = new WebSocketFrame(OpCode.CONTINUATION).setPayload(textPayload2); - ByteBuffer buf3 = laxGenerator.generate(frame3); - client.writeRaw(buf3); - - // Should be 2 frames, pong frame followed by combined echo'd text frame - IncomingFramesCapture capture = client.readFrames(2,TimeUnit.MILLISECONDS,500); - WebSocketFrame frame = capture.getFrames().pop(); - - Assert.assertThat("first frame should be pong frame",frame.getOpCode(),is(OpCode.PONG)); - - ByteBuffer payload1 = BufferUtil.toBuffer(pingPayload,StringUtil.__UTF8_CHARSET); - ByteBufferAssert.assertEquals("Payload",payload1,frame.getPayload()); - - frame = capture.getFrames().pop(); - - Assert.assertThat("second frame should be text frame",frame.getOpCode(),is(OpCode.TEXT)); - - Assert.assertThat("TextFrame.payload",frame.getPayloadAsUTF8(),is(textPayload1 + textPayload2)); + fuzzer.connect(); + fuzzer.setSendMode(Fuzzer.SendMode.BULK); + fuzzer.send(send); + fuzzer.expect(expect); } finally { - client.close(); + fuzzer.close(); } } + /** + * (continuation!fin, text!fin, continuation+fin) * 2 + */ @Test - @Ignore("AB tests have chop concepts currently unsupported by test...I think, also the string being returns is not Bad Continuation") - public void testCase5_9BadContinuation() throws Exception + public void testCase5_16() throws Exception { - BlockheadClient client = new BlockheadClient(server.getServerUri()); + List send = new ArrayList<>(); + send.add(new WebSocketFrame(OpCode.CONTINUATION).setPayload("fragment1").setFin(false)); // bad frame + send.add(new WebSocketFrame(OpCode.TEXT).setPayload("fragment2").setFin(false)); + send.add(new WebSocketFrame(OpCode.CONTINUATION).setPayload("fragment3").setFin(true)); + send.add(new WebSocketFrame(OpCode.CONTINUATION).setPayload("fragment4").setFin(false)); // bad frame + send.add(new WebSocketFrame(OpCode.TEXT).setPayload("fragment5").setFin(false)); + send.add(new WebSocketFrame(OpCode.CONTINUATION).setPayload("fragment6").setFin(true)); + send.add(new CloseInfo(StatusCode.NORMAL).asFrame()); + + List expect = new ArrayList<>(); + expect.add(new CloseInfo(StatusCode.PROTOCOL).asFrame()); + + Fuzzer fuzzer = new Fuzzer(this); try { - client.connect(); - client.sendStandardRequest(); - client.expectUpgradeResponse(); - - // Send a text packet - - ByteBuffer buf = ByteBuffer.allocate(Generator.OVERHEAD + 2); - BufferUtil.clearToFill(buf); - - String fragment1 = "fragment"; - - // continuation w / FIN - - buf.put((byte)(FIN | OpCode.CONTINUATION)); - - byte b = 0x00; // no masking - b |= fragment1.length() & 0x7F; - buf.put(b); - buf.put(fragment1.getBytes()); - BufferUtil.flipToFlush(buf,0); - - client.writeRaw(buf); - - // Read frame - IncomingFramesCapture capture = client.readFrames(1,TimeUnit.MILLISECONDS,500); - WebSocketFrame frame = capture.getFrames().pop(); - - Assert.assertThat("frame should be close frame",frame.getOpCode(),is(OpCode.CLOSE)); - - Assert.assertThat("CloseFrame.status code",new CloseInfo(frame).getStatusCode(),is(1002)); - - Assert.assertThat("CloseFrame.reason",new CloseInfo(frame).getReason(),is("Bad Continuation")); - // TODO put close reasons into public strings in impl someplace? + fuzzer.connect(); + fuzzer.setSendMode(Fuzzer.SendMode.BULK); + fuzzer.send(send); + fuzzer.expect(expect); } finally { - client.close(); + fuzzer.close(); + } + } + + /** + * (continuation+fin, text!fin, continuation+fin) * 2 + */ + @Test + public void testCase5_17() throws Exception + { + List send = new ArrayList<>(); + send.add(new WebSocketFrame(OpCode.CONTINUATION).setPayload("fragment1").setFin(true)); // nothing to continue + send.add(new WebSocketFrame(OpCode.TEXT).setPayload("fragment2").setFin(false)); + send.add(new WebSocketFrame(OpCode.CONTINUATION).setPayload("fragment3").setFin(true)); + send.add(new WebSocketFrame(OpCode.CONTINUATION).setPayload("fragment4").setFin(true)); // nothing to continue + send.add(new WebSocketFrame(OpCode.TEXT).setPayload("fragment5").setFin(false)); + send.add(new WebSocketFrame(OpCode.CONTINUATION).setPayload("fragment6").setFin(true)); + send.add(new CloseInfo(StatusCode.NORMAL).asFrame()); + + List expect = new ArrayList<>(); + expect.add(new CloseInfo(StatusCode.PROTOCOL).asFrame()); + + Fuzzer fuzzer = new Fuzzer(this); + try + { + fuzzer.connect(); + fuzzer.setSendMode(Fuzzer.SendMode.BULK); + fuzzer.send(send); + fuzzer.expect(expect); + } + finally + { + fuzzer.close(); + } + } + + /** + * text message fragmented in 2 frames, both frames as opcode=TEXT + */ + @Test + public void testCase5_18() throws Exception + { + List send = new ArrayList<>(); + send.add(new WebSocketFrame(OpCode.TEXT).setPayload("fragment1").setFin(false)); + send.add(new WebSocketFrame(OpCode.TEXT).setPayload("fragment2").setFin(true)); // bad frame, must be continuation + send.add(new CloseInfo(StatusCode.NORMAL).asFrame()); + + List expect = new ArrayList<>(); + expect.add(new CloseInfo(StatusCode.PROTOCOL).asFrame()); + + Fuzzer fuzzer = new Fuzzer(this); + try + { + fuzzer.connect(); + fuzzer.setSendMode(Fuzzer.SendMode.BULK); + fuzzer.send(send); + fuzzer.expect(expect); + } + finally + { + fuzzer.close(); + } + } + + /** + * send text message fragmented in 5 frames, with 2 pings and wait between. + */ + @Test + public void testCase5_19() throws Exception + { + List send1 = new ArrayList<>(); + send1.add(new WebSocketFrame(OpCode.TEXT).setPayload("f1").setFin(false)); + send1.add(new WebSocketFrame(OpCode.CONTINUATION).setPayload(",f2").setFin(false)); + send1.add(new WebSocketFrame(OpCode.PING).setPayload("pong-1")); + + List send2 = new ArrayList<>(); + send2.add(new WebSocketFrame(OpCode.CONTINUATION).setPayload(",f3").setFin(false)); + send2.add(new WebSocketFrame(OpCode.CONTINUATION).setPayload(",f4").setFin(false)); + send2.add(new WebSocketFrame(OpCode.PING).setPayload("pong-2")); + send2.add(new WebSocketFrame(OpCode.CONTINUATION).setPayload(",f5").setFin(true)); + send2.add(new CloseInfo(StatusCode.NORMAL).asFrame()); + + List expect1 = new ArrayList<>(); + expect1.add(WebSocketFrame.pong().setPayload("pong-1")); + + List expect2 = new ArrayList<>(); + expect2.add(WebSocketFrame.pong().setPayload("pong-2")); + expect2.add(WebSocketFrame.text("f1,f2,f3,f4,f5")); + expect2.add(new CloseInfo(StatusCode.NORMAL).asFrame()); + + Fuzzer fuzzer = new Fuzzer(this); + try + { + fuzzer.connect(); + fuzzer.setSendMode(Fuzzer.SendMode.BULK); + + fuzzer.send(send1); + fuzzer.expect(expect1); + + TimeUnit.SECONDS.sleep(1); + + fuzzer.send(send2); + fuzzer.expect(expect2); + } + finally + { + fuzzer.close(); + } + } + + /** + * Send pong fragmented in 2 packets + */ + @Test + public void testCase5_2() throws Exception + { + List send = new ArrayList<>(); + send.add(new WebSocketFrame(OpCode.PONG).setPayload("hello, ").setFin(false)); + send.add(new WebSocketFrame(OpCode.CONTINUATION).setPayload("world")); + send.add(new CloseInfo(StatusCode.NORMAL).asFrame()); + + List expect = new ArrayList<>(); + expect.add(new CloseInfo(StatusCode.PROTOCOL).asFrame()); + + Fuzzer fuzzer = new Fuzzer(this); + try + { + fuzzer.connect(); + fuzzer.setSendMode(Fuzzer.SendMode.BULK); + fuzzer.send(send); + fuzzer.expect(expect); + } + finally + { + fuzzer.close(); + } + } + + /** + * send text message fragmented in 5 frames, with 2 pings and wait between. (framewise) + */ + @Test + public void testCase5_20() throws Exception + { + List send1 = new ArrayList<>(); + send1.add(new WebSocketFrame(OpCode.TEXT).setPayload("f1").setFin(false)); + send1.add(new WebSocketFrame(OpCode.CONTINUATION).setPayload(",f2").setFin(false)); + send1.add(new WebSocketFrame(OpCode.PING).setPayload("pong-1")); + + List send2 = new ArrayList<>(); + send2.add(new WebSocketFrame(OpCode.CONTINUATION).setPayload(",f3").setFin(false)); + send2.add(new WebSocketFrame(OpCode.CONTINUATION).setPayload(",f4").setFin(false)); + send2.add(new WebSocketFrame(OpCode.PING).setPayload("pong-2")); + send2.add(new WebSocketFrame(OpCode.CONTINUATION).setPayload(",f5").setFin(true)); + send2.add(new CloseInfo(StatusCode.NORMAL).asFrame()); + + List expect1 = new ArrayList<>(); + expect1.add(WebSocketFrame.pong().setPayload("pong-1")); + + List expect2 = new ArrayList<>(); + expect2.add(WebSocketFrame.pong().setPayload("pong-2")); + expect2.add(WebSocketFrame.text("f1,f2,f3,f4,f5")); + expect2.add(new CloseInfo(StatusCode.NORMAL).asFrame()); + + Fuzzer fuzzer = new Fuzzer(this); + try + { + fuzzer.connect(); + fuzzer.setSendMode(Fuzzer.SendMode.PER_FRAME); + + fuzzer.send(send1); + fuzzer.expect(expect1); + + TimeUnit.SECONDS.sleep(1); + + fuzzer.send(send2); + fuzzer.expect(expect2); + } + finally + { + fuzzer.close(); + } + } + + /** + * send text message fragmented in 5 frames, with 2 pings and wait between. (framewise) + */ + @Test + public void testCase5_20_slow() throws Exception + { + List send1 = new ArrayList<>(); + send1.add(new WebSocketFrame(OpCode.TEXT).setPayload("f1").setFin(false)); + send1.add(new WebSocketFrame(OpCode.CONTINUATION).setPayload(",f2").setFin(false)); + send1.add(new WebSocketFrame(OpCode.PING).setPayload("pong-1")); + + List send2 = new ArrayList<>(); + send2.add(new WebSocketFrame(OpCode.CONTINUATION).setPayload(",f3").setFin(false)); + send2.add(new WebSocketFrame(OpCode.CONTINUATION).setPayload(",f4").setFin(false)); + send2.add(new WebSocketFrame(OpCode.PING).setPayload("pong-2")); + send2.add(new WebSocketFrame(OpCode.CONTINUATION).setPayload(",f5").setFin(true)); + send2.add(new CloseInfo(StatusCode.NORMAL).asFrame()); + + List expect1 = new ArrayList<>(); + expect1.add(WebSocketFrame.pong().setPayload("pong-1")); + + List expect2 = new ArrayList<>(); + expect2.add(WebSocketFrame.pong().setPayload("pong-2")); + expect2.add(WebSocketFrame.text("f1,f2,f3,f4,f5")); + expect2.add(new CloseInfo(StatusCode.NORMAL).asFrame()); + + Fuzzer fuzzer = new Fuzzer(this); + try + { + fuzzer.connect(); + fuzzer.setSendMode(Fuzzer.SendMode.SLOW); + fuzzer.setSlowSendSegmentSize(1); + + fuzzer.send(send1); + fuzzer.expect(expect1); + + TimeUnit.SECONDS.sleep(1); + + fuzzer.send(send2); + fuzzer.expect(expect2); + } + finally + { + fuzzer.close(); + } + } + + /** + * Send text fragmented in 2 packets + */ + @Test + public void testCase5_3() throws Exception + { + List send = new ArrayList<>(); + send.add(new WebSocketFrame(OpCode.TEXT).setPayload("hello, ").setFin(false)); + send.add(new WebSocketFrame(OpCode.CONTINUATION).setPayload("world").setFin(true)); + send.add(new CloseInfo(StatusCode.NORMAL).asFrame()); + + List expect = new ArrayList<>(); + expect.add(WebSocketFrame.text("hello, world")); + expect.add(new CloseInfo(StatusCode.NORMAL).asFrame()); + + Fuzzer fuzzer = new Fuzzer(this); + try + { + fuzzer.connect(); + fuzzer.setSendMode(Fuzzer.SendMode.BULK); + fuzzer.send(send); + fuzzer.expect(expect); + } + finally + { + fuzzer.close(); + } + } + + /** + * Send text fragmented in 2 packets (framewise) + */ + @Test + public void testCase5_4() throws Exception + { + List send = new ArrayList<>(); + send.add(new WebSocketFrame(OpCode.TEXT).setPayload("hello, ").setFin(false)); + send.add(new WebSocketFrame(OpCode.CONTINUATION).setPayload("world").setFin(true)); + send.add(new CloseInfo(StatusCode.NORMAL).asFrame()); + + List expect = new ArrayList<>(); + expect.add(WebSocketFrame.text("hello, world")); + expect.add(new CloseInfo(StatusCode.NORMAL).asFrame()); + + Fuzzer fuzzer = new Fuzzer(this); + try + { + fuzzer.connect(); + fuzzer.setSendMode(Fuzzer.SendMode.PER_FRAME); + fuzzer.send(send); + fuzzer.expect(expect); + } + finally + { + fuzzer.close(); + } + } + + /** + * Send text fragmented in 2 packets (slowly) + */ + @Test + public void testCase5_5() throws Exception + { + List send = new ArrayList<>(); + send.add(new WebSocketFrame(OpCode.TEXT).setPayload("hello, ").setFin(false)); + send.add(new WebSocketFrame(OpCode.CONTINUATION).setPayload("world").setFin(true)); + send.add(new CloseInfo(StatusCode.NORMAL).asFrame()); + + List expect = new ArrayList<>(); + expect.add(WebSocketFrame.text("hello, world")); + expect.add(new CloseInfo(StatusCode.NORMAL).asFrame()); + + Fuzzer fuzzer = new Fuzzer(this); + try + { + fuzzer.connect(); + fuzzer.setSendMode(Fuzzer.SendMode.SLOW); + fuzzer.setSlowSendSegmentSize(1); + fuzzer.send(send); + fuzzer.expect(expect); + } + finally + { + fuzzer.close(); + } + } + + /** + * Send text fragmented in 2 packets, with ping between them + */ + @Test + public void testCase5_6() throws Exception + { + List send = new ArrayList<>(); + send.add(new WebSocketFrame(OpCode.TEXT).setPayload("hello, ").setFin(false)); + send.add(new WebSocketFrame(OpCode.PING).setPayload("ping")); + send.add(new WebSocketFrame(OpCode.CONTINUATION).setPayload("world").setFin(true)); + send.add(new CloseInfo(StatusCode.NORMAL).asFrame()); + + List expect = new ArrayList<>(); + expect.add(WebSocketFrame.pong().setPayload("ping")); + expect.add(WebSocketFrame.text("hello, world")); + expect.add(new CloseInfo(StatusCode.NORMAL).asFrame()); + + Fuzzer fuzzer = new Fuzzer(this); + try + { + fuzzer.connect(); + fuzzer.setSendMode(Fuzzer.SendMode.BULK); + fuzzer.send(send); + fuzzer.expect(expect); + } + finally + { + fuzzer.close(); + } + } + + /** + * Send text fragmented in 2 packets, with ping between them (framewise) + */ + @Test + public void testCase5_7() throws Exception + { + List send = new ArrayList<>(); + send.add(new WebSocketFrame(OpCode.TEXT).setPayload("hello, ").setFin(false)); + send.add(new WebSocketFrame(OpCode.PING).setPayload("ping")); + send.add(new WebSocketFrame(OpCode.CONTINUATION).setPayload("world").setFin(true)); + send.add(new CloseInfo(StatusCode.NORMAL).asFrame()); + + List expect = new ArrayList<>(); + expect.add(WebSocketFrame.pong().setPayload("ping")); + expect.add(WebSocketFrame.text("hello, world")); + expect.add(new CloseInfo(StatusCode.NORMAL).asFrame()); + + Fuzzer fuzzer = new Fuzzer(this); + try + { + fuzzer.connect(); + fuzzer.setSendMode(Fuzzer.SendMode.PER_FRAME); + fuzzer.send(send); + fuzzer.expect(expect); + } + finally + { + fuzzer.close(); + } + } + + /** + * Send text fragmented in 2 packets, with ping between them (slowly) + */ + @Test + public void testCase5_8() throws Exception + { + List send = new ArrayList<>(); + send.add(new WebSocketFrame(OpCode.TEXT).setPayload("hello, ").setFin(false)); + send.add(new WebSocketFrame(OpCode.PING).setPayload("ping")); + send.add(new WebSocketFrame(OpCode.CONTINUATION).setPayload("world").setFin(true)); + send.add(new CloseInfo(StatusCode.NORMAL).asFrame()); + + List expect = new ArrayList<>(); + expect.add(WebSocketFrame.pong().setPayload("ping")); + expect.add(WebSocketFrame.text("hello, world")); + expect.add(new CloseInfo(StatusCode.NORMAL).asFrame()); + + Fuzzer fuzzer = new Fuzzer(this); + try + { + fuzzer.connect(); + fuzzer.setSendMode(Fuzzer.SendMode.SLOW); + fuzzer.setSlowSendSegmentSize(1); + fuzzer.send(send); + fuzzer.expect(expect); + } + finally + { + fuzzer.close(); + } + } + + /** + * Send continuation+fin, then text+fin + */ + @Test + public void testCase5_9() throws Exception + { + List send = new ArrayList<>(); + send.add(new WebSocketFrame(OpCode.CONTINUATION).setPayload("sorry").setFin(true)); + send.add(new WebSocketFrame(OpCode.TEXT).setPayload("hello, world")); + send.add(new CloseInfo(StatusCode.NORMAL).asFrame()); + + List expect = new ArrayList<>(); + expect.add(new CloseInfo(StatusCode.PROTOCOL).asFrame()); + + Fuzzer fuzzer = new Fuzzer(this); + try + { + fuzzer.connect(); + fuzzer.setSendMode(Fuzzer.SendMode.BULK); + fuzzer.send(send); + fuzzer.expect(expect); + } + finally + { + fuzzer.close(); } } } From 2f4c86be354717f7d1b9775f1aca73d379750802 Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Wed, 1 Aug 2012 12:58:32 -0700 Subject: [PATCH 10/13] Making Utf8StringBuilder actually throw a NotUtf8Exception in the case of an incomplete UTF8 sequence --- .../src/main/java/org/eclipse/jetty/util/Utf8Appendable.java | 1 + .../src/main/java/org/eclipse/jetty/util/Utf8StringBuilder.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/Utf8Appendable.java b/jetty-util/src/main/java/org/eclipse/jetty/util/Utf8Appendable.java index de02cc4e3f4..0869f3dae85 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/Utf8Appendable.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/Utf8Appendable.java @@ -179,6 +179,7 @@ public abstract class Utf8Appendable return _state == UTF8_ACCEPT; } + @SuppressWarnings("serial") public static class NotUtf8Exception extends IllegalArgumentException { public NotUtf8Exception(String reason) diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/Utf8StringBuilder.java b/jetty-util/src/main/java/org/eclipse/jetty/util/Utf8StringBuilder.java index 09866884eae..b42f1d5f7ed 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/Utf8StringBuilder.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/Utf8StringBuilder.java @@ -72,6 +72,6 @@ public class Utf8StringBuilder extends Utf8Appendable private void checkState() { if (!isUtf8SequenceComplete()) - throw new IllegalArgumentException("Tried to read incomplete UTF8 decoded String"); + throw new NotUtf8Exception("Tried to read incomplete UTF8 decoded String"); } } From 3621bec43cf1eadb2affa20c644a7d45ec1c4e66 Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Wed, 1 Aug 2012 13:11:24 -0700 Subject: [PATCH 11/13] More AB tests, and updates to Fuzzer --- .../websocket/server/ab/AbstractABCase.java | 21 + .../jetty/websocket/server/ab/AllTests.java | 2 +- .../jetty/websocket/server/ab/Fuzzer.java | 26 + .../websocket/server/ab/TestABCase3.java | 15 + .../websocket/server/ab/TestABCase5.java | 16 +- .../websocket/server/ab/TestABCase6.java | 846 ++++++++++++++++++ .../server/blockhead/BlockheadClient.java | 23 +- .../jetty/websocket/server/helper/Hex.java | 60 ++ 8 files changed, 992 insertions(+), 17 deletions(-) create mode 100644 jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase6.java create mode 100644 jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/helper/Hex.java diff --git a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/AbstractABCase.java b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/AbstractABCase.java index 1ce3ca4613e..23938089960 100644 --- a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/AbstractABCase.java +++ b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/AbstractABCase.java @@ -4,6 +4,7 @@ import java.nio.ByteBuffer; import org.eclipse.jetty.io.ByteBufferPool; import org.eclipse.jetty.io.StandardByteBufferPool; +import org.eclipse.jetty.util.StringUtil; import org.eclipse.jetty.websocket.api.WebSocketPolicy; import org.eclipse.jetty.websocket.protocol.Generator; import org.eclipse.jetty.websocket.server.SimpleServletServer; @@ -44,6 +45,26 @@ public abstract class AbstractABCase server.stop(); } + public static String toUtf8String(byte[] buf) + { + String raw = StringUtil.toUTF8String(buf,0,buf.length); + StringBuilder ret = new StringBuilder(); + int len = raw.length(); + for (int i = 0; i < len; i++) + { + int codepoint = raw.codePointAt(i); + if (Character.isUnicodeIdentifierPart(codepoint)) + { + ret.append(String.format("\\u%04X",codepoint)); + } + else + { + ret.append(Character.toChars(codepoint)); + } + } + return ret.toString(); + } + public Generator getLaxGenerator() { return laxGenerator; diff --git a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/AllTests.java b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/AllTests.java index 35f02c7b947..eb6267240a6 100644 --- a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/AllTests.java +++ b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/AllTests.java @@ -5,7 +5,7 @@ import org.junit.runners.Suite; @RunWith(Suite.class) @Suite.SuiteClasses( -{ TestABCase1.class, TestABCase2.class, TestABCase3.class, TestABCase4.class, TestABCase5.class, TestABCase7_9.class }) +{ TestABCase1.class, TestABCase2.class, TestABCase3.class, TestABCase4.class, TestABCase5.class, TestABCase6.class, TestABCase7_9.class }) public class AllTests { /* let junit do the rest */ diff --git a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/Fuzzer.java b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/Fuzzer.java index fa21f7908e4..5cde38c09b2 100644 --- a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/Fuzzer.java +++ b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/Fuzzer.java @@ -50,6 +50,26 @@ public class Fuzzer this.generator = testcase.getLaxGenerator(); } + public ByteBuffer asNetworkBuffer(List send) + { + int buflen = 0; + for (WebSocketFrame f : send) + { + buflen += f.getPayloadLength() + Generator.OVERHEAD; + } + ByteBuffer buf = ByteBuffer.allocate(buflen); + BufferUtil.clearToFill(buf); + + // Generate frames + for (WebSocketFrame f : send) + { + f.setMask(MASK); // make sure we have mask set + BufferUtil.put(generator.generate(f),buf); + } + BufferUtil.flipToFlush(buf,0); + return buf; + } + public void close() { this.client.disconnect(); @@ -125,6 +145,12 @@ public class Fuzzer } } + public void send(ByteBuffer buf, int numBytes) throws IOException + { + client.writeRaw(buf,numBytes); + client.flush(); + } + public void send(List send) throws IOException { Assert.assertThat("Client connected",client.isConnected(),is(true)); diff --git a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase3.java b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase3.java index 6e2e0754504..b3335b40e61 100644 --- a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase3.java +++ b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase3.java @@ -1,3 +1,18 @@ +// ======================================================================== +// Copyright 2011-2012 Mort Bay Consulting Pty. Ltd. +// ------------------------------------------------------------------------ +// All rights reserved. This program and the accompanying materials +// are made available under the terms of the Eclipse Public License v1.0 +// and Apache License v2.0 which accompanies this distribution. +// +// The Eclipse Public License is available at +// http://www.eclipse.org/legal/epl-v10.html +// +// The Apache License v2.0 is available at +// http://www.opensource.org/licenses/apache2.0.php +// +// You may elect to redistribute this code under either of these licenses. +//======================================================================== package org.eclipse.jetty.websocket.server.ab; import java.util.ArrayList; diff --git a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase5.java b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase5.java index a3783cf528d..e7aa498830f 100644 --- a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase5.java +++ b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase5.java @@ -20,15 +20,19 @@ import java.util.ArrayList; import java.util.List; import java.util.concurrent.TimeUnit; +import org.eclipse.jetty.toolchain.test.AdvancedRunner; +import org.eclipse.jetty.toolchain.test.annotation.Slow; import org.eclipse.jetty.websocket.api.StatusCode; import org.eclipse.jetty.websocket.protocol.CloseInfo; import org.eclipse.jetty.websocket.protocol.OpCode; import org.eclipse.jetty.websocket.protocol.WebSocketFrame; import org.junit.Test; +import org.junit.runner.RunWith; /** * Fragmentation Tests */ +@RunWith(AdvancedRunner.class) public class TestABCase5 extends AbstractABCase { /** @@ -360,13 +364,19 @@ public class TestABCase5 extends AbstractABCase * send text message fragmented in 5 frames, with 2 pings and wait between. */ @Test + @Slow public void testCase5_19() throws Exception { + // phase 1 List send1 = new ArrayList<>(); send1.add(new WebSocketFrame(OpCode.TEXT).setPayload("f1").setFin(false)); send1.add(new WebSocketFrame(OpCode.CONTINUATION).setPayload(",f2").setFin(false)); send1.add(new WebSocketFrame(OpCode.PING).setPayload("pong-1")); + List expect1 = new ArrayList<>(); + expect1.add(WebSocketFrame.pong().setPayload("pong-1")); + + // phase 2 List send2 = new ArrayList<>(); send2.add(new WebSocketFrame(OpCode.CONTINUATION).setPayload(",f3").setFin(false)); send2.add(new WebSocketFrame(OpCode.CONTINUATION).setPayload(",f4").setFin(false)); @@ -374,9 +384,6 @@ public class TestABCase5 extends AbstractABCase send2.add(new WebSocketFrame(OpCode.CONTINUATION).setPayload(",f5").setFin(true)); send2.add(new CloseInfo(StatusCode.NORMAL).asFrame()); - List expect1 = new ArrayList<>(); - expect1.add(WebSocketFrame.pong().setPayload("pong-1")); - List expect2 = new ArrayList<>(); expect2.add(WebSocketFrame.pong().setPayload("pong-2")); expect2.add(WebSocketFrame.text("f1,f2,f3,f4,f5")); @@ -388,11 +395,14 @@ public class TestABCase5 extends AbstractABCase fuzzer.connect(); fuzzer.setSendMode(Fuzzer.SendMode.BULK); + // phase 1 fuzzer.send(send1); fuzzer.expect(expect1); + // delay TimeUnit.SECONDS.sleep(1); + // phase 2 fuzzer.send(send2); fuzzer.expect(expect2); } diff --git a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase6.java b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase6.java new file mode 100644 index 00000000000..08d60fc3734 --- /dev/null +++ b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase6.java @@ -0,0 +1,846 @@ +// ======================================================================== +// Copyright 2011-2012 Mort Bay Consulting Pty. Ltd. +// ------------------------------------------------------------------------ +// All rights reserved. This program and the accompanying materials +// are made available under the terms of the Eclipse Public License v1.0 +// and Apache License v2.0 which accompanies this distribution. +// +// The Eclipse Public License is available at +// http://www.eclipse.org/legal/epl-v10.html +// +// The Apache License v2.0 is available at +// http://www.opensource.org/licenses/apache2.0.php +// +// You may elect to redistribute this code under either of these licenses. +//======================================================================== +package org.eclipse.jetty.websocket.server.ab; + +import java.nio.ByteBuffer; +import java.util.ArrayList; +import java.util.List; +import java.util.concurrent.TimeUnit; + +import org.eclipse.jetty.toolchain.test.AdvancedRunner; +import org.eclipse.jetty.toolchain.test.annotation.Slow; +import org.eclipse.jetty.util.StringUtil; +import org.eclipse.jetty.websocket.api.StatusCode; +import org.eclipse.jetty.websocket.protocol.CloseInfo; +import org.eclipse.jetty.websocket.protocol.OpCode; +import org.eclipse.jetty.websocket.protocol.WebSocketFrame; +import org.eclipse.jetty.websocket.server.helper.Hex; +import org.junit.Test; +import org.junit.runner.RunWith; + +/** + * UTF-8 Tests + */ +@RunWith(AdvancedRunner.class) +public class TestABCase6 extends AbstractABCase +{ + /** + * text message, 1 frame, 0 length + */ + @Test + public void testCase6_1_1() throws Exception + { + List send = new ArrayList<>(); + send.add(WebSocketFrame.text()); + send.add(new CloseInfo(StatusCode.NORMAL).asFrame()); + + List expect = new ArrayList<>(); + expect.add(WebSocketFrame.text()); + expect.add(new CloseInfo(StatusCode.NORMAL).asFrame()); + + Fuzzer fuzzer = new Fuzzer(this); + try + { + fuzzer.connect(); + fuzzer.setSendMode(Fuzzer.SendMode.BULK); + fuzzer.send(send); + fuzzer.expect(expect); + } + finally + { + fuzzer.close(); + } + } + + /** + * text message, 0 length, 3 fragments + */ + @Test + public void testCase6_1_2() throws Exception + { + List send = new ArrayList<>(); + send.add(new WebSocketFrame(OpCode.TEXT).setFin(false)); + send.add(new WebSocketFrame(OpCode.CONTINUATION).setFin(false)); + send.add(new WebSocketFrame(OpCode.CONTINUATION).setFin(true)); + send.add(new CloseInfo(StatusCode.NORMAL).asFrame()); + + List expect = new ArrayList<>(); + expect.add(WebSocketFrame.text()); + expect.add(new CloseInfo(StatusCode.NORMAL).asFrame()); + + Fuzzer fuzzer = new Fuzzer(this); + try + { + fuzzer.connect(); + fuzzer.setSendMode(Fuzzer.SendMode.BULK); + fuzzer.send(send); + fuzzer.expect(expect); + } + finally + { + fuzzer.close(); + } + } + + /** + * text message, small length, 3 fragments (only middle frame has payload) + */ + @Test + public void testCase6_1_3() throws Exception + { + List send = new ArrayList<>(); + send.add(new WebSocketFrame(OpCode.TEXT).setFin(false)); + send.add(new WebSocketFrame(OpCode.CONTINUATION).setFin(false).setPayload("middle")); + send.add(new WebSocketFrame(OpCode.CONTINUATION).setFin(true)); + send.add(new CloseInfo(StatusCode.NORMAL).asFrame()); + + List expect = new ArrayList<>(); + expect.add(WebSocketFrame.text("middle")); + expect.add(new CloseInfo(StatusCode.NORMAL).asFrame()); + + Fuzzer fuzzer = new Fuzzer(this); + try + { + fuzzer.connect(); + fuzzer.setSendMode(Fuzzer.SendMode.BULK); + fuzzer.send(send); + fuzzer.expect(expect); + } + finally + { + fuzzer.close(); + } + } + + /** + * valid utf8 text message, 1 frame/fragment. + */ + @Test + public void testCase6_2_1() throws Exception + { + String utf8 = "Hello-\uC2B5@\uC39F\uC3A4\uC3BC\uC3A0\uC3A1-UTF-8!!"; + byte msg[] = StringUtil.getUtf8Bytes(utf8); + + List send = new ArrayList<>(); + send.add(new WebSocketFrame(OpCode.TEXT).setPayload(msg)); + send.add(new CloseInfo(StatusCode.NORMAL).asFrame()); + + List expect = new ArrayList<>(); + expect.add(new WebSocketFrame(OpCode.TEXT).setPayload(msg)); + expect.add(new CloseInfo(StatusCode.NORMAL).asFrame()); + + Fuzzer fuzzer = new Fuzzer(this); + try + { + fuzzer.connect(); + fuzzer.setSendMode(Fuzzer.SendMode.BULK); + fuzzer.send(send); + fuzzer.expect(expect); + } + finally + { + fuzzer.close(); + } + } + + /** + * valid utf8 text message, 2 fragments (on UTF8 code point boundary) + */ + @Test + public void testCase6_2_2() throws Exception + { + String utf8[] = + { "Hello-\uC2B5@\uC39F\uC3A4", "\uC3BC\uC3A0\uC3A1-UTF-8!!" }; + + List send = new ArrayList<>(); + send.add(new WebSocketFrame(OpCode.TEXT).setPayload(utf8[0]).setFin(false)); + send.add(new WebSocketFrame(OpCode.CONTINUATION).setPayload(utf8[1]).setFin(true)); + send.add(new CloseInfo(StatusCode.NORMAL).asFrame()); + + List expect = new ArrayList<>(); + expect.add(new WebSocketFrame(OpCode.TEXT).setPayload(utf8[0] + utf8[1])); + expect.add(new CloseInfo(StatusCode.NORMAL).asFrame()); + + Fuzzer fuzzer = new Fuzzer(this); + try + { + fuzzer.connect(); + fuzzer.setSendMode(Fuzzer.SendMode.BULK); + fuzzer.send(send); + fuzzer.expect(expect); + } + finally + { + fuzzer.close(); + } + } + + /** + * valid utf8 text message, many fragments (1 byte each) + */ + @Test + public void testCase6_2_3() throws Exception + { + String utf8 = "Hello-\uC2B5@\uC39F\uC3A4\uC3BC\uC3A0\uC3A1-UTF-8!!"; + byte msg[] = StringUtil.getUtf8Bytes(utf8); + + List send = new ArrayList<>(); + int len = msg.length; + byte opcode = OpCode.TEXT; + byte mini[]; + for (int i = 0; i < len; i++) + { + WebSocketFrame frame = new WebSocketFrame(opcode); + mini = new byte[1]; + mini[0] = msg[i]; + frame.setPayload(mini); + frame.setFin(!(i < (len - 1))); + send.add(frame); + } + send.add(new CloseInfo(StatusCode.NORMAL).asFrame()); + + List expect = new ArrayList<>(); + expect.add(new WebSocketFrame(OpCode.TEXT).setPayload(msg)); + expect.add(new CloseInfo(StatusCode.NORMAL).asFrame()); + + Fuzzer fuzzer = new Fuzzer(this); + try + { + fuzzer.connect(); + fuzzer.setSendMode(Fuzzer.SendMode.BULK); + fuzzer.send(send); + fuzzer.expect(expect); + } + finally + { + fuzzer.close(); + } + } + + /** + * valid utf8 text message, many fragments (1 byte each) + */ + @Test + public void testCase6_2_4() throws Exception + { + byte msg[] = Hex.asByteArray("CEBAE1BDB9CF83CEBCCEB5"); + + List send = new ArrayList<>(); + int len = msg.length; + byte opcode = OpCode.TEXT; + byte mini[]; + for (int i = 0; i < len; i++) + { + WebSocketFrame frame = new WebSocketFrame(opcode); + mini = new byte[1]; + mini[0] = msg[i]; + frame.setPayload(mini); + frame.setFin(!(i < (len - 1))); + send.add(frame); + } + send.add(new CloseInfo(StatusCode.NORMAL).asFrame()); + + List expect = new ArrayList<>(); + expect.add(new WebSocketFrame(OpCode.TEXT).setPayload(msg)); + expect.add(new CloseInfo(StatusCode.NORMAL).asFrame()); + + Fuzzer fuzzer = new Fuzzer(this); + try + { + fuzzer.connect(); + fuzzer.setSendMode(Fuzzer.SendMode.BULK); + fuzzer.send(send); + fuzzer.expect(expect); + } + finally + { + fuzzer.close(); + } + } + + /** + * invalid utf8 text message, 1 frame/fragments + */ + @Test + public void testCase6_3_1() throws Exception + { + byte invalid[] = Hex.asByteArray("CEBAE1BDB9CF83CEBCCEB5EDA080656469746564"); + + List send = new ArrayList<>(); + send.add(new WebSocketFrame(OpCode.TEXT).setPayload(invalid)); + send.add(new CloseInfo(StatusCode.NORMAL).asFrame()); + + List expect = new ArrayList<>(); + expect.add(new CloseInfo(StatusCode.BAD_PAYLOAD).asFrame()); + + Fuzzer fuzzer = new Fuzzer(this); + try + { + fuzzer.connect(); + fuzzer.setSendMode(Fuzzer.SendMode.BULK); + fuzzer.send(send); + fuzzer.expect(expect); + } + finally + { + fuzzer.close(); + } + } + + /** + * invalid utf8 text message, many fragments (1 byte each) + */ + @Test + public void testCase6_3_2() throws Exception + { + byte invalid[] = Hex.asByteArray("CEBAE1BDB9CF83CEBCCEB5EDA080656469746564"); + + List send = new ArrayList<>(); + int len = invalid.length; + byte opcode = OpCode.TEXT; + byte mini[]; + for (int i = 0; i < len; i++) + { + WebSocketFrame frame = new WebSocketFrame(opcode); + mini = new byte[1]; + mini[0] = invalid[i]; + frame.setPayload(mini); + frame.setFin(!(i < (len - 1))); + send.add(frame); + } + send.add(new CloseInfo(StatusCode.NORMAL).asFrame()); + + List expect = new ArrayList<>(); + expect.add(new CloseInfo(StatusCode.BAD_PAYLOAD).asFrame()); + + Fuzzer fuzzer = new Fuzzer(this); + try + { + fuzzer.connect(); + fuzzer.setSendMode(Fuzzer.SendMode.BULK); + fuzzer.send(send); + fuzzer.expect(expect); + } + finally + { + fuzzer.close(); + } + } + + /** + * invalid text message, 3 fragments. + *

+ * fragment #1 and fragment #3 are both valid in themselves. + *

+ * fragment #2 contains the invalid utf8 code point. + */ + @Test + @Slow + public void testCase6_4_1() throws Exception + { + byte part1[] = StringUtil.getUtf8Bytes("\u03BA\u1F79\u03C3\u03BC\u03B5"); + byte part2[] = Hex.asByteArray("F4908080"); // invalid + byte part3[] = StringUtil.getUtf8Bytes("edited"); + + List expect = new ArrayList<>(); + expect.add(new CloseInfo(StatusCode.BAD_PAYLOAD).asFrame()); + + Fuzzer fuzzer = new Fuzzer(this); + try + { + fuzzer.connect(); + fuzzer.setSendMode(Fuzzer.SendMode.BULK); + + fuzzer.send(new WebSocketFrame(OpCode.TEXT).setPayload(part1).setFin(false)); + TimeUnit.SECONDS.sleep(1); + fuzzer.send(new WebSocketFrame(OpCode.CONTINUATION).setPayload(part2).setFin(false)); + TimeUnit.SECONDS.sleep(1); + fuzzer.send(new WebSocketFrame(OpCode.CONTINUATION).setPayload(part3).setFin(true)); + + fuzzer.expect(expect); + } + finally + { + fuzzer.close(); + } + } + + /** + * invalid text message, 3 fragments. + *

+ * fragment #1 is valid and ends in the middle of an incomplete code point. + *

+ * fragment #2 finishes the UTF8 code point but it is invalid + *

+ * fragment #3 contains the remainder of the message. + */ + @Test + @Slow + public void testCase6_4_2() throws Exception + { + byte part1[] = Hex.asByteArray("CEBAE1BDB9CF83CEBCCEB5F4"); // split code point + byte part2[] = Hex.asByteArray("90"); // continue code point & invalid + byte part3[] = Hex.asByteArray("8080656469746564"); // continue code point & finish + + List expect = new ArrayList<>(); + expect.add(new CloseInfo(StatusCode.BAD_PAYLOAD).asFrame()); + + Fuzzer fuzzer = new Fuzzer(this); + try + { + fuzzer.connect(); + fuzzer.setSendMode(Fuzzer.SendMode.BULK); + fuzzer.send(new WebSocketFrame(OpCode.TEXT).setPayload(part1).setFin(false)); + TimeUnit.SECONDS.sleep(1); + fuzzer.send(new WebSocketFrame(OpCode.CONTINUATION).setPayload(part2).setFin(false)); + TimeUnit.SECONDS.sleep(1); + fuzzer.send(new WebSocketFrame(OpCode.CONTINUATION).setPayload(part3).setFin(true)); + fuzzer.expect(expect); + } + finally + { + fuzzer.close(); + } + } + + /** + * invalid text message, 1 frame/fragment (slowly, and split within code points) + */ + @Test + @Slow + public void testCase6_4_3() throws Exception + { + byte invalid[] = Hex.asByteArray("CEBAE1BDB9CF83CEBCCEB5F49080808080656469746564"); + + List send = new ArrayList<>(); + send.add(new WebSocketFrame(OpCode.TEXT).setPayload(invalid)); + send.add(new CloseInfo(StatusCode.NORMAL).asFrame()); + + List expect = new ArrayList<>(); + expect.add(new CloseInfo(StatusCode.BAD_PAYLOAD).asFrame()); + + Fuzzer fuzzer = new Fuzzer(this); + try + { + fuzzer.connect(); + + ByteBuffer net = fuzzer.asNetworkBuffer(send); + fuzzer.send(net,6); + fuzzer.send(net,11); + TimeUnit.SECONDS.sleep(1); + fuzzer.send(net,4); + TimeUnit.SECONDS.sleep(1); + fuzzer.send(net,100); // the rest + + fuzzer.expect(expect); + } + finally + { + fuzzer.close(); + } + } + + /** + * invalid text message, 1 frame/fragment (slowly, and split within code points) + */ + @Test + @Slow + public void testCase6_4_4() throws Exception + { + byte invalid[] = Hex.asByteArray("CEBAE1BDB9CF83CEBCCEB5F49080808080656469746564"); + + List send = new ArrayList<>(); + send.add(new WebSocketFrame(OpCode.TEXT).setPayload(invalid)); + send.add(new CloseInfo(StatusCode.NORMAL).asFrame()); + + List expect = new ArrayList<>(); + expect.add(new CloseInfo(StatusCode.BAD_PAYLOAD).asFrame()); + + Fuzzer fuzzer = new Fuzzer(this); + try + { + fuzzer.connect(); + + ByteBuffer net = fuzzer.asNetworkBuffer(send); + fuzzer.send(net,6); + fuzzer.send(net,11); + TimeUnit.SECONDS.sleep(1); + fuzzer.send(net,1); + TimeUnit.SECONDS.sleep(1); + fuzzer.send(net,100); // the rest + + fuzzer.expect(expect); + } + finally + { + fuzzer.close(); + } + } + + /** + * valid utf8 text message, 1 frame/fragment. + */ + @Test + public void testCase6_5_1() throws Exception + { + byte msg[] = Hex.asByteArray("CEBAE1BDB9CF83CEBCCEB5"); + + List send = new ArrayList<>(); + send.add(new WebSocketFrame(OpCode.TEXT).setPayload(msg)); + send.add(new CloseInfo(StatusCode.NORMAL).asFrame()); + + List expect = new ArrayList<>(); + expect.add(new WebSocketFrame(OpCode.TEXT).setPayload(msg)); + expect.add(new CloseInfo(StatusCode.NORMAL).asFrame()); + + Fuzzer fuzzer = new Fuzzer(this); + try + { + fuzzer.connect(); + fuzzer.setSendMode(Fuzzer.SendMode.BULK); + fuzzer.send(send); + fuzzer.expect(expect); + } + finally + { + fuzzer.close(); + } + } + + /** + * invalid utf8 (incomplete code point) text message, 1 frame/fragment. + */ + @Test + public void testCase6_6_1() throws Exception + { + byte incomplete[] = Hex.asByteArray("CE"); + + List send = new ArrayList<>(); + send.add(new WebSocketFrame(OpCode.TEXT).setPayload(incomplete)); + send.add(new CloseInfo(StatusCode.NORMAL).asFrame()); + + List expect = new ArrayList<>(); + expect.add(new CloseInfo(StatusCode.BAD_PAYLOAD).asFrame()); + + Fuzzer fuzzer = new Fuzzer(this); + try + { + fuzzer.connect(); + fuzzer.setSendMode(Fuzzer.SendMode.BULK); + fuzzer.send(send); + fuzzer.expect(expect); + } + finally + { + fuzzer.close(); + } + } + + /** + * invalid utf8 text message, 1 frame/fragment, 4 valid code points + 1 partial code point + */ + @Test + public void testCase6_6_10() throws Exception + { + byte invalid[] = Hex.asByteArray("CEBAE1BDB9CF83CEBCCE"); + + List send = new ArrayList<>(); + send.add(new WebSocketFrame(OpCode.TEXT).setPayload(invalid)); + send.add(new CloseInfo(StatusCode.NORMAL).asFrame()); + + List expect = new ArrayList<>(); + expect.add(new CloseInfo(StatusCode.BAD_PAYLOAD).asFrame()); + + Fuzzer fuzzer = new Fuzzer(this); + try + { + fuzzer.connect(); + fuzzer.setSendMode(Fuzzer.SendMode.BULK); + fuzzer.send(send); + fuzzer.expect(expect); + } + finally + { + fuzzer.close(); + } + } + + /** + * valid utf8 text message, 1 frame/fragment, 5 valid code points (preserved on echo). + */ + @Test + public void testCase6_6_11() throws Exception + { + byte msg[] = Hex.asByteArray("CEBAE1BDB9CF83CEBCCEB5"); + + List send = new ArrayList<>(); + send.add(new WebSocketFrame(OpCode.TEXT).setPayload(msg)); + send.add(new CloseInfo(StatusCode.NORMAL).asFrame()); + + List expect = new ArrayList<>(); + expect.add(new WebSocketFrame(OpCode.TEXT).setPayload(msg)); + expect.add(new CloseInfo(StatusCode.NORMAL).asFrame()); + + Fuzzer fuzzer = new Fuzzer(this); + try + { + fuzzer.connect(); + fuzzer.setSendMode(Fuzzer.SendMode.BULK); + fuzzer.send(send); + fuzzer.expect(expect); + } + finally + { + fuzzer.close(); + } + } + + /** + * valid utf8 text message, 1 frame/fragment, 1 valid code point (preserved on echo). + */ + @Test + public void testCase6_6_2() throws Exception + { + byte msg[] = Hex.asByteArray("CEBA"); + + List send = new ArrayList<>(); + send.add(new WebSocketFrame(OpCode.TEXT).setPayload(msg)); + send.add(new CloseInfo(StatusCode.NORMAL).asFrame()); + + List expect = new ArrayList<>(); + expect.add(new WebSocketFrame(OpCode.TEXT).setPayload(msg)); + expect.add(new CloseInfo(StatusCode.NORMAL).asFrame()); + + Fuzzer fuzzer = new Fuzzer(this); + try + { + fuzzer.connect(); + fuzzer.setSendMode(Fuzzer.SendMode.BULK); + fuzzer.send(send); + fuzzer.expect(expect); + } + finally + { + fuzzer.close(); + } + } + + /** + * invalid utf8 text message, 1 frame/fragment, 1 valid code point + 1 partial code point + */ + @Test + public void testCase6_6_3() throws Exception + { + byte invalid[] = Hex.asByteArray("CEBAE1"); + + List send = new ArrayList<>(); + send.add(new WebSocketFrame(OpCode.TEXT).setPayload(invalid)); + send.add(new CloseInfo(StatusCode.NORMAL).asFrame()); + + List expect = new ArrayList<>(); + expect.add(new CloseInfo(StatusCode.BAD_PAYLOAD).asFrame()); + + Fuzzer fuzzer = new Fuzzer(this); + try + { + fuzzer.connect(); + fuzzer.setSendMode(Fuzzer.SendMode.BULK); + fuzzer.send(send); + fuzzer.expect(expect); + } + finally + { + fuzzer.close(); + } + } + + /** + * invalid utf8 text message, 1 frame/fragment, 1 valid code point + 1 invalid code point + */ + @Test + public void testCase6_6_4() throws Exception + { + byte invalid[] = Hex.asByteArray("CEBAE1BD"); + + List send = new ArrayList<>(); + send.add(new WebSocketFrame(OpCode.TEXT).setPayload(invalid)); + send.add(new CloseInfo(StatusCode.NORMAL).asFrame()); + + List expect = new ArrayList<>(); + expect.add(new CloseInfo(StatusCode.BAD_PAYLOAD).asFrame()); + + Fuzzer fuzzer = new Fuzzer(this); + try + { + fuzzer.connect(); + fuzzer.setSendMode(Fuzzer.SendMode.BULK); + fuzzer.send(send); + fuzzer.expect(expect); + } + finally + { + fuzzer.close(); + } + } + + /** + * valid utf8 text message, 1 frame/fragment, 2 valid code points (preserved on echo). + */ + @Test + public void testCase6_6_5() throws Exception + { + byte msg[] = Hex.asByteArray("CEBAE1BDB9"); + + List send = new ArrayList<>(); + send.add(new WebSocketFrame(OpCode.TEXT).setPayload(msg)); + send.add(new CloseInfo(StatusCode.NORMAL).asFrame()); + + List expect = new ArrayList<>(); + expect.add(new WebSocketFrame(OpCode.TEXT).setPayload(msg)); + expect.add(new CloseInfo(StatusCode.NORMAL).asFrame()); + + Fuzzer fuzzer = new Fuzzer(this); + try + { + fuzzer.connect(); + fuzzer.setSendMode(Fuzzer.SendMode.BULK); + fuzzer.send(send); + fuzzer.expect(expect); + } + finally + { + fuzzer.close(); + } + } + + /** + * invalid utf8 text message, 1 frame/fragment, 2 valid code points + 1 partial code point + */ + @Test + public void testCase6_6_6() throws Exception + { + byte invalid[] = Hex.asByteArray("CEBAE1BDB9CF"); + + List send = new ArrayList<>(); + send.add(new WebSocketFrame(OpCode.TEXT).setPayload(invalid)); + send.add(new CloseInfo(StatusCode.NORMAL).asFrame()); + + List expect = new ArrayList<>(); + expect.add(new CloseInfo(StatusCode.BAD_PAYLOAD).asFrame()); + + Fuzzer fuzzer = new Fuzzer(this); + try + { + fuzzer.connect(); + fuzzer.setSendMode(Fuzzer.SendMode.BULK); + fuzzer.send(send); + fuzzer.expect(expect); + } + finally + { + fuzzer.close(); + } + } + + /** + * valid utf8 text message, 1 frame/fragment, 3 valid code points (preserved on echo). + */ + @Test + public void testCase6_6_7() throws Exception + { + byte msg[] = Hex.asByteArray("CEBAE1BDB9CF83"); + + List send = new ArrayList<>(); + send.add(new WebSocketFrame(OpCode.TEXT).setPayload(msg)); + send.add(new CloseInfo(StatusCode.NORMAL).asFrame()); + + List expect = new ArrayList<>(); + expect.add(new WebSocketFrame(OpCode.TEXT).setPayload(msg)); + expect.add(new CloseInfo(StatusCode.NORMAL).asFrame()); + + Fuzzer fuzzer = new Fuzzer(this); + try + { + fuzzer.connect(); + fuzzer.setSendMode(Fuzzer.SendMode.BULK); + fuzzer.send(send); + fuzzer.expect(expect); + } + finally + { + fuzzer.close(); + } + } + + /** + * invalid utf8 text message, 1 frame/fragment, 3 valid code points + 1 partial code point + */ + @Test + public void testCase6_6_8() throws Exception + { + byte invalid[] = Hex.asByteArray("CEBAE1BDB9CF83CE"); + + List send = new ArrayList<>(); + send.add(new WebSocketFrame(OpCode.TEXT).setPayload(invalid)); + send.add(new CloseInfo(StatusCode.NORMAL).asFrame()); + + List expect = new ArrayList<>(); + expect.add(new CloseInfo(StatusCode.BAD_PAYLOAD).asFrame()); + + Fuzzer fuzzer = new Fuzzer(this); + try + { + fuzzer.connect(); + fuzzer.setSendMode(Fuzzer.SendMode.BULK); + fuzzer.send(send); + fuzzer.expect(expect); + } + finally + { + fuzzer.close(); + } + } + + /** + * valid utf8 text message, 1 frame/fragment, 4 valid code points (preserved on echo). + */ + @Test + public void testCase6_6_9() throws Exception + { + byte msg[] = Hex.asByteArray("CEBAE1BDB9CF83CEBC"); + + List send = new ArrayList<>(); + send.add(new WebSocketFrame(OpCode.TEXT).setPayload(msg)); + send.add(new CloseInfo(StatusCode.NORMAL).asFrame()); + + List expect = new ArrayList<>(); + expect.add(new WebSocketFrame(OpCode.TEXT).setPayload(msg)); + expect.add(new CloseInfo(StatusCode.NORMAL).asFrame()); + + Fuzzer fuzzer = new Fuzzer(this); + try + { + fuzzer.connect(); + fuzzer.setSendMode(Fuzzer.SendMode.BULK); + fuzzer.send(send); + fuzzer.expect(expect); + } + finally + { + fuzzer.close(); + } + } +} diff --git a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/blockhead/BlockheadClient.java b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/blockhead/BlockheadClient.java index 759a22bae29..dbfa1befbe8 100644 --- a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/blockhead/BlockheadClient.java +++ b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/blockhead/BlockheadClient.java @@ -550,6 +550,14 @@ public class BlockheadClient implements IncomingFrames, OutgoingFrames BufferUtil.writeTo(buf,out); } + public void writeRaw(ByteBuffer buf, int numBytes) throws IOException + { + int len = Math.min(numBytes,buf.remaining()); + byte arr[] = new byte[len]; + buf.get(arr,0,len); + out.write(arr); + } + public void writeRaw(String str) throws IOException { LOG.debug("write((String)[{}]){}{})",str.length(),'\n',str); @@ -558,20 +566,9 @@ public class BlockheadClient implements IncomingFrames, OutgoingFrames public void writeRawSlowly(ByteBuffer buf, int segmentSize) throws IOException { - int origLimit = buf.limit(); - int limit = buf.limit(); - int len; - int pos = buf.position(); - int overallLeft = buf.remaining(); - while (overallLeft > 0) + while (buf.remaining() > 0) { - buf.position(pos); - limit = Math.min(origLimit,pos + segmentSize); - buf.limit(limit); - len = buf.remaining(); - overallLeft -= len; - pos += len; - writeRaw(buf); + writeRaw(buf,segmentSize); flush(); } } diff --git a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/helper/Hex.java b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/helper/Hex.java new file mode 100644 index 00000000000..0978f53835f --- /dev/null +++ b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/helper/Hex.java @@ -0,0 +1,60 @@ +//======================================================================== +//Copyright 2011-2012 Mort Bay Consulting Pty. Ltd. +//------------------------------------------------------------------------ +//All rights reserved. This program and the accompanying materials +//are made available under the terms of the Eclipse Public License v1.0 +//and Apache License v2.0 which accompanies this distribution. +//The Eclipse Public License is available at +//http://www.eclipse.org/legal/epl-v10.html +//The Apache License v2.0 is available at +//http://www.opensource.org/licenses/apache2.0.php +//You may elect to redistribute this code under either of these licenses. +//======================================================================== +package org.eclipse.jetty.websocket.server.helper; + +public final class Hex +{ + private static final char[] hexcodes = "0123456789ABCDEF".toCharArray(); + + public static byte[] asByteArray(String hstr) + { + if ((hstr.length() < 0) || ((hstr.length() % 2) != 0)) + { + throw new IllegalArgumentException(String.format("Invalid string length of <%d>",hstr.length())); + } + + int size = hstr.length() / 2; + byte buf[] = new byte[size]; + byte hex; + int len = hstr.length(); + + int idx = (int)Math.floor(((size * 2) - (double)len) / 2); + for (int i = 0; i < len; i++) + { + hex = 0; + if (i >= 0) + { + hex = (byte)(Character.digit(hstr.charAt(i),16) << 4); + } + i++; + hex += (byte)(Character.digit(hstr.charAt(i),16)); + + buf[idx] = hex; + idx++; + } + + return buf; + } + + public static String asHex(byte buf[]) + { + int len = buf.length; + char out[] = new char[len * 2]; + for (int i = 0; i < len; i++) + { + out[i * 2] = hexcodes[(buf[i] & 0xF0) >> 4]; + out[(i * 2) + 1] = hexcodes[(buf[i] & 0x0F)]; + } + return String.valueOf(out); + } +} From 9e332c925530c88c19591b149cf5293287b255fe Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Wed, 1 Aug 2012 15:10:32 -0700 Subject: [PATCH 12/13] Fixing StdErrLogTest failures introduced by latest thread id addition --- .../eclipse/jetty/util/log/StdErrLogTest.java | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/jetty-util/src/test/java/org/eclipse/jetty/util/log/StdErrLogTest.java b/jetty-util/src/test/java/org/eclipse/jetty/util/log/StdErrLogTest.java index 5134a72bc34..441abed918c 100644 --- a/jetty-util/src/test/java/org/eclipse/jetty/util/log/StdErrLogTest.java +++ b/jetty-util/src/test/java/org/eclipse/jetty/util/log/StdErrLogTest.java @@ -45,14 +45,14 @@ public class StdErrLogTest log.info("testing:{}",null,null); log.info("testing",null,null); - output.assertContains("INFO:oejul.LogTest:testing:test,format1"); - output.assertContains("INFO:oejul.LogTest:testing:test,format1"); - output.assertContains("INFO:oejul.LogTest:testing:test format2"); - output.assertContains("INFO:oejul.LogTest:testing test format3"); - output.assertContains("INFO:oejul.LogTest:testing:test,null"); - output.assertContains("INFO:oejul.LogTest:testing null null"); - output.assertContains("INFO:oejul.LogTest:testing:null"); - output.assertContains("INFO:oejul.LogTest:testing"); + output.assertContains("INFO:oejul.LogTest:1: testing:test,format1"); + output.assertContains("INFO:oejul.LogTest:1: testing:test,format1"); + output.assertContains("INFO:oejul.LogTest:1: testing:test format2"); + output.assertContains("INFO:oejul.LogTest:1: testing test format3"); + output.assertContains("INFO:oejul.LogTest:1: testing:test,null"); + output.assertContains("INFO:oejul.LogTest:1: testing null null"); + output.assertContains("INFO:oejul.LogTest:1: testing:null"); + output.assertContains("INFO:oejul.LogTest:1: testing"); } @Test @@ -75,12 +75,12 @@ public class StdErrLogTest log.setDebugEnabled(false); log.debug("testing {} {}","test","debug-deprecated-false"); - output.assertContains("DBUG:xxx:testing test debug"); - output.assertContains("INFO:xxx:testing test info"); - output.assertContains("WARN:xxx:testing test warn"); + output.assertContains("DBUG:xxx:1: testing test debug"); + output.assertContains("INFO:xxx:1: testing test info"); + output.assertContains("WARN:xxx:1: testing test warn"); output.assertNotContains("YOU SHOULD NOT SEE THIS!"); - output.assertContains("DBUG:xxx:testing test debug-deprecated"); - output.assertNotContains("DBUG:xxx:testing test debug-depdeprecated-false"); + output.assertContains("DBUG:xxx:1: testing test debug-deprecated"); + output.assertNotContains("DBUG:xxx:1: testing test debug-depdeprecated-false"); } @Test @@ -95,7 +95,7 @@ public class StdErrLogTest Assert.assertThat("Log.name(child)", next.getName(), is("test.next")); next.info("testing {} {}","next","info"); - output.assertContains(":test.next:testing next info"); + output.assertContains(":test.next:1: testing next info"); } @Test @@ -307,7 +307,7 @@ public class StdErrLogTest output.assertContains("Cheer Me"); // Validate Stack Traces - output.assertContains(".StdErrLogTest:"); + output.assertContains(".StdErrLogTest:1: "); output.assertContains("java.lang.Throwable: out of focus"); output.assertContains("java.lang.Throwable: scene lost"); } @@ -354,7 +354,7 @@ public class StdErrLogTest output.assertNotContains(""); output.assertNotContains("on editing room floor"); - output.assertContains(".StdErrLogTest:"); + output.assertContains(".StdErrLogTest:1: "); output.assertContains("java.lang.Throwable: out of focus"); output.assertContains("java.lang.Throwable: scene lost"); } @@ -427,7 +427,7 @@ public class StdErrLogTest output.assertNotContains(""); output.assertNotContains("on editing room floor"); - output.assertContains(".StdErrLogTest:"); + output.assertContains(".StdErrLogTest:1: "); output.assertContains("java.lang.Throwable: out of focus"); output.assertContains("java.lang.Throwable: scene lost"); } From a8a3bade3319b090208b69ed6a0cb47f0cd06c1d Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Wed, 1 Aug 2012 19:45:14 -0700 Subject: [PATCH 13/13] Setting @Ignore on tests with issues ATM --- .../jetty/websocket/server/DeflateExtensionTest.java | 2 ++ .../org/eclipse/jetty/websocket/server/ab/TestABCase1.java | 7 +++++++ .../org/eclipse/jetty/websocket/server/ab/TestABCase2.java | 2 ++ .../org/eclipse/jetty/websocket/server/ab/TestABCase5.java | 3 +++ .../src/test/resources/jetty-logging.properties | 2 +- 5 files changed, 15 insertions(+), 1 deletion(-) diff --git a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/DeflateExtensionTest.java b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/DeflateExtensionTest.java index 1b4f197e85a..d2fcaa1bf3e 100644 --- a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/DeflateExtensionTest.java +++ b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/DeflateExtensionTest.java @@ -26,6 +26,7 @@ import org.eclipse.jetty.websocket.server.helper.IncomingFramesCapture; import org.junit.AfterClass; import org.junit.Assert; import org.junit.BeforeClass; +import org.junit.Ignore; import org.junit.Test; public class DeflateExtensionTest @@ -46,6 +47,7 @@ public class DeflateExtensionTest } @Test + @Ignore("FIXME") public void testDeflateFrameExtension() throws Exception { BlockheadClient client = new BlockheadClient(server.getServerUri()); diff --git a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase1.java b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase1.java index 90ed4497ffa..9bdb7cc3b9c 100644 --- a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase1.java +++ b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase1.java @@ -23,6 +23,7 @@ import org.eclipse.jetty.websocket.api.StatusCode; import org.eclipse.jetty.websocket.protocol.CloseInfo; import org.eclipse.jetty.websocket.protocol.WebSocketFrame; import org.eclipse.jetty.websocket.server.ab.Fuzzer.SendMode; +import org.junit.Ignore; import org.junit.Test; public class TestABCase1 extends AbstractABCase @@ -183,6 +184,7 @@ public class TestABCase1 extends AbstractABCase * Echo 65535 byte TEXT message (uses medium 2 byte payload length) */ @Test + @Ignore("FIXME") public void testCase1_1_6() throws Exception { byte payload[] = new byte[65535]; @@ -214,6 +216,7 @@ public class TestABCase1 extends AbstractABCase * Echo 65536 byte TEXT message (uses large 8 byte payload length) */ @Test + @Ignore("FIXME") public void testCase1_1_7() throws Exception { byte payload[] = new byte[65536]; @@ -249,6 +252,7 @@ public class TestABCase1 extends AbstractABCase * This is done to test the parsing together of the frame on the server side. */ @Test + @Ignore("FIXME") public void testCase1_1_8() throws Exception { byte payload[] = new byte[65536]; @@ -434,6 +438,7 @@ public class TestABCase1 extends AbstractABCase * Echo 65535 byte BINARY message (uses medium 2 byte payload length) */ @Test + @Ignore("FIXME") public void testCase1_2_6() throws Exception { byte payload[] = new byte[65535]; @@ -465,6 +470,7 @@ public class TestABCase1 extends AbstractABCase * Echo 65536 byte BINARY message (uses large 8 byte payload length) */ @Test + @Ignore("FIXME") public void testCase1_2_7() throws Exception { byte payload[] = new byte[65536]; @@ -500,6 +506,7 @@ public class TestABCase1 extends AbstractABCase * This is done to test the parsing together of the frame on the server side. */ @Test + @Ignore("FIXME") public void testCase1_2_8() throws Exception { byte payload[] = new byte[65536]; diff --git a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase2.java b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase2.java index 00b3f1f2235..c5c32d86c8f 100644 --- a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase2.java +++ b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase2.java @@ -9,6 +9,7 @@ import org.eclipse.jetty.websocket.api.StatusCode; import org.eclipse.jetty.websocket.protocol.CloseInfo; import org.eclipse.jetty.websocket.protocol.OpCode; import org.eclipse.jetty.websocket.protocol.WebSocketFrame; +import org.junit.Ignore; import org.junit.Test; public class TestABCase2 extends AbstractABCase @@ -80,6 +81,7 @@ public class TestABCase2 extends AbstractABCase * 10 pings, sent slowly */ @Test + @Ignore("FIXME") public void testCase2_11() throws Exception { // send 10 pings (slowly) each with unique payload diff --git a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase5.java b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase5.java index e7aa498830f..e45c8f6ee3a 100644 --- a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase5.java +++ b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase5.java @@ -26,6 +26,7 @@ import org.eclipse.jetty.websocket.api.StatusCode; import org.eclipse.jetty.websocket.protocol.CloseInfo; import org.eclipse.jetty.websocket.protocol.OpCode; import org.eclipse.jetty.websocket.protocol.WebSocketFrame; +import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; @@ -241,6 +242,7 @@ public class TestABCase5 extends AbstractABCase * Send text fragmented properly in 2 frames, then continuation!fin, then text unfragmented. */ @Test + @Ignore("FIXME") public void testCase5_15() throws Exception { List send = new ArrayList<>(); @@ -336,6 +338,7 @@ public class TestABCase5 extends AbstractABCase * text message fragmented in 2 frames, both frames as opcode=TEXT */ @Test + @Ignore("FIXME") public void testCase5_18() throws Exception { List send = new ArrayList<>(); diff --git a/jetty-websocket/websocket-server/src/test/resources/jetty-logging.properties b/jetty-websocket/websocket-server/src/test/resources/jetty-logging.properties index 71cc4f86bba..7000875148c 100644 --- a/jetty-websocket/websocket-server/src/test/resources/jetty-logging.properties +++ b/jetty-websocket/websocket-server/src/test/resources/jetty-logging.properties @@ -9,7 +9,7 @@ org.eclipse.jetty.websocket.server.helper.RFCSocket.LEVEL=OFF # org.eclipse.jetty.websocket.io.WebSocketAsyncConnection.LEVEL=DEBUG # org.eclipse.jetty.util.thread.QueuedThreadPool.LEVEL=DEBUG # org.eclipse.jetty.io.SelectorManager.LEVEL=INFO -org.eclipse.jetty.websocket.LEVEL=DEBUG +# org.eclipse.jetty.websocket.LEVEL=DEBUG # org.eclipse.jetty.websocket.driver.WebSocketEventDriver.LEVEL=DEBUG # org.eclipse.jetty.websocket.extensions.LEVEL=DEBUG # org.eclipse.jetty.websocket.protocol.Generator.LEVEL=INFO