sonixlabs-eventmachine-java 1.0.0.rc.7-java → 1.0.3.1-java

data/lib/jeventmachine.rb

@@ -30,6 +30,7 @@
 require 'java'
 require 'rubyeventmachine'
 require 'socket'
+require 'openssl'
 
 java_import java.io.FileDescriptor
 java_import java.nio.channels.SocketChannel
@@ -77,6 +78,8 @@ module EventMachine
   ConnectionNotifyWritable = 107
   # @private
   SslHandshakeCompleted = 108
+  # @private
+  SslVerify = 109
 
   # Exceptions that are defined in rubymain.cpp
   class ConnectionError < RuntimeError; end
@@ -84,23 +87,23 @@ module EventMachine
   class UnknownTimerFired < RuntimeError; end
   class Unsupported < RuntimeError; end
 
-  # This thunk class used to be called EM, but that caused conflicts with
-  # the alias "EM" for module EventMachine. (FC, 20Jun08)
-  class JEM < com.rubyeventmachine.EmReactor
-    def eventCallback a1, a2, a3, a4
-      s = String.from_java_bytes(a3.array[a3.position...a3.limit]) if a3
-      EventMachine::event_callback a1, a2, s || a4
+  def self.initialize_event_machine
+    @em = com.rubyeventmachine.EmReactor.new do |sig, event, buf, data|
+      s = String.from_java_bytes(buf.array[buf.position...buf.limit]) if buf
+      begin
+        EventMachine::event_callback sig, event.int_value, s || data
+      rescue java.lang.Exception => t
+        if instance_variable_defined? :@error_handler
+          @error_handler.call t
+        end
+      rescue StandardError => e
+        if instance_variable_defined? :@error_handler
+          @error_handler.call e
+        end
+      end
       nil
     end
   end
-  # class Connection < com.rubyeventmachine.Connection
-  #   def associate_callback_target sig
-  #     # No-op for the time being.
-  #   end
-  # end
-  def self.initialize_event_machine
-    @em = JEM.new
-  end
   def self.release_machine
     @em = nil
   end
@@ -149,7 +152,15 @@ module EventMachine
     @em.startTls sig
   end
   def self.ssl?
-    false
+    true
+  end
+  def self.ssl_verify_peer conn, der_data
+    data = OpenSSL::X509::Certificate.new(der_data).to_pem
+    @em.acceptSslPeer conn.signature if conn.ssl_verify_peer data
+  end
+  def self.get_peer_cert sig
+    der_data = @em.getPeerCert sig
+    OpenSSL::X509::Certificate.new(String.from_java_bytes(der_data)).to_pem
   end
   def self.signal_loopbreak
     @em.signalLoopbreak
@@ -268,9 +279,9 @@ module EventMachine
     @em.getConnectionCount
   end
 
-  def self.set_tls_parms(sig, params)
-  end
-  def self.start_tls(sig)
+  def self.set_tls_parms(sig, privkeyfile, certchainfile, verify_peer)
+    keystore = KeyStoreBuilder.create privkeyfile, certchainfile unless (privkeyfile.empty? or certchainfile.empty?) 
+    @em.setTlsParms(sig, keystore, (!!verify_peer))
   end
   def self.send_file_data(sig, filename)
   end
@@ -282,3 +293,39 @@ module EventMachine
   end
 end
 
+module KeyStoreBuilder
+  require 'bouncy-castle-java'
+  java_import java.io.FileReader
+  java_import java.io.FileInputStream
+  java_import java.security.cert.Certificate
+  java_import java.security.cert.CertificateFactory
+  java_import java.security.KeyStore
+  java_import java.security.Security
+  java_import org.bouncycastle.openssl.PEMReader
+  java_import org.bouncycastle.jce.provider.BouncyCastleProvider
+  @name = 'em_java_tls_key' # TODO - find a correct value, or whether it even really matters.
+  @initialized = false
+
+  def self.init
+    unless @initialized
+      Security.add_provider BouncyCastleProvider.new
+      @initialized = true
+    end
+  end
+
+  def self.create(privkeyfile, certchainfile)
+    self.init
+    
+    key_reader = FileReader.new privkeyfile
+    key_pair = PEMReader.new(key_reader).read_object
+
+    cert_stream = FileInputStream.new certchainfile
+    certs = CertificateFactory.get_instance('X.509', 'BC').generate_certificates cert_stream
+
+    store = KeyStore.get_instance 'PKCS12', 'BC'
+    store.load nil, nil
+    store.set_key_entry @name, key_pair.get_private, nil, certs.to_array(Certificate[certs.size].new)
+
+    store
+  end
+end

