Skip to content

Fix issue with finishing handshake in ssl driver #30580

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 2 commits into from
May 15, 2018
Merged

Fix issue with finishing handshake in ssl driver #30580

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3201187
Fix issue with finishing handshake in ssl driver
Tim-Brooks May 14, 2018
64fe782
Use do-while
Tim-Brooks May 14, 2018
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
11 changes: 9 additions & 2 deletions ...ugin/security/src/main/java/org/elasticsearch/xpack/security/transport/nio/SSLDriver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,13 @@ public ByteBuffer getNetworkReadBuffer() {
}

public void read(InboundChannelBuffer buffer) throws SSLException {
currentMode.read(buffer);
Mode modePriorToRead;
do {
modePriorToRead = currentMode;
currentMode.read(buffer);
// If we switched modes we want to read again as there might be unhandled bytes that need to be
// handled by the new mode.
} while (modePriorToRead != currentMode);
}

public boolean readyForApplicationWrites() {
Expand Down Expand Up @@ -365,8 +371,9 @@ public void read(InboundChannelBuffer buffer) throws SSLException {
try {
SSLEngineResult result = unwrap(buffer);
handshakeStatus = result.getHandshakeStatus();
continueUnwrap = result.bytesConsumed() > 0;
handshake();
// If we are done handshaking we should exit the handshake read
continueUnwrap = result.bytesConsumed() > 0 && currentMode.isHandshake();
} catch (SSLException e) {
closingInternal();
throw e;
Expand Down