diff options
author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-08-09 08:10:56 +0000 |
---|---|---|
committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-08-09 08:10:56 +0000 |
commit | 87cacf7e686022e6c42e40f25abefa6bf0ccf841 (patch) | |
tree | b1be1594e4ecf20a265948aa29d9d49ba37c1537 /lib | |
parent | f4a8004e315bb33017ba9d432fa78b3b605e70b0 (diff) |
merge revision(s) 56576,56623: [Backport #12678] [Backport #13429]
* lib/net/smtp.rb (tlsconnect): support timeout for TLS handshake.
[ruby-core:76893] [Bug #12678]
* lib/net/protocol.rb (ssl_socket_connect): new method to implement
timeout for TLS handshake.
* lib/net/http.rb (connect): use Net::Protocol#ssl_socket_connect.
* test/net/smtp/test_smtp.rb (test_tls_connect, test_tls_connect):
use Socket.tcp_server_sockets in case localhost is resolved to ::1.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@59533 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r-- | lib/net/http.rb | 16 | ||||
-rw-r--r-- | lib/net/protocol.rb | 18 | ||||
-rw-r--r-- | lib/net/smtp.rb | 4 |
3 files changed, 21 insertions, 17 deletions
diff --git a/lib/net/http.rb b/lib/net/http.rb index 84951c7697..25fa1d6888 100644 --- a/lib/net/http.rb +++ b/lib/net/http.rb @@ -925,21 +925,7 @@ module Net #:nodoc: Process.clock_gettime(Process::CLOCK_REALTIME) < @ssl_session.time.to_f + @ssl_session.timeout s.session = @ssl_session if @ssl_session end - if timeout = @open_timeout - while true - raise Net::OpenTimeout if timeout <= 0 - start = Process.clock_gettime Process::CLOCK_MONOTONIC - # to_io is required because SSLSocket doesn't have wait_readable yet - case s.connect_nonblock(exception: false) - when :wait_readable; s.to_io.wait_readable(timeout) - when :wait_writable; s.to_io.wait_writable(timeout) - else; break - end - timeout -= Process.clock_gettime(Process::CLOCK_MONOTONIC) - start - end - else - s.connect - end + ssl_socket_connect(s, @open_timeout) if @ssl_context.verify_mode != OpenSSL::SSL::VERIFY_NONE s.post_connection_check(@address) end diff --git a/lib/net/protocol.rb b/lib/net/protocol.rb index b53370931a..6b75b94cda 100644 --- a/lib/net/protocol.rb +++ b/lib/net/protocol.rb @@ -34,6 +34,24 @@ module Net # :nodoc: end End end + + def ssl_socket_connect(s, timeout) + if timeout + while true + raise Net::OpenTimeout if timeout <= 0 + start = Process.clock_gettime Process::CLOCK_MONOTONIC + # to_io is required because SSLSocket doesn't have wait_readable yet + case s.connect_nonblock(exception: false) + when :wait_readable; s.to_io.wait_readable(timeout) + when :wait_writable; s.to_io.wait_writable(timeout) + else; break + end + timeout -= Process.clock_gettime(Process::CLOCK_MONOTONIC) - start + end + else + s.connect + end + end end diff --git a/lib/net/smtp.rb b/lib/net/smtp.rb index 78f2181d2a..500916c17e 100644 --- a/lib/net/smtp.rb +++ b/lib/net/smtp.rb @@ -170,7 +170,7 @@ module Net # Net::SMTP.start('your.smtp.server', 25, 'mail.from.domain', # 'Your Account', 'Your Password', :cram_md5) # - class SMTP + class SMTP < Protocol Revision = %q$Revision$.split[1] @@ -584,7 +584,7 @@ module Net s = ssl_socket(s, @ssl_context) logging "TLS connection started" s.sync_close = true - s.connect + ssl_socket_connect(s, @open_timeout) if @ssl_context.verify_mode != OpenSSL::SSL::VERIFY_NONE s.post_connection_check(@address) end |