diff options
author | shugo <shugo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-11-05 06:47:36 +0000 |
---|---|---|
committer | shugo <shugo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-11-05 06:47:36 +0000 |
commit | 73b3b10d8db30d3c6b7c53ae0da64c39b55d899f (patch) | |
tree | 7a0709fd17b8430fece4f45becf9b89b5563d3a5 /lib/net | |
parent | 19c749f61c83d1c360ed8ca8d5a80e62951ee4b9 (diff) | |
download | ruby-73b3b10d8db30d3c6b7c53ae0da64c39b55d899f.tar.gz |
* 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.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@56576 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/net')
-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 4738bc621a..25d7dae873 100644 --- a/lib/net/http.rb +++ b/lib/net/http.rb @@ -930,21 +930,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 50cd742495..ac8ddc5bf2 100644 --- a/lib/net/smtp.rb +++ b/lib/net/smtp.rb @@ -167,7 +167,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] @@ -581,7 +581,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 |