eventmachine 1.2.0.1-x86-mingw32 → 1.2.1-x86-mingw32

data/lib/em/version.rb

@@ -1,3 +1,3 @@
 module EventMachine
-  VERSION = "1.2.0.1"
+  VERSION = "1.2.1"
 end

data/lib/eventmachine.rb

@@ -1521,6 +1521,12 @@ module EventMachine
     elsif opcode == ConnectionCompleted
       c = @conns[conn_binding] or raise ConnectionNotBound, "received ConnectionCompleted for unknown signature: #{conn_binding}"
       c.connection_completed
+    elsif opcode == SslHandshakeCompleted
+      c = @conns[conn_binding] or raise ConnectionNotBound, "received SslHandshakeCompleted for unknown signature: #{conn_binding}"
+      c.ssl_handshake_completed
+    elsif opcode == SslVerify
+      c = @conns[conn_binding] or raise ConnectionNotBound, "received SslVerify for unknown signature: #{conn_binding}"
+      c.close_connection if c.ssl_verify_peer(data) == false
     elsif opcode == TimerFired
       t = @timers.delete( data )
       return if t == false # timer cancelled

data/lib/jeventmachine.rb

@@ -77,6 +77,8 @@ module EventMachine
   ConnectionNotifyWritable = 107
   # @private
   SslHandshakeCompleted = 108
+  # @private
+  SslVerify = 109
 
   # Exceptions that are defined in rubymain.cpp
   class ConnectionError < RuntimeError; end

data/rakelib/test_pure.rake

@@ -0,0 +1,13 @@
+require 'rake/testtask'
+
+Rake::TestTask.new(:test_pure) do |t|
+  t.libs << 'tests'
+  t.libs << 'lib'
+  t.test_files = Dir.glob('tests/**/test_pure*.rb') + Dir.glob('tests/**/test_ssl*.rb')
+  t.warning = true
+end
+
+task :test_em_pure_ruby do
+  ENV['EM_PURE_RUBY'] = 'true'
+  Rake::Task['test_pure'].execute
+end

data/tests/em_test_helper.rb

@@ -1,8 +1,11 @@
+require 'em/pure_ruby' if ENV['EM_PURE_RUBY']
 require 'eventmachine'
 require 'test/unit'
 require 'rbconfig'
 require 'socket'
 
+puts "EM Library Type: #{EM.library_type}"
+
 class Test::Unit::TestCase
   class EMTestTimeout < StandardError ; end
 

data/tests/test_basic.rb

@@ -171,6 +171,38 @@ class TestBasic < Test::Unit::TestCase
     assert_equal local_ip, ip
   end
 
+  def test_invalid_address_bind_connect_dst
+    e = nil
+    EM.run do
+      begin
+        EM.bind_connect('localhost', nil, 'invalid.invalid', 80)
+      rescue Exception => e
+        # capture the exception
+      ensure
+        EM.stop
+      end
+    end
+
+    assert_kind_of(EventMachine::ConnectionError, e)
+    assert_match(/unable to resolve address:.*not known/, e.message)
+  end
+
+  def test_invalid_address_bind_connect_src
+    e = nil
+    EM.run do
+      begin
+        EM.bind_connect('invalid.invalid', nil, 'localhost', 80)
+      rescue Exception => e
+        # capture the exception
+      ensure
+        EM.stop
+      end
+    end
+
+    assert_kind_of(EventMachine::ConnectionError, e)
+    assert_match(/invalid bind address:.*not known/, e.message)
+  end
+
   def test_reactor_thread?
     assert !EM.reactor_thread?
     EM.run { assert EM.reactor_thread?; EM.stop }

data/tests/test_ltp2.rb

@@ -72,6 +72,30 @@ class TestLineText2 < Test::Unit::TestCase
     assert_equal( ["Linea", "Lineb", "Linec", "Lined"], a.lines )
   end
 
+  class RegexDelimiter
+    include EM::Protocols::LineText2
+    attr_reader :lines
+    def initialize *args
+      super
+      @delim = /[A-D]/
+      set_delimiter @delim
+    end
+    def receive_line line
+      (@lines ||= []) << line
+    end
+  end
+
+  def test_regex_delimiter
+    testdata = %Q(LineaALinebBLinecCLinedD)
+
+    a = RegexDelimiter.new
+    a.receive_data testdata
+    assert_equal( ["Linea", "Lineb", "Linec", "Lined"], a.lines )
+
+    a = RegexDelimiter.new
+    testdata.length.times {|i| a.receive_data( testdata[i...i+1] ) }
+    assert_equal( ["Linea", "Lineb", "Linec", "Lined"], a.lines )
+  end
 
   #--
   # Test two lines followed by an empty line, ten bytes of binary data, then

