Merge pull request #741 from marci4/logDraft

Debug log for handshake reject

Author: marci4

src/main/java/org/java_websocket/drafts/Draft_6455.java

@@ -149,14 +149,17 @@ public Draft_6455( List<IExtension> inputExtensions , List<IProtocol> inputProto
 	@Override
 	public HandshakeState acceptHandshakeAsServer( ClientHandshake handshakedata ) throws InvalidHandshakeException {
 		int v = readVersion( handshakedata );
-		if( v != 13 )
+		if( v != 13 ) {
+			logDebug("acceptHandshakeAsServer - Wrong websocket version.");
 			return HandshakeState.NOT_MATCHED;
-		HandshakeState extensionState= HandshakeState.NOT_MATCHED;
+		}
+		HandshakeState extensionState = HandshakeState.NOT_MATCHED;
 		String requestedExtension = handshakedata.getFieldValue( "Sec-WebSocket-Extensions" );
 		for( IExtension knownExtension : knownExtensions ) {
 			if( knownExtension.acceptProvidedExtensionAsServer( requestedExtension ) ) {
 				extension = knownExtension;
 				extensionState = HandshakeState.MATCHED;
+				logDebug("acceptHandshakeAsServer - Matching extension found: " + extension.toString());
 				break;
 			}
 		}
@@ -166,36 +169,44 @@ public HandshakeState acceptHandshakeAsServer( ClientHandshake handshakedata ) t
 			if( knownProtocol.acceptProvidedProtocol( requestedProtocol ) ) {
 				protocol = knownProtocol;
 				protocolState = HandshakeState.MATCHED;
+				logDebug("acceptHandshakeAsServer - Matching protocol found: " + protocol.toString());
 				break;
 			}
 		}
 		if (protocolState == HandshakeState.MATCHED && extensionState == HandshakeState.MATCHED) {
 			return HandshakeState.MATCHED;
 		}
+		logDebug("acceptHandshakeAsServer - No matching extension or protocol found.");
 		return HandshakeState.NOT_MATCHED;
 	}
 
 	@Override
 	public HandshakeState acceptHandshakeAsClient( ClientHandshake request, ServerHandshake response ) throws InvalidHandshakeException {
 		if (! basicAccept( response )) {
+			logDebug("acceptHandshakeAsClient - Missing/wrong upgrade or connection in handshake.");
 			return HandshakeState.NOT_MATCHED;
 		}
-		if( !request.hasFieldValue( "Sec-WebSocket-Key" ) || !response.hasFieldValue( "Sec-WebSocket-Accept" ) )
+		if( !request.hasFieldValue( "Sec-WebSocket-Key" ) || !response.hasFieldValue( "Sec-WebSocket-Accept" ) ) {
+			logDebug("acceptHandshakeAsClient - Missing Sec-WebSocket-Key or Sec-WebSocket-Accept");
 			return HandshakeState.NOT_MATCHED;
+		}
 
 		String seckey_answere = response.getFieldValue( "Sec-WebSocket-Accept" );
 		String seckey_challenge = request.getFieldValue( "Sec-WebSocket-Key" );
 		seckey_challenge = generateFinalKey( seckey_challenge );
 
-		if( !seckey_challenge.equals( seckey_answere ) )
+		if( !seckey_challenge.equals( seckey_answere ) ) {
+			logDebug("acceptHandshakeAsClient - Wrong key for Sec-WebSocket-Key.");
 			return HandshakeState.NOT_MATCHED;
+		}
 
 		HandshakeState extensionState= HandshakeState.NOT_MATCHED;
 		String requestedExtension = response.getFieldValue( "Sec-WebSocket-Extensions" );
 		for( IExtension knownExtension : knownExtensions ) {
 			if( knownExtension.acceptProvidedExtensionAsClient( requestedExtension ) ) {
 				extension = knownExtension;
 				extensionState = HandshakeState.MATCHED;
+				logDebug("acceptHandshakeAsClient - Matching extension found: " + extension.toString());
 				break;
 			}
 		}
@@ -205,12 +216,14 @@ public HandshakeState acceptHandshakeAsClient( ClientHandshake request, ServerHa
 			if( knownProtocol.acceptProvidedProtocol( requestedProtocol ) ) {
 				protocol = knownProtocol;
 				protocolState = HandshakeState.MATCHED;
+				logDebug("acceptHandshakeAsClient - Matching protocol found: " + protocol.toString());
 				break;
 			}
 		}
 		if (protocolState == HandshakeState.MATCHED && extensionState == HandshakeState.MATCHED) {
 			return HandshakeState.MATCHED;
 		}
+		logDebug("acceptHandshakeAsClient - No matching extension or protocol found.");
 		return HandshakeState.NOT_MATCHED;
 	}
 
@@ -761,4 +774,10 @@ private ByteBuffer getPayloadFromByteBufferList() throws LimitExedeedException {
 		resultingByteBuffer.flip();
 		return resultingByteBuffer;
 	}
+
+	private static void logDebug(Object object) {
+		if (WebSocketImpl.DEBUG) {
+			System.out.println(object);
+		}
+	}
 }