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 /test | |
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 'test')
-rw-r--r-- | test/net/smtp/test_smtp.rb | 71 | ||||
-rw-r--r-- | test/net/smtp/test_ssl_socket.rb | 5 |
2 files changed, 76 insertions, 0 deletions
diff --git a/test/net/smtp/test_smtp.rb b/test/net/smtp/test_smtp.rb index 3bcceb6fc5..da85331805 100644 --- a/test/net/smtp/test_smtp.rb +++ b/test/net/smtp/test_smtp.rb @@ -5,6 +5,10 @@ require 'test/unit' module Net class TestSMTP < Test::Unit::TestCase + CA_FILE = File.expand_path("../imap/cacert.pem", __dir__) + SERVER_KEY = File.expand_path("../imap/server.key", __dir__) + SERVER_CERT = File.expand_path("../imap/server.crt", __dir__) + class FakeSocket attr_reader :write_io @@ -98,5 +102,72 @@ module Net smtp.rcptto("foo\r\nbar") end end + + def test_tls_connect + servers = Socket.tcp_server_sockets("localhost", 0) + ctx = OpenSSL::SSL::SSLContext.new + ctx.ca_file = CA_FILE + ctx.key = File.open(SERVER_KEY) { |f| + OpenSSL::PKey::RSA.new(f) + } + ctx.cert = File.open(SERVER_CERT) { |f| + OpenSSL::X509::Certificate.new(f) + } + begin + sock = nil + Thread.start do + s = accept(servers) + sock = OpenSSL::SSL::SSLSocket.new(s, ctx) + sock.sync_close = true + sock.accept + sock.write("220 localhost Service ready\r\n") + sock.gets + sock.write("250 localhost\r\n") + sock.gets + sock.write("221 localhost Service closing transmission channel\r\n") + end + smtp = Net::SMTP.new("localhost", servers[0].local_address.ip_port) + smtp.enable_tls + smtp.open_timeout = 0.1 + smtp.start do + end + ensure + sock.close if sock + servers.each(&:close) + end + end + + def test_tls_connect_timeout + servers = Socket.tcp_server_sockets("localhost", 0) + begin + sock = nil + Thread.start do + sock = accept(servers) + end + smtp = Net::SMTP.new("localhost", servers[0].local_address.ip_port) + smtp.enable_tls + smtp.open_timeout = 0.1 + assert_raise(Net::OpenTimeout) do + smtp.start do + end + end + ensure + sock.close if sock + servers.each(&:close) + end + end + + private + + def accept(servers) + loop do + readable, = IO.select(servers.map(&:to_io)) + readable.each do |r| + sock, addr = r.accept_nonblock(exception: false) + next if sock == :wait_readable + return sock + end + end + end end end diff --git a/test/net/smtp/test_ssl_socket.rb b/test/net/smtp/test_ssl_socket.rb index 20792190c8..354f413040 100644 --- a/test/net/smtp/test_ssl_socket.rb +++ b/test/net/smtp/test_ssl_socket.rb @@ -7,6 +7,11 @@ module Net class MySMTP < SMTP attr_accessor :fake_tcp, :fake_ssl + def initialize(*args) + super(*args) + @open_timeout = nil + end + def tcp_socket address, port fake_tcp end |