data/rakelib/package.rake

@@ -1,3 +1,4 @@
+require 'rubygems'
 require 'rubygems/package_task'
 
 begin
@@ -25,24 +26,32 @@ else
     unless RUBY_PLATFORM =~ /mswin|mingw/
       ext.cross_compile = true
       ext.cross_platform = ['x86-mingw32', 'x86-mswin32-60']
-
-      # inject 1.8/1.9 pure-ruby entry point
-      ext.cross_compiling do |spec|
-        spec.files += ["lib/#{ext.name}.rb"]
+    end
+  end
+  def hack_cross_compilation(ext)
+    # inject 1.8/1.9 pure-ruby entry point
+    # HACK: add these dependencies to the task instead of using cross_compiling
+    ext.cross_platform.each do |platform|
+      task = "native:#{GEMSPEC.name}:#{platform}"
+      if Rake::Task.task_defined?(task)
+        Rake::Task[task].prerequisites.unshift "lib/#{ext.name}.rb"
       end
     end
   end
 
-  Rake::ExtensionTask.new("rubyeventmachine", GEMSPEC) do |ext|
+  em = Rake::ExtensionTask.new("rubyeventmachine", GEMSPEC) do |ext|
     ext.ext_dir = 'ext'
     ext.source_pattern = '*.{h,c,cpp}'
     setup_cross_compilation(ext)
   end
-  Rake::ExtensionTask.new("fastfilereaderext", GEMSPEC) do |ext|
+  hack_cross_compilation em
+
+  ff = Rake::ExtensionTask.new("fastfilereaderext", GEMSPEC) do |ext|
     ext.ext_dir = 'ext/fastfilereader'
     ext.source_pattern = '*.{h,c,cpp}'
     setup_cross_compilation(ext)
   end
+  hack_cross_compilation ff
 end
 
 # Setup shim files that require 1.8 vs 1.9 extensions in win32 bin gems
@@ -85,15 +94,3 @@ def gem_cmd(action, name, *args)
 end
 
 Rake::Task[:clean].enhance [:clobber_package]
-
-namespace :gem do
-  desc 'Install gem (and sudo if required)'
-  task :install => :package do
-    gem_cmd(:install, "pkg/#{GEMSPEC.name}-#{GEMSPEC.version}.gem")
-  end
-
-  desc 'Uninstall gem (and sudo if required)'
-  task :uninstall do
-    gem_cmd(:uninstall, "#{GEMSPEC.name}", "-v=#{GEMSPEC.version}")
-  end
-end

data/tests/server.crt

@@ -0,0 +1,36 @@
+-----BEGIN CERTIFICATE-----
+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
+-----END CERTIFICATE-----

data/tests/server.key

@@ -0,0 +1,51 @@
+-----BEGIN RSA PRIVATE KEY-----
+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
+-----END RSA PRIVATE KEY-----

data/tests/test_attach.rb

@@ -4,6 +4,7 @@ require 'socket'
 class TestAttach < Test::Unit::TestCase
   class EchoServer < EM::Connection
     def receive_data data
+      $received_data << data
       send_data data
     end
   end
@@ -31,12 +32,14 @@ class TestAttach < Test::Unit::TestCase
   def setup
     @port = next_port
     $read, $r, $w, $fd = nil
+    $received_data = ""
   end
 
   def teardown
     [$r, $w].each do |io|
       io.close rescue nil
     end
+    $received_data = nil
   end
 
   def test_attach
@@ -63,6 +66,27 @@ class TestAttach < Test::Unit::TestCase
     end
   end
 
