arachni-reactor 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 2dd8da14a563d174b01b3ec556dc10b17bf7212a
-  data.tar.gz: a554df83d1fdec6fb709179fa11947c343d24f0b
+SHA256:
+  metadata.gz: ef5b5d0eb1a76745be3671829841cbd1c9780d9c731c12e9933bafadf2c622ff
+  data.tar.gz: 0e2a91dc4a9159042ce590bd6c1a09ae61cd660ad18aa9a900a19fe04d2a599d
 SHA512:
-  metadata.gz: c2e868cd76cea63175be7f8675a1b3f7fc293c58994a5875ca2e6923d98fafb500d70ba547f9f14a5c330bb468c71630fe2c1d1f6dbb8179f86a53228b74a495
-  data.tar.gz: cf5a704e69e255edc2f54ddaef55a56003b9f70d88f33bc270392afed13ecb1563bdc2563a41bf696e0d45bcfc4a09708b61a55fce4c7a79645ddf534c456cad
+  metadata.gz: 314fb418807020a5d9aed021e6bb55063d343ea514ff5b06df75f6b0c894ac3c4e53c25fade813313205e4326841c391e441c2432ad758c6c0142f412cdf85e7
+  data.tar.gz: 23a506068c6b7b8c529b3c8d4500d709fb05f8fd8e8c1b40848bf08719104b684602a4816a77a5e79c5515e51dc3a1a367c1d132754ae3d9bc5e8c8f446c6b69

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # ChangeLog
 
+## Version 0.1.3
+
+- `Reactor` -- Reduced object allocations.
+- `Connection::TLS#_read` -- Handle `OpenSSL::SSL::SSLErrorWaitReadable`.
+
 ## Version 0.1.2
 
  - `Reactor` -- Reduced object allocations.

data/lib/arachni/reactor/connection/tls.rb

@@ -113,6 +113,7 @@ module TLS
         return ssl_accept if accept?
 
         super
+    rescue OpenSSL::SSL::SSLErrorWaitReadable
     end
 
     private
@@ -150,6 +151,7 @@ module TLS
                 @ssl_context
             )
             ssl_socket.sync_close = true
+            ssl.accept if @start_immediately
             ssl_socket
         end
     rescue IO::WaitReadable, IO::WaitWritable

data/lib/arachni/reactor/version.rb

@@ -9,7 +9,7 @@
 module Arachni
 class Reactor
 
-    VERSION = '0.1.2'
+    VERSION = '0.1.3'
 
 end
 end

data/lib/arachni/reactor.rb

@@ -414,7 +414,7 @@ class Reactor
     def schedule( &block )
         fail_if_not_running
 
-        if running? && in_same_thread?
+        if in_same_thread?
             block.call
         else
             next_tick(&block)
@@ -551,32 +551,8 @@ class Reactor
              'The host OS does not support UNIX-domain sockets.'
     end
 
-    def process_connections
-        if @connections.empty?
-            sleep @max_tick_interval
-            return
-        end
-
-        # Required for OSX as it connects immediately and then #select returns
-        # nothing as there's no activity, given that, OpenSSL doesn't get a chance
-        # to do its handshake so explicitly connect pending sockets, bypassing #select.
-        @connections.each do |_, connection|
-            connection._connect if !connection.connected?
-        end
-
-        # Get connections with available events - :read, :write, :error.
-        selected = select_connections
-
-        # Close connections that have errors.
-        [selected.delete(:error)].flatten.compact.each(&:close)
-
-        # Call the corresponding event on the connections.
-        selected.each { |event, connections| connections.each(&"_#{event}".to_sym) }
-    end
-
     def determine_connection_options( *args )
         options = {}
-        host = port = unix_socket = nil
 
         if args[1].is_a? Integer
             options[:host], options[:port], options[:handler], *handler_options = *args
@@ -634,6 +610,22 @@ class Reactor
         @connections.values.each(&:close)
     end
 
+    def process_connections
+        if @connections.empty?
+            sleep @max_tick_interval
+            return
+        end
+
+        # Get connections with available events - :read, :write, :error.
+        selected = self.select_connections
+
+        # Close connections that have errors.
+        selected.delete(:error)&.each(&:close)
+
+        # Call the corresponding event on the connections.
+        selected.each { |event, connections| connections.each(&"_#{event}".to_sym) }
+    end
+
     # @return   [Hash]
     #
     #   Connections grouped by their available events:
