arachni-rpc-em 0.1.2 → 0.1.3dev1

data/lib/arachni/rpc/em/em.rb

@@ -49,7 +49,7 @@ module EM
         if !::EM::reactor_running?
 
             Thread.new do
-                ::EM::run do
+                ::EM.run do
                     ::EM.error_handler do |e|
                         $stderr.puts "Exception raised during event loop: " +
                         "#{e.message} (#{e.class})\n#{(e.backtrace ||

data/lib/arachni/rpc/em/protocol.rb

@@ -88,7 +88,7 @@ module Protocol
         # cut them out as soon as possible
         #
         # don't buffer any data from unverified peers if SSL peer
-        # veification has been enabled
+        # verification has been enabled
         #
         if ssl_opts? && !verified_peer? && @role == :server
             e = Arachni::RPC::Exceptions::SSLPeerVerificationFailed.new( 'Could not verify peer.' )
@@ -107,7 +107,7 @@ module Protocol
         while @buf.size >= 4
             if @buf.size >= 4 + ( size = @buf.unpack( 'N' ).first )
                 @buf.slice!( 0, 4 )
-                receive_object( serializer.load( @buf.slice!( 0, size ) ) )
+                receive_object( unserialize( @buf.slice!( 0, size ) ) )
             else
                 break
             end
@@ -120,7 +120,7 @@ module Protocol
     # Will split the object in chunks of MAX_CHUNK_SIZE and transmit one at a time.
     #
     def send_object( obj )
-        data = serializer.dump( obj )
+        data = serialize( obj )
         packed = [data.bytesize, data].pack( 'Na*' )
 
         while packed
@@ -134,7 +134,7 @@ module Protocol
     end
 
     #
-    # Returns the preferred serializer based on the 'serializer' option of the server.
+    # Returns the preferred  based on the 'serializer' option of the server.
     #
     # Defaults to <i>YAML</i>.
     #
@@ -143,9 +143,38 @@ module Protocol
     # @see http://eventmachine.rubyforge.org/EventMachine/Protocols/ObjectProtocol.html#M000369
     #
     def serializer
+        return @client_serializer if @client_serializer
+
         @opts[:serializer] ? @opts[:serializer] : YAML
     end
 
+    def fallback_serializer
+        @opts[:fallback_serializer] ? @opts[:serializer] : YAML
+    end
+
+    def serialize( obj )
+        serializer.dump obj
+    end
+
+    def unserialize( obj )
+        begin
+            r = serializer.load( obj )
+
+            if !r.is_a?( Hash ) && @opts[:fallback_serializer]
+                r = @opts[:fallback_serializer].load( obj )
+                @client_serializer = @opts[:fallback_serializer]
+            end
+
+            r
+        rescue Exception => e
+            raise if !@opts[:fallback_serializer]
+
+            @client_serializer = @opts[:fallback_serializer]
+
+            @opts[:fallback_serializer].load obj
+        end
+    end
+
 end
 
 end

data/lib/arachni/rpc/em/server.rb

@@ -82,53 +82,46 @@ class Server
 
             # the method call may block a little so tell EventMachine to
             # stick it in its own thread.
-            # ::EM.defer( proc {
-                res  = Response.new
-                peer = peer_ip_addr
+            res  = Response.new
+            peer = peer_ip_addr
 
-                begin
-                    # token-based authentication
-                    authenticate!
+            begin
+                # token-based authentication
+                authenticate!
 
-                    # grab the result of the method call
-                    res.merge!( @server.call( self ) )
+                # grab the result of the method call
+                res.merge!( @server.call( self ) )
 
-                # handle exceptions and convert them to a simple hash,
-                # ready to be passed to the client.
-                rescue Exception => e
+            # handle exceptions and convert them to a simple hash,
+            # ready to be passed to the client.
+            rescue Exception => e
 
-                    type = ''
+                type = ''
 
-                    # if it's an RPC exception pass the type along as is
-                    if e.rpc_exception?
-                        type = e.class.name.split( ':' )[-1]
-
-                    # otherwise set it to a RemoteExeption
-                    else
-                        type = 'RemoteException'
-                    end
+                # if it's an RPC exception pass the type along as is
+                if e.rpc_exception?
+                    type = e.class.name.split( ':' )[-1]
+                # otherwise set it to a RemoteExeption
+                else
+                    type = 'RemoteException'
+                end
 
-                    res.obj = {
-                        'exception' => e.to_s,
-                        'backtrace' => e.backtrace,
-                        'type'      => type
-                    }
+                res.obj = {
+                    'exception' => e.to_s,
+                    'backtrace' => e.backtrace,
+                    'type'      => type
+                }
 
