jruby · Dec 21, 2015 · Dec 21, 2015
Showing with 48 additions and 7 deletions.

+5 −7 src/main/java/org/jruby/ext/openssl/SSLSocket.java

+14 −0 src/test/ruby/ssl/test_helper.rb

+29 −0 src/test/ruby/ssl/test_socket.rb
diff --git a/src/main/java/org/jruby/ext/openssl/SSLSocket.java b/src/main/java/org/jruby/ext/openssl/SSLSocket.java
@@ -795,6 +795,7 @@ public IRubyObject sysread_nonblock(ThreadContext context, IRubyObject len) {
     @JRubyMethod
     public IRubyObject sysread_nonblock(ThreadContext context, IRubyObject len, IRubyObject arg) {
         if ( arg instanceof RubyHash ) { // exception: false
+            // NOTE: on Ruby 2.3 this is expected to raise a TypeError (but not on 2.2)
             return sysreadImpl(context, len, null, false, getExceptionOpt(context, arg));
         }
         return sysreadImpl(context, len, arg, false, true); // buffer arg
@@ -883,12 +884,11 @@ private void forceClose() {
         close(true);
     }
 
-    //private boolean closed;
-
     private void close(boolean force)  {
-        //closed = true;
-
-        if ( engine == null ) throw getRuntime().newEOFError();
+        if ( engine == null ) {
+            // if ( force ) throw getRuntime().newEOFError();
+            return;
+        }
 
         engine.closeOutbound();
 
@@ -903,8 +903,6 @@ private void close(boolean force)  {
         }
     }
 
-    //final boolean isClosed() { return closed; }
-
     @JRubyMethod
     public IRubyObject sysclose(final ThreadContext context) {
         //if ( isClosed() ) return context.runtime.getNil();

diff --git a/src/test/ruby/ssl/test_helper.rb b/src/test/ruby/ssl/test_helper.rb
@@ -127,6 +127,20 @@ def server_loop(context, server, server_proc)
   rescue Errno::EBADF, IOError, Errno::EINVAL, Errno::ECONNABORTED, Errno::ENOTSOCK, Errno::ECONNRESET
   end
 
+  def server_connect(port, ctx = nil)
+    sock = TCPSocket.new('127.0.0.1', port)
+    ssl = ctx ? OpenSSL::SSL::SSLSocket.new(sock, ctx) : OpenSSL::SSL::SSLSocket.new(sock)
+    ssl.sync_close = true
+    ssl.connect
+    yield ssl if block_given?
+  ensure
+    if ssl
+      ssl.close
+    elsif sock
+      sock.close
+    end
+  end
+
   def starttls(ssl)
     ssl.puts("STARTTLS")
     #sleep 1 # When this line is eliminated, process on Cygwin blocks

diff --git a/src/test/ruby/ssl/test_socket.rb b/src/test/ruby/ssl/test_socket.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 require File.expand_path('test_helper', File.dirname(__FILE__))
 
 class TestSSLSocket < TestCase
@@ -42,4 +43,32 @@ def test_attr_methods
     socket.inspect
   end
 
+  def test_sync_close_without_connect
+    require 'socket'
+    Socket.open(:INET, :STREAM) do |socket|
+      assert ! socket.closed?
+      ssl = OpenSSL::SSL::SSLSocket.new(socket)
+      ssl.sync_close = true
+      assert ! ssl.closed?
+      ssl.close
+      assert socket.closed?
+    end
+  end
+
+  include SSLTestHelper
+
+  def test_ssl_sysread_blocking_error
+    start_server(PORT, OpenSSL::SSL::VERIFY_NONE, true) do |server, port|
+      server_connect(port) do |ssl|
+        ssl.write("abc\n")
+        # assert_raise(TypeError) { ssl.sysread(4, exception: false) }
+        buf = ''
+        assert_raise(ArgumentError) { ssl.sysread(4, buf, exception: false) }
+        assert_equal '', buf
+        assert_equal buf.object_id, ssl.sysread(4, buf).object_id
+        assert_equal "abc\n", buf
+      end
+    end
+  end if RUBY_VERSION > '2.0'
+
 end