Skip to content

Debug log for handshake reject #741

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 25, 2018
Merged

Debug log for handshake reject #741

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 23 additions & 4 deletions src/main/java/org/java_websocket/drafts/Draft_6455.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
Expand All @@ -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;
}
}
Expand All @@ -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;
}

Expand Down Expand Up @@ -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);
}
}
}