ssl: raise IOError when reading from or writing to closed SSLSocket - #1106
Open
rhenium wants to merge 3 commits into
Open
ssl: raise IOError when reading from or writing to closed SSLSocket#1106rhenium wants to merge 3 commits into
rhenium wants to merge 3 commits into
Conversation
Let the extension only provide the most basic non-blocking form,
SSLSocket#ssl_connect, #ssl_accept, #ssl_read, #ssl_write.
Implement SSLSocket#connect, #accept, #sysread, and #syswrite in
lib/openssl/ssl.rb on top of these primitives and #wait_{read,writ}able.
Also, handle the keyword arguments for the public #*_nonblock methods
in Ruby to simplify and to avoid the Hash allocation.
This prepares for the upcoming changes to SSLSocket to add proper
timeout support and socket closed state tracking. These would be easier
to do in Ruby.
No user-visible behavior change is intended with this patch.
Core IO and socket classes raise IOError when a read or write is attempted on a closed stream. Make SSLSocket follow this behavior and use consistent error messages. Currently, reading from or writing to to a closed SSLSocket may raise OpenSSL::SSL::SSLError, a SystemCallError, or IOError, depending on the internal state of the OpenSSL library and the underlying socket. This changes SSLSocket#closed? to report the internally tracked state of the SSLSocket rather than the underlying socket. As a result, it may return false if the underlying socket is unexpectedly closed directly with IO#close.
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Core
IOand socket classes raiseIOErrorwhen a read or write is attempted on a closed stream. MakeSSLSocketfollow this behavior and use consistent error messages.Currently, reading from or writing to to a closed
SSLSocketmay raiseOpenSSL::SSL::SSLError, aSystemCallError, orIOError, depending on the internal state of the OpenSSL library and the underlying socket.This changes
SSLSocket#closed?to report the internally tracked state of theSSLSocketrather than the underlying socket. As a result, it may returnfalseif the underlying socket is unexpectedly closed directly withIO#close.Applies on top of #1105
Resolves #798