+  def test_attach_server
+    $before = TCPServer.new("127.0.0.1", @port)
+    sig     = nil
+    EM.run {
+      sig = EM.attach_server $before, EchoServer
+
+      handler = Class.new(EM::Connection) do
+        def initialize
+          send_data "hello world"
+          close_connection_after_writing
+          EM.add_timer(0.1) { EM.stop }
+        end
+      end
+      EM.connect("127.0.0.1", @port, handler)
+    }
+
+    assert_equal false, $before.closed?
+    assert_equal "hello world", $received_data
+    assert sig.is_a?(Integer)
+  end
+
   def test_attach_pipe
     EM.run{
       $r, $w = IO.pipe

data/tests/test_connection_count.rb

@@ -30,4 +30,24 @@ class TestConnectionCount < Test::Unit::TestCase
     assert_equal(1, $server_conns)
     assert_equal(4, $client_conns + $server_conns)
   end
-end
+
+  module DoubleCloseClient
+    def unbind
+      close_connection
+      $num_close_scheduled_1 = EM.num_close_scheduled
+      EM.next_tick do
+        $num_close_scheduled_2 = EM.num_close_scheduled
+        EM.stop
+      end
+    end
+  end
+
+  def test_num_close_scheduled
+    EM.run {
+      assert_equal(0, EM.num_close_scheduled)
+      EM.connect("127.0.0.1", 9999, DoubleCloseClient) # nothing listening on 9999
+    }
+    assert_equal(1, $num_close_scheduled_1)
+    assert_equal(0, $num_close_scheduled_2)
+  end
+end

data/tests/test_epoll.rb

@@ -126,5 +126,20 @@ class TestEpoll < Test::Unit::TestCase
     File.unlink(fn) if File.exist?(fn)
   end
 
+  def test_attach_detach
+    EM.epoll
+    EM.run {
+      EM.add_timer(0.01) { EM.stop }
+
+      r, w = IO.pipe
+
+      # This tests a regression where detach in the same tick as attach crashes EM
+      EM.watch(r) do |connection|
+        connection.detach
+      end
+    }
+
+    assert true
+  end
 end
 

data/tests/test_httpclient2.rb

@@ -113,11 +113,16 @@ class TestHttpClient2 < Test::Unit::TestCase
     }
   end
 
+  # This test fails under JRuby - but not if you use google.com instead of apple.com
+  # Since this client is deprecated, it's probably not worth investigating further
   def test_https_get
     d = nil
     EM.run {
       http = silent { EM::P::HttpClient2.connect :host => 'www.apple.com', :port => 443, :ssl => true }
       d = http.get "/"
+      d.errback {
+        fail "Request failed"
+      }
       d.callback {
         EM.stop
       }

data/tests/test_idle_connection.rb

@@ -9,15 +9,17 @@ class TestIdleConnection < Test::Unit::TestCase
           $idle_time = conn.get_idle_time
           conn.send_data "GET / HTTP/1.0\r\n\r\n"
           EM.next_tick{
-            $idle_time_after_send = conn.get_idle_time
-            conn.close_connection
-            EM.stop
+            EM.next_tick{
+              $idle_time_after_send = conn.get_idle_time
+              conn.close_connection
+              EM.stop
+            }
           }
         }
       }
 
       assert_in_delta 3, $idle_time, 0.2
-      assert_equal 0, $idle_time_after_send
+      assert_in_delta 0, $idle_time_after_send, 0.1
     end
   end
 end

data/tests/test_iterator.rb

@@ -0,0 +1,97 @@
+require 'em_test_helper'
+
+class TestIterator < Test::Unit::TestCase
+
+  def get_time
+    EM.current_time.strftime('%H:%M:%S')
+  end
+
+  def test_default_concurrency
+    items = {}
+    list = 1..10
+    EM.run {
+      EM::Iterator.new(list).each( proc {|num,iter|
+        time = get_time
+        items[time] ||= []
+        items[time] << num
+        EM::Timer.new(1) {iter.next}
+      }, proc {EM.stop})
+    }
+    assert_equal(10, items.keys.size)
+    assert_equal((list).to_a, items.values.flatten)
+  end
+
+  def test_concurrency_bigger_than_list_size
+    items = {}
+    list = [1,2,3]
+    EM.run {
+      EM::Iterator.new(list,10).each(proc {|num,iter|
+        time = get_time
+        items[time] ||= []
+        items[time] << num
+        EM::Timer.new(1) {iter.next}
+      }, proc {EM.stop})
+    }
+    assert_equal(1, items.keys.size)
+    assert_equal((list).to_a, items.values.flatten)
+  end
+
+
+  def test_changing_concurrency_affects_active_iteration
+    items = {}
+    list = 1..25
+    EM.run {
+      i = EM::Iterator.new(list,5)
+      i.each(proc {|num,iter|
+        time = get_time
+        items[time] ||= []
+        items[time] << num
+        EM::Timer.new(1) {iter.next}
+      }, proc {EM.stop})
+      EM.add_timer(1){
+        i.concurrency = 1
+      }
+      EM.add_timer(3){
+        i.concurrency = 3
+      }
+    }
+    assert_equal(9, items.keys.size)
+    assert_equal((list).to_a, items.values.flatten)
+  end
+
+  def test_map
+    list = 100..150
+    EM.run {
+      EM::Iterator.new(list).map(proc{ |num,iter|
+        EM.add_timer(0.01){ iter.return(num) }
+      }, proc{ |results|
+        assert_equal((list).to_a.size, results.size)
+       EM.stop
+      })
+    }
+  end
+
+  def test_inject
+    list = %w[ pwd uptime uname date ]
+    EM.run {
+      EM::Iterator.new(list, 2).inject({}, proc{ |hash,cmd,iter|
+        EM.system(cmd){ |output,status|
+          hash[cmd] = status.exitstatus == 0 ? output.strip : nil
+          iter.return(hash)
+        }
+      }, proc{ |results|
+        assert_equal(results.keys, list)
+        EM.stop
+      })
+    }
+  end
+
+  def test_concurrency_is_0
+    EM.run {
+      assert_raise ArgumentError do
+        EM::Iterator.new(1..5,0)
+      end
+      EM.stop
+    }
+  end
+end