@@ -643,17 +635,34 @@ class Reactor
     #       {Connection#has_outgoing_data? outgoing buffer).
     #   * `:error`
     def select_connections
-        readables = read_sockets
+        r = []
+        w = []
+        e = []
+
+        @connections.values.each do |connection|
+
+            # Required for OSX as it connects immediately and then #select returns
+            # nothing as there's no activity, given that, OpenSSL doesn't get a chance
+            # to do its handshake so explicitly connect pending sockets, bypassing #select.
+            connection._connect if !connection.connected?
+
+            socket = connection.socket
+
+            e << socket
+
+            if connection.listener? || connection.connected?
+                r << socket
+            end
+
+            if connection.connected? && connection.has_outgoing_data?
+                w << socket
+            end
+        end
 
         selected_sockets =
             begin
                 Connection::Error.translate do
-                    select(
-                        readables,
-                        write_sockets,
-                        all_sockets,
-                        @select_timeout
-                    )
+                    select( r, w, e, @select_timeout )
                 end
             rescue Connection::Error => e
                 nil
@@ -668,8 +677,8 @@ class Reactor
         # So force a read for SSL sockets to cover all our bases.
         #
         # This is apparent especially on JRuby.
-        if readables.size != selected_sockets[0].size
-            (readables - selected_sockets[0]).each do |socket|
+        if r.size != selected_sockets[0].size
+            (r - selected_sockets[0]).each do |socket|
                 next if !socket.is_a?( OpenSSL::SSL::SSLSocket )
                 selected_sockets[0] << socket
             end
@@ -689,39 +698,8 @@ class Reactor
         }
     end
 
-    # @return   [Array<Socket>]
-    #   Sockets of all connections, we want to be ready to read at any time.
-    def read_sockets
-        s = []
-        @connections.each do |_, connection|
-            next if !connection.listener? && !connection.connected?
-            s << connection.socket
-        end
-        s
-    end
-
-    # @return   [Array<Socket>]
-    #   Sockets of connections with
-    #   {Connection#has_outgoing_data? outgoing data}.
-    def write_sockets
-        s = []
-        @connections.each do |_, connection|
-            next if connection.connected? && !connection.has_outgoing_data?
-            s << connection.socket
-        end
-        s
-    end
-
-    def all_sockets
-        @connections.values.map(&:socket)
-    end
-
     def connections_from_sockets( sockets )
-        sockets.map { |s| connection_from_socket( s ) }
-    end
-
-    def connection_from_socket( socket )
-        @connections[socket.to_io]
+        sockets.map { |s| @connections[s.to_io] }
     end
 
 end

data/spec/arachni/reactor/connection/tls_spec.rb

@@ -129,10 +129,12 @@ describe Arachni::Reactor::Connection::TLS do
                         reactor.listen( host, port, TLSHandler, options )
 
                         client.write data
+                        sleep 1
+
                         reactor.stop
                         reactor.wait rescue Arachni::Reactor::Error::NotRunning
 
-                        received_data.should == data
+                        expect(received_data).to eq data
                     end
                 end
 
@@ -324,7 +326,8 @@ describe Arachni::Reactor::Connection::TLS do
                                 connection.write data
                             end
 
-                            received.should == data
+                            sleep 1
+                            expect(received).to eq data
                         end
                     end
 

data/spec/arachni/reactor/iterator_spec.rb

@@ -25,7 +25,7 @@ describe Arachni::Reactor::Iterator do
         end
 
         context 'when the concurrency is' do
-            context 0 do
+            context '0' do
                 let(:concurrency) { 0 }
 
                 it "raises #{ArgumentError}" do

data/spec/arachni/reactor/tasks_spec.rb

@@ -25,14 +25,14 @@ describe Arachni::Reactor::Tasks do
         context 'when it includes the given task' do
             it 'returns true' do
                 subject << task
-                subject.should include task
+                expect(subject.include?( task )).to be_truthy
             end
         end
 
         context 'when it does not includes the given task' do
             it 'returns false' do
                 subject << task
