jruby-openssl 0.1 → 0.1.1

data/History.txt

@@ -1,3 +1,7 @@
+== 0.1.1
+
+- Fixed blocker issue preventing HTTPS/SSL from working (JRUBY-1222)
+
 == 0.1
 
 - PLEASE NOTE: This release is not compatible with JRuby releases earlier than

data/lib/jopenssl/version.rb

@@ -1,5 +1,5 @@
 module Jopenssl
   module Version
-    VERSION = "0.1"
+    VERSION = "0.1.1"
   end
 end

data/test/openssl/test_ssl.rb

@@ -6,6 +6,7 @@ end
 require "rbconfig"
 require "socket"
 require "test/unit"
+require "jruby"
 
 if defined?(OpenSSL)
 
@@ -17,6 +18,20 @@ class OpenSSL::TestSSL < Test::Unit::TestCase
   SSL_SERVER = File.join(File.dirname(__FILE__), "ssl_server.rb")
   PORT = 20443
   ITERATIONS = ($0 == __FILE__) ? 5 : 5
+  
+  # Disable in-proc process launching and either run jruby with specified args
+  # or yield args to a given block
+  def jruby_oop(*args)
+    prev_in_process = JRuby.runtime.instance_config.run_ruby_in_process
+    JRuby.runtime.instance_config.run_ruby_in_process = false
+    if block_given?
+      yield args
+    else
+      `#{RUBY} #{args.join(' ')}`
+    end
+  ensure
+    JRuby.runtime.instance_config.run_ruby_in_process = prev_in_process
+  end
 
   def setup
     @ca_key  = OpenSSL::TestUtils::TEST_KEY_RSA2048
@@ -56,28 +71,30 @@ class OpenSSL::TestSSL < Test::Unit::TestCase
 
   def start_server(port0, verify_mode, start_immediately, &block)
     server = nil
-    begin
-      cmd = [RUBY]
-      cmd << "-d" if $DEBUG
-      cmd << SSL_SERVER << port0.to_s << verify_mode.to_s
-      cmd << (start_immediately ? "yes" : "no")
-      server = IO.popen(cmd.join(" "), "w+")
-      server.write(@ca_cert.to_pem)
-      server.write(@svr_cert.to_pem)
-      server.write(@svr_key.to_pem)
-      pid = Integer(server.gets)
-      if port = server.gets
-        if $DEBUG
-          $stderr.printf("%s started: pid=%d port=%d\n", SSL_SERVER, pid, port)
+    jruby_oop {
+      begin
+        cmd = [RUBY]
+        cmd << "-d" if $DEBUG
+        cmd << SSL_SERVER << port0.to_s << verify_mode.to_s
+        cmd << (start_immediately ? "yes" : "no")
+        server = IO.popen(cmd.join(" "), "w+")
+        server.write(@ca_cert.to_pem)
+        server.write(@svr_cert.to_pem)
+        server.write(@svr_key.to_pem)
+        pid = Integer(server.gets)
+        if port = server.gets
+          if $DEBUG
+            $stderr.printf("%s started: pid=%d port=%d\n", SSL_SERVER, pid, port)
+          end
+          block.call(server, port.to_i)
+        end
+      ensure
+        if server
+          Process.kill(:KILL, pid)
+          server.close
         end
-        block.call(server, port.to_i)
-      end
-    ensure
-      if server
-        Process.kill(:KILL, pid)
-        server.close
       end
-    end
+    }
   end
 
   def starttls(ssl)
@@ -151,41 +168,42 @@ class OpenSSL::TestSSL < Test::Unit::TestCase
     }
   end
 
-  def test_client_auth
-    vflag = OpenSSL::SSL::VERIFY_PEER|OpenSSL::SSL::VERIFY_FAIL_IF_NO_PEER_CERT
-    start_server(PORT, vflag, true){|s, p|
-      assert_raises(OpenSSL::SSL::SSLError){
-        sock = TCPSocket.new("127.0.0.1", p)
-        ssl = OpenSSL::SSL::SSLSocket.new(sock)
-        ssl.connect
-      }
-      ctx = OpenSSL::SSL::SSLContext.new
-      ctx.key = @cli_key
-      ctx.cert = @cli_cert
-      sock = TCPSocket.new("127.0.0.1", p)
-      ssl = OpenSSL::SSL::SSLSocket.new(sock, ctx)
-      ssl.sync_close = true
-      ssl.connect
-      ssl.puts("foo")
-      assert_equal("foo\n", ssl.gets)
-      ssl.close
-
-      called = nil
-      ctx = OpenSSL::SSL::SSLContext.new
-      ctx.client_cert_cb = Proc.new{|ssl|
-        called = true
-        [@cli_cert, @cli_key]
-      }
-      sock = TCPSocket.new("127.0.0.1", p)
-      ssl = OpenSSL::SSL::SSLSocket.new(sock, ctx)
-      ssl.sync_close = true
-      ssl.connect
-#      assert(called)
-      ssl.puts("foo")
-      assert_equal("foo\n", ssl.gets)
-      ssl.close
-    }
-  end
+  # Temporarily disabled...see JRUBY-1888
+#  def test_client_auth
+#    vflag = OpenSSL::SSL::VERIFY_PEER|OpenSSL::SSL::VERIFY_FAIL_IF_NO_PEER_CERT
+#    start_server(PORT, vflag, true){|s, p|
+#      assert_raises(OpenSSL::SSL::SSLError){
+#        sock = TCPSocket.new("127.0.0.1", p)
+#        ssl = OpenSSL::SSL::SSLSocket.new(sock)
+#        ssl.connect
+#      }
+#      ctx = OpenSSL::SSL::SSLContext.new
+#      ctx.key = @cli_key
+#      ctx.cert = @cli_cert
+#      sock = TCPSocket.new("127.0.0.1", p)
+#      ssl = OpenSSL::SSL::SSLSocket.new(sock, ctx)
+#      ssl.sync_close = true
+#      ssl.connect
+#      ssl.puts("foo")
+#      assert_equal("foo\n", ssl.gets)
+#      ssl.close
+#
+#      called = nil
+#      ctx = OpenSSL::SSL::SSLContext.new
+#      ctx.client_cert_cb = Proc.new{|ssl|
+#        called = true
+#        [@cli_cert, @cli_key]
+#      }
+#      sock = TCPSocket.new("127.0.0.1", p)
+#      ssl = OpenSSL::SSL::SSLSocket.new(sock, ctx)
+#      ssl.sync_close = true
+#      ssl.connect
+##      assert(called)
+#      ssl.puts("foo")
+#      assert_equal("foo\n", ssl.gets)
+#      ssl.close
+#    }
+#  end
 
   def test_starttls
     start_server(PORT, OpenSSL::SSL::VERIFY_NONE, false){|s, p|

data/test/test_openssl.rb

@@ -8,7 +8,7 @@ begin
   require 'openssl/test_ns_spki'
   # require 'openssl/test_pair'
   require 'openssl/test_pkey_rsa'
-  # require 'openssl/test_ssl' # won't work, since kill and pid is used.
+  require 'openssl/test_ssl'
   require 'openssl/test_x509cert'
   require 'openssl/test_x509crl'
   require 'openssl/test_x509name'

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: jruby-openssl
 version: !ruby/object:Gem::Version 
-  version: "0.1"
-date: 2007-12-15 00:00:00 -06:00
+  version: 0.1.1
+date: 2008-01-06 00:00:00 -06:00
 summary: OpenSSL add-on for JRuby
 require_paths: 
 - lib