valitydev/thrift
14
0
Fork 0
mirror of https://github.com/valitydev/thrift.git synced 2024-11-07 10:48:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

THRIFT-4506: fix use of assert for correctness in Java SASL negotiation

Browse Source 
Client: java
This commit is contained in:
James E. King III 2018-03-05 11:34:21 -05:00
parent 9e0c927214
commit d973409661
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/java/src/org/apache/thrift/transport/TSaslTransport.java
View File

@ -287,7 +287,7 @@ abstract class TSaslTransport extends TTransport {
if (message.status == NegotiationStatus.COMPLETE && if (message.status == NegotiationStatus.COMPLETE &&
getRole() == SaslRole.CLIENT) { getRole() == SaslRole.CLIENT) {
LOGGER.debug("{}: All done!", getRole()); LOGGER.debug("{}: All done!", getRole());
break; continue;
} }
sendSaslMessage(sasl.isComplete() ? NegotiationStatus.COMPLETE : NegotiationStatus.OK, sendSaslMessage(sasl.isComplete() ? NegotiationStatus.COMPLETE : NegotiationStatus.OK,
@ -295,8 +295,6 @@ abstract class TSaslTransport extends TTransport {
} }
LOGGER.debug("{}: Main negotiation loop complete", getRole()); LOGGER.debug("{}: Main negotiation loop complete", getRole());
assert sasl.isComplete();
// If we're the client, and we're complete, but the server isn't // If we're the client, and we're complete, but the server isn't
// complete yet, we need to wait for its response. This will occur // complete yet, we need to wait for its response. This will occur
// with ANONYMOUS auth, for example, where we send an initial response // with ANONYMOUS auth, for example, where we send an initial response