-                subject.should_not include another_task
+                expect(subject.include?( another_task )).to be_falsey
             end
         end
     end
@@ -125,8 +125,8 @@ describe Arachni::Reactor::Tasks do
 
             subject.call
 
-            called_one.should be_true
-            called_two.should be_true
+            called_one.should be_truthy
+            called_two.should be_truthy
         end
 
         it 'returns self' do

data/spec/support/helpers/utilities.rb

@@ -114,7 +114,7 @@ def convert_server_to_ssl( server, options = {} )
         context.cert.version    = 2
         context.cert.serial     = 1
 
-        context.cert.sign( context.key, OpenSSL::Digest::SHA1.new )
+        context.cert.sign( context.key, OpenSSL::Digest::SHA256.new )
     end
 
     OpenSSL::SSL::SSLServer.new( server, context )

data/spec/support/servers/echo_tls.rb

@@ -15,7 +15,7 @@ loop do
                 next if (data = socket.gets).to_s.empty?
                 socket.write( data )
             end
-        rescue EOFError, Errno::EPIPE
+        rescue EOFError, Errno::EPIPE, Errno::ECONNRESET
             socket.close
         end
     end

data/spec/support/servers/echo_unix.rb

@@ -7,7 +7,7 @@ loop do
                 next if (data = socket.gets).to_s.empty?
                 socket.write( data )
             end
-        rescue EOFError, Errno::EPIPE
+        rescue EOFError, Errno::EPIPE, Errno::ECONNRESET
             socket.close
         end
     end

data/spec/support/servers/echo_unix_tls.rb

@@ -15,7 +15,7 @@ loop do
                 next if (data = socket.gets).to_s.empty?
                 socket.write( data )
             end
-        rescue EOFError, Errno::EPIPE
+        rescue EOFError, Errno::EPIPE, Errno::ECONNRESET
             socket.close
         end
     end

data/spec/support/shared/connection.rb

@@ -290,10 +290,10 @@ shared_examples_for 'Arachni::Reactor::Connection' do
 
             reactor.run_in_thread
 
-            connection.attach( reactor ).should be_true
+            connection.attach( reactor ).should be_truthy
             sleep 1
 
-            reactor.attached?( configured ).should be_true
+            reactor.attached?( configured ).should be_truthy
         end
 
         it 'calls #on_attach' do
@@ -319,7 +319,7 @@ shared_examples_for 'Arachni::Reactor::Connection' do
                     connection.attach reactor
                     sleep 0.1 while connection.detached?
 
-                    connection.attach( reactor ).should be_false
+                    connection.attach( reactor ).should be_falsey
                 end
             end
 
@@ -337,11 +337,11 @@ shared_examples_for 'Arachni::Reactor::Connection' do
                     r.run_in_thread
 
                     configured.should receive(:on_detach)
-                    connection.attach( r ).should be_true
+                    connection.attach( r ).should be_truthy
 
                     sleep 2
 
-                    r.attached?( configured ).should be_true
+                    r.attached?( configured ).should be_truthy
                 end
             end
         end
@@ -363,7 +363,7 @@ shared_examples_for 'Arachni::Reactor::Connection' do
             connection.detach
             sleep 0.1 while connection.attached?
 
-            reactor.attached?( configured ).should be_false
+            reactor.attached?( configured ).should be_falsey
         end
 
         it 'calls #on_detach' do
@@ -582,7 +582,7 @@ shared_examples_for 'Arachni::Reactor::Connection' do
                     end
                 end
 
-                configured.called_on_flush.should be_true
+                configured.called_on_flush.should be_truthy
             end
         end
     end
@@ -601,13 +601,13 @@ shared_examples_for 'Arachni::Reactor::Connection' do
                 configured.write 'test'
                 sleep 0.1 while !configured.has_outgoing_data?
 
-                configured.has_outgoing_data?.should be_true
+                configured.has_outgoing_data?.should be_truthy
             end
         end
 
         context 'when the send-buffer is empty' do
             it 'returns false' do
-                configured.has_outgoing_data?.should be_false
+                configured.has_outgoing_data?.should be_falsey
             end
         end
     end

data/spec/support/shared/reactor.rb