data/tests/test_pure.rb

@@ -85,4 +85,55 @@ class TestPure < Test::Unit::TestCase
     assert a
   end
 
+  module TLSServer
+    def post_init
+      start_tls
+    end
+
+    def ssl_handshake_completed
+      $server_handshake_completed = true
+    end
+
+    def receive_data(data)
+      $server_received_data = data
+      send_data(data)
+    end
+  end
+
+  module TLSClient
+    def post_init
+      start_tls
+    end
+
+    def ssl_handshake_completed
+      $client_handshake_completed = true
+    end
+
+    def connection_completed
+      send_data('Hello World!')
+    end
+
+    def receive_data(data)
+      $client_received_data = data
+      close_connection
+    end
+
+    def unbind
+      EM.stop_event_loop
+    end
+  end
+
+  def test_start_tls
+    $client_handshake_completed, $server_handshake_completed = false, false
+    $client_received_data, $server_received_data = nil, nil
+    EM.run do
+      EM.start_server("127.0.0.1", 16789, TLSServer)
+      EM.connect("127.0.0.1", 16789, TLSClient)
+    end
+
+    assert($client_handshake_completed)
+    assert($server_handshake_completed)
+    assert($client_received_data == "Hello World!")
+    assert($server_received_data == "Hello World!")
+  end
 end

data/tests/test_ssl_dhparam.rb

@@ -7,7 +7,7 @@ class TestSslDhParam < Test::Unit::TestCase
   end
 
   module Client
-    def connection_completed
+    def post_init
       start_tls
     end
 
@@ -46,6 +46,7 @@ class TestSslDhParam < Test::Unit::TestCase
 
   def test_no_dhparam
     omit_unless(EM.ssl?)
+    omit_if(EM.library_type == :pure_ruby) # DH will work with defaults
     omit_if(rbx?)
 
     $client_handshake_completed, $server_handshake_completed = false, false

data/tests/test_ssl_ecdh_curve.rb

@@ -2,7 +2,7 @@ require 'em_test_helper'
 
 class TestSslEcdhCurve < Test::Unit::TestCase
   module Client
-    def connection_completed
+    def post_init
       start_tls
     end
 
@@ -56,6 +56,7 @@ class TestSslEcdhCurve < Test::Unit::TestCase
 
   def test_ecdh_curve
     omit_unless(EM.ssl?)
+    omit_if(EM.library_type == :pure_ruby && RUBY_VERSION < "2.3.0")
     omit_if(rbx?)
 
     $client_handshake_completed, $server_handshake_completed = false, false

data/tests/test_ssl_extensions.rb

@@ -16,7 +16,7 @@ if EM.ssl?
         EM.stop_event_loop
       end
 
-      def connection_completed
+      def post_init
         start_tls(:ssl_version => :tlsv1, :sni_hostname => 'example.com')
       end
     end

data/tests/test_ssl_protocols.rb

@@ -25,21 +25,21 @@ if EM.ssl?
 
     module ClientAny
       include Client
-      def connection_completed
+      def post_init
         start_tls(:ssl_version => %w(sslv2 sslv3 tlsv1 tlsv1_1 tlsv1_2))
       end
     end
 
     module ClientDefault
       include Client
-      def connection_completed
+      def post_init
         start_tls
       end
     end
 
     module ClientSSLv3
       include Client
-      def connection_completed
+      def post_init
         start_tls(:ssl_version => %w(SSLv3))
       end
     end

data/tests/test_ssl_verify.rb

@@ -98,6 +98,7 @@ class TestSslVerify < Test::Unit::TestCase
 
   def test_accept_server
     omit_unless(EM.ssl?)
+    omit_if(EM.library_type == :pure_ruby) # Server has a default cert chain
     omit_if(rbx?)
     $client_handshake_completed, $server_handshake_completed = false, false
     EM.run {
@@ -112,6 +113,7 @@ class TestSslVerify < Test::Unit::TestCase
 
   def test_deny_server
     omit_unless(EM.ssl?)
+    omit_if(EM.library_type == :pure_ruby) # Server has a default cert chain
     omit_if(rbx?)
     $client_handshake_completed, $server_handshake_completed = false, false
     EM.run {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eventmachine
 version: !ruby/object:Gem::Version
-  version: 1.2.0.1
+  version: 1.2.1
 platform: x86-mingw32
 authors:
 - Francis Cianfrocca
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-16 00:00:00.000000000 Z
+date: 2016-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit
@@ -200,6 +200,7 @@ files:
 - lib/rubyeventmachine.rb
 - rakelib/package.rake
 - rakelib/test.rake
+- rakelib/test_pure.rake
 - tests/client.crt
 - tests/client.key
 - tests/dhparam.pem