From 894c04783b2e7926b90f27f41e3032a65132b274 Mon Sep 17 00:00:00 2001 From: hsbt Date: Sun, 25 May 2014 00:07:19 +0000 Subject: [PATCH] * test/openssl/test_partial_record_read.rb: Testing read_nonblock on a partial TLS record results in IO::WaitReadable by @mohamedhafez. [fix GH-547] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46087 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ test/openssl/test_partial_record_read.rb | 27 ++++++++++++++++++++++++ 2 files changed, 33 insertions(+) create mode 100644 test/openssl/test_partial_record_read.rb diff --git a/ChangeLog b/ChangeLog index 8046d7b6ff..05137bf6ea 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Sun May 25 08:54:38 2014 SHIBATA Hiroshi + + * test/openssl/test_partial_record_read.rb: Testing read_nonblock on + a partial TLS record results in IO::WaitReadable by @mohamedhafez. + [fix GH-547] + Sun May 25 08:43:16 2014 SHIBATA Hiroshi * lib/logger.rb: refactored to include Logger::Period. diff --git a/test/openssl/test_partial_record_read.rb b/test/openssl/test_partial_record_read.rb new file mode 100644 index 0000000000..ce42131cd7 --- /dev/null +++ b/test/openssl/test_partial_record_read.rb @@ -0,0 +1,27 @@ +require_relative "utils" + +if defined?(OpenSSL) + + class OpenSSL::TestPartialRecordRead < OpenSSL::SSLTestCase + def test_partial_tls_record_read_nonblock + port = 12345 + + start_server(port, OpenSSL::SSL::VERIFY_NONE, true, :server_proc => + Proc.new do |server_ctx, server_ssl| + server_ssl.io.write("\x01") # the beginning of a TLS record + sleep 6 # do not finish prematurely before the read by the client is attempted + end + ) do |server, port| + sock = TCPSocket.new("127.0.0.1", port) + ssl = OpenSSL::SSL::SSLSocket.new(sock) + ssl.connect + sleep 3 # wait is required for the (incomplete) TLS record to arrive at the client socket + + # Should raise a IO::WaitReadable since a full TLS record is not available for reading. + assert_raise(IO::WaitReadable) { ssl.read_nonblock(1) } + end + end + + end + +end