@@ -158,7 +158,7 @@ shared_examples_for 'Arachni::Reactor' do
             end
 
             subject.should_not be_running
-            running.should be_true
+            running.should be_truthy
         end
 
         context 'when no block is given' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arachni-reactor
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Tasos Laskos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-06 00:00:00.000000000 Z
+date: 2021-12-26 00:00:00.000000000 Z
 dependencies: []
 description: |2
       Arachni::Reactor is a simple, lightweight, pure-Ruby implementation of the Reactor
@@ -97,45 +97,44 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.3.0.dev
 signing_key: 
 specification_version: 4
 summary: A pure-Ruby implementation of the Reactor pattern.
 test_files:
-- spec/support/fixtures/pems/server/cert.pem
-- spec/support/fixtures/pems/server/key.pem
+- spec/arachni/reactor/connection/tls_spec.rb
+- spec/arachni/reactor/connection_spec.rb
+- spec/arachni/reactor/iterator_spec.rb
+- spec/arachni/reactor/queue_spec.rb
+- spec/arachni/reactor/tasks/base.rb
+- spec/arachni/reactor/tasks/delayed_spec.rb
+- spec/arachni/reactor/tasks/one_off_spec.rb
+- spec/arachni/reactor/tasks/periodic_spec.rb
+- spec/arachni/reactor/tasks/persistent_spec.rb
+- spec/arachni/reactor/tasks_spec.rb
+- spec/arachni/reactor_spec.rb
+- spec/arachni/reactor_tls_spec.rb
+- spec/spec_helper.rb
+- spec/support/fixtures/handlers/echo_client.rb
+- spec/support/fixtures/handlers/echo_client_tls.rb
+- spec/support/fixtures/handlers/echo_server.rb
+- spec/support/fixtures/handlers/echo_server_tls.rb
 - spec/support/fixtures/pems/cacert.pem
-- spec/support/fixtures/pems/client/foo-key.pem
 - spec/support/fixtures/pems/client/cert.pem
 - spec/support/fixtures/pems/client/foo-cert.pem
+- spec/support/fixtures/pems/client/foo-key.pem
 - spec/support/fixtures/pems/client/key.pem
-- spec/support/fixtures/handlers/echo_client.rb
-- spec/support/fixtures/handlers/echo_server.rb
-- spec/support/fixtures/handlers/echo_client_tls.rb
-- spec/support/fixtures/handlers/echo_server_tls.rb
-- spec/support/servers/echo_unix.rb
-- spec/support/servers/echo_tls.rb
-- spec/support/servers/echo.rb
-- spec/support/servers/echo_unix_tls.rb
-- spec/support/helpers/utilities.rb
+- spec/support/fixtures/pems/server/cert.pem
+- spec/support/fixtures/pems/server/key.pem
 - spec/support/helpers/paths.rb
-- spec/support/lib/servers.rb
-- spec/support/lib/servers/runner.rb
+- spec/support/helpers/utilities.rb
 - spec/support/lib/server_option_parser.rb
-- spec/support/shared/reactor.rb
+- spec/support/lib/servers/runner.rb
+- spec/support/lib/servers.rb
+- spec/support/servers/echo.rb
+- spec/support/servers/echo_tls.rb
+- spec/support/servers/echo_unix.rb
+- spec/support/servers/echo_unix_tls.rb
 - spec/support/shared/connection.rb
+- spec/support/shared/reactor.rb
 - spec/support/shared/task.rb
-- spec/spec_helper.rb
-- spec/arachni/reactor_tls_spec.rb
-- spec/arachni/reactor_spec.rb
-- spec/arachni/reactor/queue_spec.rb
-- spec/arachni/reactor/tasks_spec.rb
-- spec/arachni/reactor/connection_spec.rb
-- spec/arachni/reactor/iterator_spec.rb
-- spec/arachni/reactor/connection/tls_spec.rb
-- spec/arachni/reactor/tasks/base.rb
-- spec/arachni/reactor/tasks/persistent_spec.rb
-- spec/arachni/reactor/tasks/delayed_spec.rb
-- spec/arachni/reactor/tasks/one_off_spec.rb
-- spec/arachni/reactor/tasks/periodic_spec.rb