data/tests/test_line_protocol.rb

@@ -0,0 +1,33 @@
+require 'em_test_helper'
+
+class TestLineProtocol < Test::Unit::TestCase
+  class LineProtocolTestClass
+    include EM::Protocols::LineProtocol
+
+    def lines
+      @lines ||= []
+    end
+
+    def receive_line(line)
+      lines << line
+    end
+  end
+
+  def setup
+    @proto = LineProtocolTestClass.new
+  end
+
+  def test_simple_split_line
+    @proto.receive_data("this is")
+    assert_equal([], @proto.lines)
+
+    @proto.receive_data(" a test\n")
+    assert_equal(["this is a test"], @proto.lines)
+  end
+
+  def test_simple_lines
+    @proto.receive_data("aaa\nbbb\r\nccc\nddd")
+    assert_equal(%w(aaa bbb ccc), @proto.lines)
+  end
+
+end

data/tests/test_pause.rb

@@ -67,6 +67,30 @@ class TestPause < Test::Unit::TestCase
         end
       end
     end
+
+    def test_pause_in_receive_data
+      incoming = []
+
+      test_server = Module.new do
+        define_method(:receive_data) do |data|
+          incoming << data
+          pause
+          EM.add_timer(0.5){ close_connection }
+        end
+        define_method(:unbind) do
+          EM.stop
+        end
+      end
+
+      EM.run do
+        EM.start_server "127.0.0.1", @port, test_server
+        cli = EM.connect "127.0.0.1", @port
+        cli.send_data 'a'*(17*1024)
+      end
+
+      assert_equal 1, incoming.size
+      assert_equal 16*1024, incoming[0].bytesize
+    end
   else
     warn "EM.pause_connection not implemented, skipping tests in #{__FILE__}"
 

data/tests/test_set_sock_opt.rb

@@ -19,7 +19,7 @@ class TestSetSockOpt < Test::Unit::TestCase
       EM.run do
         EM.connect 'google.com', 80, Module.new {
           define_method :post_init do
-            val = set_sock_opt Socket::SOL_SOCKET, Socket::SO_DEBUG, true
+            val = set_sock_opt Socket::SOL_SOCKET, Socket::SO_BROADCAST, true
             test.assert_equal 0, val
             EM.stop
           end

data/tests/test_ssl_echo_data.rb

@@ -0,0 +1,60 @@
+require 'em_test_helper'
+
+class TestSSLEchoData < Test::Unit::TestCase
+  def setup
+      $dir = File.dirname(File.expand_path(__FILE__)) + '/'
+  end
+
+  module SslEchoServer
+    def post_init
+      start_tls(:private_key_file => $dir+'server.key', :cert_chain_file => $dir+'server.crt')
+    end
+
+    def receive_data data
+      send_data data
+    end
+
+  end
+
+  module SslEchoClient
+    def connection_completed
+      start_tls
+    end
+
+    def ssl_handshake_completed
+      send_data $expected_return_data[$index]
+      $index += 1
+    end
+
+    def receive_data data
+      $actual_return_data ||= []
+      $actual_return_data << data
+      if $index < 10
+        send_data $expected_return_data[$index]
+        $index += 1
+      else
+        @stopping_on_purpose = true
+        EM.stop
+      end
+    end
+
+    def unbind
+      fail "unexpected socket close" unless @stopping_on_purpose
+    end
+
+  end
+
+  def test_ssl_echo_data
+    $expected_return_data = (1..10).map {|n| "Hello, world! (#{n})"}
+    $index = 0
+
+    EM.run {
+      EM.add_timer(12) { fail "TIMEOUT" }
+      EM.start_server("127.0.0.1", 9999, SslEchoServer)
+      EM.connect("127.0.0.1", 9999, SslEchoClient)
+    }
+
+    assert_equal($expected_return_data, $actual_return_data)
+  end
+
+end if EM.ssl?