InvalidHandshakeException on invalid status line

Fix for TooTallNate#390
marci4 · Oct 12, 2017 · 6566b06 · 6566b06
1 parent 1bc60f7
commit 6566b06
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/src/main/example/ExampleClient.java b/src/main/example/ExampleClient.java
@@ -57,7 +57,7 @@ public void onMessage( String message ) {
 	@Override
 	public void onClose( int code, String reason, boolean remote ) {
 		// The codecodes are documented in class org.java_websocket.framing.CloseFrame
-		System.out.println( "Connection closed by " + ( remote ? "remote peer" : "us" ) );
+		System.out.println( "Connection closed by " + ( remote ? "remote peer" : "us" ) + " Code: " + code + " Reason: " + reason );
 	}
 
 	@Override
@@ -67,7 +67,7 @@ public void onError( Exception ex ) {
 	}
 
 	public static void main( String[] args ) throws URISyntaxException {
-		ExampleClient c = new ExampleClient( new URI( "ws://localhost:8887" ), new Draft_6455() ); // more about drafts here: http://github.com/TooTallNate/Java-WebSocket/wiki/Drafts
+		ExampleClient c = new ExampleClient( new URI( "ws://echo.websocket.org/asdf" ), new Draft_6455() ); // more about drafts here: http://github.com/TooTallNate/Java-WebSocket/wiki/Drafts
 		c.connect();
 	}
 

diff --git a/src/main/java/org/java_websocket/drafts/Draft.java b/src/main/java/org/java_websocket/drafts/Draft.java
@@ -119,12 +119,24 @@ public static HandshakeBuilder translateHandshakeHttp( ByteBuffer buf, Role role
 
 		if( role == Role.CLIENT ) {
 			// translating/parsing the response from the SERVER
+			if (!"HTTP/1.1".equalsIgnoreCase(firstLineTokens[0])) {
+				throw new InvalidHandshakeException( "Invalid status line received: " + firstLineTokens[0] );
+			}
+			if (!"101".equals(firstLineTokens[1])) {
+				throw new InvalidHandshakeException( "Invalid status code received: " + firstLineTokens[1] );
+			}
 			handshake = new HandshakeImpl1Server();
 			ServerHandshakeBuilder serverhandshake = (ServerHandshakeBuilder) handshake;
 			serverhandshake.setHttpStatus( Short.parseShort( firstLineTokens[ 1 ] ) );
 			serverhandshake.setHttpStatusMessage( firstLineTokens[ 2 ] );
 		} else {
 			// translating/parsing the request from the CLIENT
+			if (!"GET".equalsIgnoreCase(firstLineTokens[0])) {
+				throw new InvalidHandshakeException( "Invalid request method received: " + firstLineTokens[0] );
+			}
+			if (!"HTTP/1.1".equalsIgnoreCase(firstLineTokens[2])) {
+				throw new InvalidHandshakeException( "Invalid status line received: " + firstLineTokens[2] );
+			}
 			ClientHandshakeBuilder clienthandshake = new HandshakeImpl1Client();
 			clienthandshake.setResourceDescriptor( firstLineTokens[ 1 ] );
 			handshake = clienthandshake;