Fix Issue-1053

dota17 · dota17 · commit 96e511a43b16 · 2020-08-01T11:20:10.000+08:00
diff --git a/src/main/java/org/java_websocket/drafts/Draft_6455.java b/src/main/java/org/java_websocket/drafts/Draft_6455.java
@@ -383,7 +383,7 @@ public HandshakeBuilder postProcessHandshakeResponseAsServer( ClientHandshake re
 		response.put( UPGRADE, "websocket" );
 		response.put( CONNECTION, request.getFieldValue( CONNECTION) ); // to respond to a Connection keep alives
 		String seckey = request.getFieldValue(SEC_WEB_SOCKET_KEY);
-		if( seckey == null )
+		if( seckey == null || "".equals(seckey) )
 			throw new InvalidHandshakeException( "missing Sec-WebSocket-Key" );
 		response.put( SEC_WEB_SOCKET_ACCEPT, generateFinalKey( seckey ) );
 		if( getExtension().getProvidedExtensionAsServer().length() != 0 ) {
diff --git a/src/test/java/org/java_websocket/drafts/Draft_6455Test.java b/src/test/java/org/java_websocket/drafts/Draft_6455Test.java
@@ -27,6 +27,7 @@
 
 import org.java_websocket.enums.CloseHandshakeType;
 import org.java_websocket.enums.HandshakeState;
+import org.java_websocket.exceptions.InvalidHandshakeException;
 import org.java_websocket.extensions.DefaultExtension;
 import org.java_websocket.extensions.IExtension;
 import org.java_websocket.framing.BinaryFrame;
@@ -459,6 +460,19 @@ public void postProcessHandshakeResponseAsServer() throws Exception {
 		draft_6455.postProcessHandshakeResponseAsServer(request, response);
 		assertEquals( "test", response.getFieldValue( "Sec-WebSocket-Protocol" ) );
 		assertTrue( !response.hasFieldValue( "Sec-WebSocket-Extensions" ) );
+
+		// issue #1053 : check the exception - missing Sec-WebSocket-Key
+		response = new HandshakeImpl1Server();
+		request = new HandshakeImpl1Client();
+		draft_6455.reset();
+		request.put( "Connection", "upgrade" );
+
+		try {
+			draft_6455.postProcessHandshakeResponseAsServer(request, response);
+			fail( "InvalidHandshakeException should be thrown" );
+		} catch ( InvalidHandshakeException e ) {
+
+		}
 	}
 
 
@@ -517,4 +531,4 @@ public boolean equals( Object o ) {
 			return getClass() == o.getClass();
 		}
 	}
-}
+}