-                    msg = "#{e.to_s}\n#{e.backtrace.join( "\n" )}"
-                    @server.logger.error( 'Exception' ){ msg + " [on behalf of #{peer}]" }
-                end
+                msg = "#{e.to_s}\n#{e.backtrace.join( "\n" )}"
+                @server.logger.error( 'Exception' ){ msg + " [on behalf of #{peer}]" }
+            end
 
-                # res
-            # }, proc {
-                # |res|
-
-                #
-                # pass the result of the RPC call back to the client
-                # along with the callback ID but *only* if it wan't async
-                # because server.call() will have already taken care of it
-                #
-                send_response( res ) if !res.async?
-            # })
+            #
+            # pass the result of the RPC call back to the client
+            # along with the callback ID but *only* if it wan't async
+            # because server.call() will have already taken care of it
+            #
+            send_response( res ) if !res.async?
         end
 
         #
@@ -136,9 +129,6 @@ class Server
         #
         # It will raise an exception if the token doesn't check-out.
         #
-        # @param    [String]    peer    IP address of the client
-        # @param    [Hash]      req     request
-        #
         def authenticate!
             if !valid_token?( @request.token )
 
@@ -148,7 +138,7 @@ class Server
                     msg + " [on behalf of #{peer_ip_addr}]"
                 }
 
-                raise InvalidToken.new( msg )
+                fail InvalidToken.new( msg )
             end
         end
 
@@ -187,6 +177,9 @@ class Server
     #        # http://eventmachine.rubyforge.org/EventMachine/Protocols/ObjectProtocol.html#M000369
     #        :serializer => Marshal,
     #
+    #        # serializer to use if the first choice fails
+    #        :fallback_serializer => YAML,
+    #
     #        #
     #        # In order to enable peer verification one must first provide
     #        # the following:
@@ -232,15 +225,14 @@ class Server
     # you can just decide dynamically based on the plethora of data which Ruby provides
     # by its 'Method' class.
     #
-    #    server.add_async_check {
-    #        |method|
+    #    server.add_async_check do |method|
     #        #
     #        # Must return 'true' for async and 'false' for sync.
     #        #
     #        # Very simple check here...
     #        #
     #        'async' ==  method.name.to_s.split( '_' )[0]
-    #    }
+    #    end
     #
     # @param    [Proc]  &block
     #
@@ -310,13 +302,13 @@ class Server
         if !object_exist?( obj_name )
             msg = "Trying to access non-existent object '#{obj_name}'."
             @logger.error( 'Call' ){ msg + " [on behalf of #{peer_ip_addr}]" }
-            raise( InvalidObject.new( msg ) )
+            raise InvalidObject.new( msg )
         end
 
         if !public_method?( obj_name, meth_name )
             msg = "Trying to access non-public method '#{meth_name}'."
             @logger.error( 'Call' ){ msg + " [on behalf of #{peer_ip_addr}]" }
-            raise( InvalidMethod.new( msg ) )
+            raise InvalidMethod.new( msg )
         end
 
         # the proxy needs to know whether this is an async call because if it
@@ -352,7 +344,7 @@ class Server
         @logger.info( 'System' ){ "Shutting down in #{wait_for} seconds..." }
 
         # don't die before returning
-        EventMachine::add_timer( wait_for ) { ::EM.stop }
+        ::EM.add_timer( wait_for ) { ::EM.stop }
         true
     end
 

data/lib/arachni/rpc/em/ssl.rb

@@ -88,7 +88,7 @@ module SSL
     #
     def log( severity, progname, msg )
         warn "#{progname}: #{msg}" if severity == :error
-        raise "#{progname}: #{msg}" if severity == :fatal
+        fail "#{progname}: #{msg}" if severity == :fatal
     end
 
     #
@@ -100,7 +100,7 @@ module SSL
                 @ca_store = OpenSSL::X509::Store.new
                 @ca_store.add_file( file )
             else
-                raise "No CA certificate has been provided."
+                fail "No CA certificate has been provided."
             end
         end
 
@@ -144,17 +144,14 @@ module SSL
     # @see http://eventmachine.rubyforge.org/EventMachine/Connection.html#M000270
     #
     def ssl_handshake_completed
-        if are_we_a_client? && ssl_opts? &&
-           !OpenSSL::SSL.verify_certificate_identity( @last_seen_cert,
-                @opts[:host] )
+        return if !are_we_a_client? || !ssl_opts? ||
+            OpenSSL::SSL.verify_certificate_identity( @last_seen_cert, @opts[:host] )
 
