Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9

This commit is contained in:
Joakim Erdfelt 2012-07-06 15:09:27 -07:00
parent 87ca4eb25b 27b05ccd6e
commit 5d9eab45b4
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/generator/FrameGenerator.java
View File

@ -4,7 +4,6 @@ import java.nio.ByteBuffer;
import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.log.Logger;
import org.eclipse.jetty.websocket.api.PolicyViolationException;
import org.eclipse.jetty.websocket.api.ProtocolException; import org.eclipse.jetty.websocket.api.ProtocolException;
import org.eclipse.jetty.websocket.api.WebSocketPolicy; import org.eclipse.jetty.websocket.api.WebSocketPolicy;
import org.eclipse.jetty.websocket.protocol.CloseInfo; import org.eclipse.jetty.websocket.protocol.CloseInfo;
@ -57,6 +56,11 @@ public class FrameGenerator
byte b; byte b;
if ( frame.getOpCode().isControlFrame() && !frame.isFin() )
{
throw new ProtocolException("Control Frames must be FIN=true");
}
// Setup fin thru opcode // Setup fin thru opcode
b = 0x00; b = 0x00;
if (frame.isFin()) if (frame.isFin())
@ -67,19 +71,19 @@ public class FrameGenerator
{ {
b |= 0x40; // 0100_0000 b |= 0x40; // 0100_0000
// TODO: extensions can negotiate this (somehow) // TODO: extensions can negotiate this (somehow)
throw new PolicyViolationException("RSV1 not allowed to be set"); throw new ProtocolException("RSV1 not allowed to be set");
} }
if (frame.isRsv2()) if (frame.isRsv2())
{ {
b |= 0x20; // 0010_0000 b |= 0x20; // 0010_0000
// TODO: extensions can negotiate this (somehow) // TODO: extensions can negotiate this (somehow)
throw new PolicyViolationException("RSV2 not allowed to be set"); throw new ProtocolException("RSV2 not allowed to be set");
} }
if (frame.isRsv3()) if (frame.isRsv3())
{ {
b |= 0x10; b |= 0x10;
// TODO: extensions can negotiate this (somehow) // TODO: extensions can negotiate this (somehow)
throw new PolicyViolationException("RSV3 not allowed to be set"); throw new ProtocolException("RSV3 not allowed to be set");
} }
byte opcode = frame.getOpCode().getCode(); byte opcode = frame.getOpCode().getCode();

14
jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/ab/TestABCase3.java
View File

@ -5,7 +5,7 @@ import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.List; import java.util.List;
import org.eclipse.jetty.websocket.api.PolicyViolationException; import org.eclipse.jetty.websocket.api.ProtocolException;
import org.eclipse.jetty.websocket.api.WebSocketPolicy; import org.eclipse.jetty.websocket.api.WebSocketPolicy;
import org.eclipse.jetty.websocket.generator.Generator; import org.eclipse.jetty.websocket.generator.Generator;
import org.eclipse.jetty.websocket.protocol.FrameBuilder; import org.eclipse.jetty.websocket.protocol.FrameBuilder;
@ -24,6 +24,8 @@ public class TestABCase3
{ {
List<WebSocketFrame[]> data = new ArrayList<>(); List<WebSocketFrame[]> data = new ArrayList<>();
// @formatter:off // @formatter:off
data.add(new WebSocketFrame[]
{ FrameBuilder.ping().fin(false).asFrame() });
data.add(new WebSocketFrame[] data.add(new WebSocketFrame[]
{ FrameBuilder.ping().rsv1(true).asFrame() }); { FrameBuilder.ping().rsv1(true).asFrame() });
data.add(new WebSocketFrame[] data.add(new WebSocketFrame[]
@ -31,11 +33,15 @@ public class TestABCase3
data.add(new WebSocketFrame[] data.add(new WebSocketFrame[]
{ FrameBuilder.ping().rsv3(true).asFrame() }); { FrameBuilder.ping().rsv3(true).asFrame() });
data.add(new WebSocketFrame[] data.add(new WebSocketFrame[]
{ FrameBuilder.pong().rsv1(true).asFrame() }); { FrameBuilder.pong().fin(false).asFrame() });
data.add(new WebSocketFrame[]
{ FrameBuilder.ping().rsv1(true).asFrame() });
data.add(new WebSocketFrame[] data.add(new WebSocketFrame[]
{ FrameBuilder.pong().rsv2(true).asFrame() }); { FrameBuilder.pong().rsv2(true).asFrame() });
data.add(new WebSocketFrame[] data.add(new WebSocketFrame[]
{ FrameBuilder.pong().rsv3(true).asFrame() }); { FrameBuilder.pong().rsv3(true).asFrame() });
data.add(new WebSocketFrame[]
{ FrameBuilder.close().fin(false).asFrame() });
data.add(new WebSocketFrame[] data.add(new WebSocketFrame[]
{ FrameBuilder.close().rsv1(true).asFrame() }); { FrameBuilder.close().rsv1(true).asFrame() });
data.add(new WebSocketFrame[] data.add(new WebSocketFrame[]
@ -53,8 +59,8 @@ public class TestABCase3
this.invalidFrame = invalidFrame; this.invalidFrame = invalidFrame;
} }
@Test(expected = PolicyViolationException.class) @Test(expected = ProtocolException.class)
public void testGenerateRSV1CloseFrame() public void testGenerateInvalidControlFrame()
{ {
Generator generator = new Generator(WebSocketPolicy.newServerPolicy()); Generator generator = new Generator(WebSocketPolicy.newServerPolicy());