Rework Ssl*Stream creation. #1109
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
PR google#1106 introduced a subtle bug by changing Ssl*Stream creation to use the public get*Stream() methods. The contract for those methods is to throw if the socket has been closed, which mean two threads could race such that startHandshake() called getInputStream() after the socket has been closed by another (e.g. timeout) thread. The upshot was that getInputStream() would throw, causing close() to be called before an output stream is created, causing an NPE when trying to send a TLS close message. This change moves the actual creation into a method which doesn't chack the socket state and so is suitable for calling from startHandshake(). Also added some additional tests around shutdownInput() and shutdownOutput() as it became apparent these were missing.
Yqwed
approved these changes
Jan 27, 2023
common/src/test/java/org/conscrypt/javax/net/ssl/SSLSocketVersionCompatibilityTest.java
Show resolved
Hide resolved
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
PR #1106 introduced a subtle bug by changing SslStream creation to use the public getStream() methods.
The contract for those methods is to throw if the socket has been closed, which mean two threads could race such that startHandshake() called getInputStream() after the socket has been closed by another (e.g. timeout) thread. The upshot was that getInputStream() would throw, causing close() to be called before an output stream is created, causing an NPE when trying to send a TLS close message.
This change moves the actual creation into a method which doesn't chack the socket state and so is suitable for calling from startHandshake().
Also added some additional tests around shutdownInput() and shutdownOutput() as it became apparent these were missing.