-            log( :error, 'SSL',
-                "The hostname '#{@server.opts[:host]}' " +
-                "does not match the server certificate."
-            )
+        log( :error, 'SSL',
+             "The hostname '#{@opts[:host]}' does not match the server certificate."
+        )
 
-            connection_close
-        end
+        close_connection
     end
 
     def are_we_a_client?

data/lib/arachni/rpc/em/version.rb

@@ -9,7 +9,7 @@
 module Arachni
 module RPC
 module EM
-    VERSION = '0.1.2'
+    VERSION = '0.1.3dev1'
 end
 end
 end

data/spec/arachni/rpc/em/client_spec.rb

@@ -8,6 +8,35 @@ describe Arachni::RPC::EM::Client do
         ]
     end
 
+    it "should be able to retain stability and consistency under heavy load" do
+        client = start_client( rpc_opts )
+
+        n    = 400
+        cnt  = 0
+
+        mismatches = []
+
+        n.times do |i|
+            client.call( 'test.foo', i ) do |res|
+                cnt += 1
+                mismatches << [i, res] if i != res
+                ::EM.stop if cnt == n || !mismatches.empty?
+            end
+        end
+
+        Arachni::RPC::EM.block
+        cnt.should > 0
+        mismatches.should be_empty
+    end
+
+    it "should throw error when connecting to inexistent server" do
+        start_client( rpc_opts.merge( :port => 9999 ) ).call( 'test.foo', @arg ) do |res|
+            res.rpc_connection_error?.should be_true
+            ::EM.stop
+        end
+        Arachni::RPC::EM.block
+    end
+
     describe "#initialize" do
         it "should be able to properly assign class options (including :role)" do
             opts = rpc_opts.merge( :role => :client )
@@ -15,6 +44,19 @@ describe Arachni::RPC::EM::Client do
         end
     end
 
+    context 'when using a fallback serializer' do
+        context 'and the primary serializer fails' do
+            it 'should use the fallback' do
+                opts = rpc_opts.merge( port: 7333, serializer: YAML )
+                start_client( opts ).call( 'test.foo', @arg ).should == @arg
+
+                opts = rpc_opts.merge( port: 7333, serializer: Marshal )
+                start_client( opts ).call( 'test.foo', @arg ).should == @arg
+            end
+        end
+
+    end
+
     describe "raw interface" do
 
         context "when using Threads" do
@@ -131,35 +173,6 @@ describe Arachni::RPC::EM::Client do
         end
     end
 
-    it "should be able to retain stability and consistency under heavy load" do
-        client = start_client( rpc_opts )
-
-        n    = 400
-        cnt  = 0
-
-        mismatches = []
-
-        n.times do |i|
-            client.call( 'test.foo', i ) do |res|
-                cnt += 1
-                mismatches << [i, res] if i != res
-                ::EM.stop if cnt == n || !mismatches.empty?
-            end
-        end
-
-        Arachni::RPC::EM.block
-        cnt.should > 0
-        mismatches.should be_empty
-    end
-
-    it "should throw error when connecting to inexistent server" do
-        start_client( rpc_opts.merge( :port => 9999 ) ).call( 'test.foo', @arg ) do |res|
-            res.rpc_connection_error?.should be_true
-            ::EM.stop
-        end
-        Arachni::RPC::EM.block
-    end
-
     context "when using valid SSL primitives" do
         it "should be able to establish a connection" do
             res = start_client( rpc_opts_with_ssl_primitives ).call( 'test.foo', @arg )

data/spec/pems/cacert.pem

@@ -1,39 +1,37 @@
 -----BEGIN CERTIFICATE-----
