ssl: refactor errno access #980
Merged
+36
−29
Conversation
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
rhenium
force-pushed
the
ky/ssl-errors-peeraddr-errno
branch
2 times, most recently
from
1f128c3 to
74d6b09
Compare
The errno reported in an OpenSSL::SSL::SSLError raised by
SSLSocket#accept and #connect sometimes does not match what SSL_accept()
or SSL_connect() actually encountered. Depending on the evaluation order
of arguments passed to ossl_raise(), errno may be overwritten by
peeraddr_ip_str().
While we could just fix peeraddr_ip_str(), we should avoid passing
around errno since it is error-prone. Replace rb_sys_fail() and
rb_io_{maybe_,}wait_{read,writ}able() with equivalents that do not read
errno.
Remove an unnecessary instance variable lookup and constant lookup. Ruby's public headers provide rb_eSystemCallError.
rhenium
force-pushed
the
ky/ssl-errors-peeraddr-errno
branch
from
74d6b09 to
46c9223
Compare
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.
The
errnoreported inOpenSSL::SSL::SSLErrormessage sometimes does not match whatSSL_accept()/SSL_connect()actually encountered. Depending on the evaluation order of function arguments toossl_raise(), it can be overwritten bypeeraddr_ip_str().Save
errnointo a local variable immediately after the OpenSSL function returns, and avoid touching the thread-localerrnoafterward.Also, expand
rb_sys_fail()andrb_io_maybe_wait_{readable,writable}()so that they do not rely on errno.