-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
+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
+BAYTAkdSMRgwFgYDVQQDEw9BcmFjaG5pLXRlc3QtQ0ExKjAoBgkqhkiG9w0BCQEW
+G2FyYWNobmlAYXJhY2huaS1zY2FubmVyLmNvbTAeFw0xMjExMDIxMDIyNTNaFw0y
+MjEwMzExMDIyNTNaMFMxCzAJBgNVBAYTAkdSMRgwFgYDVQQDEw9BcmFjaG5pLXRl
+c3QtQ0ExKjAoBgkqhkiG9w0BCQEWG2FyYWNobmlAYXJhY2huaS1zY2FubmVyLmNv
+bTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBANHbVRqyD7FT8KSCZLm1
+YrOwMj78OXRjMb+ucPR+fncXR1TEuPlEFojLtzqtsaA5OJXpj+0toFP+2T4DeFlu
+YT4TBrRQ3DxmeY2b5b6ZuurLMfMc1vU+dE92Tj4nuInBz3Z09aDQ8ZWXWzJ7uD3J
+eNjOcj7Jc94AGFx05Tii9VriUmX+jXQALv5S5WGVtKt4p67mLm/2xD4JhS+a0+B8
+s/Xo7l6EXaFeTsH5jgZDiY+f0Dpk6cM+pZ5AJVJiNonDJs8/nl9vdWPRH40GHsyN
+H0/lo/wTxuth/TvX3DBB5hTi/9V5eYbLTLtE1oyXgBxNKrjDu8FVn/jUl8DAIdJL
+n4vXwXI70wLyS6aF8uu9ApNnmSbTTc2scAKDmnlINLHqGGlpyleojqphDy3MfQYk
+YT9QSXNKHlO4NMLFqrqM1F3hvM3MEteeM12gAeeJLY6YYYJafMMMh/e7kK/y5u+J
+ype5t5N8GKskSRp0RvlRYfoH/lnyJd6FEyh9P0QHA4CKAadZBCfOcmwmTY/G0Kjn
+3Y7r7BmJb4PIEcDqUjXwuyq6ZHjx7sawuGG6eXhIGln0JtSymy4j+h+xlh0S7O8B
+Ti6dMVxg+DNTkEJz2O00IIBcyToqZ26XovFkN5ueRNOROB3YVpldmpbLyuOQae/D
+4Gc21bEWoR7OAaY2PRl4r563AgMBAAGjggE9MIIBOTAdBgNVHQ4EFgQU8VOtNUbZ
+rnbX0gRWIds5yaT+uCwwgYMGA1UdIwR8MHqAFPFTrTVG2a5219IEViHbOcmk/rgs
+oVekVTBTMQswCQYDVQQGEwJHUjEYMBYGA1UEAxMPQXJhY2huaS10ZXN0LUNBMSow
+KAYJKoZIhvcNAQkBFhthcmFjaG5pQGFyYWNobmktc2Nhbm5lci5jb22CCQDwWMKg
+KIPX9TAPBgNVHRMBAf8EBTADAQH/MBEGCWCGSAGG+EIBAQQEAwIBBjAJBgNVHRIE
+AjAAMCsGCWCGSAGG+EIBDQQeFhxUaW55Q0EgR2VuZXJhdGVkIENlcnRpZmljYXRl
+MCYGA1UdEQQfMB2BG2FyYWNobmlAYXJhY2huaS1zY2FubmVyLmNvbTAOBgNVHQ8B
+Af8EBAMCAQYwDQYJKoZIhvcNAQEFBQADggIBAAAAebhmNydIUT+sZpvWM5JKNQdq
+YtnghnpZyM37cxLmFIeDKKPTw/3lhDViRRqQaaFTI7ukcqgloPmhMuymQT4o11Fw
+XLoQuIeSgS7Mg6eZF3CUKoEy1KnlluegDXtDI+WH/EQHlokBvoMaClltj6vsfqI/
+K9K2MAXUKi8K7NRq6VYO1QPtrBfrX9VmLyndbYm8lSG5oDkGGh8NjVgHHZDgrQAQ
+2EmsWbE9yMZ6yl+AaaE5XrbPWnBI8rK77WP93JYVAhmcaQiJzPfMw3sb2QojKdak
+7fvJzAjBeXAoTP5Mu/E+BPPgELzB/DnRaWlrYsAQeRZBV+I3+k5CCVqdOAdJCk5Y
+dFNTppHfwVaDj5qKOmodzdUDcDL6ynl15t6WHgj2yBwsDVpWsvbqyitZkemLFwrf
+hAedR3dKr+IxrOynST1w4LorDorcGK/DqhD475bQ9EDel5nW18hotUeeeO+K3qc7
+iGgj7zTKfmhzL/KMotir/SQYYxQbbtLkkhXDaNVlWiYkHotOzrNbpKAFM776CI47
+KTXG88FydcycGHYU8SQLEbEDiowAikr2u+CUHKrJvz2Wr8jkWaMCSfgCyokcY6vR
+IIqnrpYHhX2FmKf+tRB8o3KXM6uiOSUvaW23LHcs0OKqcJ0XHOkhTMDFZ82eDZzl
+CXJQkVNhmc0Y9prF
 -----END CERTIFICATE-----