toq 0.0.4 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c4a52cfe51fc062860cb41237c2453b35ccc2b7c7447491a8fb0e3bb5578c26c
-  data.tar.gz: 58c73eef95e49b2cd66ab977b3d6fc70a3705f0a79000c0c2db05bc50804618f
+  metadata.gz: 272f1b4331d14f8c5d4b9dcb5969e83a6c6f189de4cfe38a533c4d0660d44d23
+  data.tar.gz: 43752df680609784b637d8e5398403b96190899b1492ce870cac212dd72d9ee5
 SHA512:
-  metadata.gz: e74a30760feac7886f77c025f975df9fd9d4cb0aa36d8f3105f74b1fbbc43508b259db5a2f6d443f268b88174b6cdc9f17149766f88ed3b47408b9363a099d79
-  data.tar.gz: d9cde530727fdb95148c404a0d02884c46278f2537d88c55e99e1c0393a056b892ae9d9aa01bfaa9acfb47f23a28a4cca6dd67a8a9e627cb150cb276d3614ae7
+  metadata.gz: 9c9de3857a967e239b15a6160d6aed561fbb0e3a3bd31a0e9040f7b84b4ef33a5f12205f1fc17e042d466355d318a1073ee4b5955ef246fdbbf6cd1039c5d159
+  data.tar.gz: ea66f7e0a9ae201bbdcffe8c6220bf989f680f5a8aa54fff297ac6c6fc89e8cf95fc7c2bcc113dc6a8d4c19da5ad53eab2c0faba5d59a326e24f14802852ed12

data/lib/toq/client.rb

@@ -91,10 +91,6 @@ class Client
 
         @reactor = Raktr.new
 
-        @reactor.on_error do |e|
-            p e
-        end
-
         @connections      = @reactor.create_queue
         @connection_count = 0
     end

data/lib/toq/exceptions.rb

@@ -116,6 +116,15 @@ module Exceptions
 
     end
 
+    class UnsafeMethod < Base
+
+        # @return   [Bool]  true
+        def rpc_unsafe_method_error?
+            true
+        end
+
+    end
+
     # An invalid method has been called.
     #
     # Occurs when a remote method doesn't exist or isn't public.

data/lib/toq/server.rb

@@ -100,10 +100,6 @@ class Server
 
         @reactor = Raktr.global
 
-        @reactor.on_error do |e|
-            @logger.error( 'System' ){ "#{e}" }
-        end
-
         clear_handlers
     end
 
@@ -192,6 +188,12 @@ class Server
             raise Exceptions::InvalidObject.new( msg )
         end
 
+        if !method_safe?( obj_name, meth_name )
+            msg = "Trying to access unsafe method '#{meth_name}'."
+            @logger.error( 'Call' ){ msg + " [on behalf of #{peer_ip_addr}]" }
+            raise Exceptions::UnsafeMethod.new( msg )
+        end
+
         # The handler needs to know if this is an async call because if it is
         # we'll have already send the response and it doesn't need to do
         # transmit anything.
@@ -263,6 +265,28 @@ class Server
         !!@objects[obj_name]
     end
 
+    def method_safe?( obj_name, meth_name )
+        ancestors = @objects[obj_name].class.ancestors - [Object, Kernel, BasicObject]
+
+        ancestors.each do |ancestor|
+            case ancestor
+                when Class
+                    if ancestor.allocate.public_methods( false ).include? meth_name.to_sym
+                        return true
+                    end
+
+                when Module
+                    object = Object.new
+                    object.extend( ancestor )
+                    if object.public_methods( false ).include? meth_name.to_sym
+                        return true
+                    end
+            end
+        end
+
+        false
+    end
+
 end
 
 end

data/lib/toq/version.rb

@@ -8,6 +8,6 @@
 
 module Toq
 
-    VERSION = '0.0.4'
+    VERSION = '0.1.0'
 
 end

data/spec/servers/server.rb

@@ -45,14 +45,30 @@ def rpc_opts_with_mixed_ssl_primitives
     )
 end
 
+module MyModule
+    def in_module
+        true
+    end
+end
+
 class Parent
+    include MyModule
+
     def foo( arg )
         arg
     end
+
+    def in_parent
+        true
+    end
 end
 
 class Test < Parent
 
+    def in_child
+        true
+    end
+
     def delay( arg, &block )
         Raktr.global.run_in_thread if !Raktr.global.running?
         Raktr.global.delay( 1 ) { block.call( arg ) }
@@ -68,6 +84,11 @@ class Test < Parent
         end
     end
 
+    private
+
+    def private_method
+        true
+    end
 end
 
 def start_server( opts, do_not_start = false )

data/spec/toq/server_spec.rb

@@ -8,6 +8,13 @@ end
 describe Toq::Server do
     let(:options) { rpc_opts.merge( port: 7333 ) }
     subject { start_server( options, true ) }
+    let(:server) { start_server( options ) }
+    let(:client) { start_client( options ) }
+
+    before :all do
+        Thread.new { server }
+        client
+    end
 
     describe '#initialize' do
         it 'should be able to properly setup class options' do
@@ -63,6 +70,37 @@ describe Toq::Server do
         subject.logger.class.should == ::Logger
     end
 
+    context 'when a method is public' do
+        it 'can be called' do
+            expect( client.call('test.in_child') ).to be_truthy
+        end
+    end
+
+    context 'when a method is private' do
+        it 'cannot be called' do
+            expect { client.call('test.private_method') }.to raise_error Toq::Exceptions::UnsafeMethod
+        end
+    end
+
+    context 'when a method is inherited' do
+        it 'can be called' do
+            expect( client.call('test.in_parent') ).to be_truthy
+            expect( client.call('test.in_module') ).to be_truthy
+        end
+    end
+
+    context 'when a method is inherited from Kernel' do
+        it 'cannot be called' do
+            expect { client.call('test.exec', 'ls') }.to raise_error Toq::Exceptions::UnsafeMethod
+        end
+    end
+
+    context 'when a method is inherited from Object' do
+        it 'cannot be called' do
+            expect { client.call('test.included_modules') }.to raise_error Toq::Exceptions::UnsafeMethod
+        end
+    end
+
     describe '#alive?' do
         it 'returns true' do
             subject.should be_alive

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: toq
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.1.0
 platform: ruby
 authors:
 - Tasos Laskos
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-18 00:00:00.000000000 Z
+date: 2024-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: raktr
@@ -74,7 +74,7 @@ homepage: https://github.com/qadron/toq
 licenses:
 - BSD 3-Clause
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--charset=UTF-8"
 require_paths:
@@ -90,27 +90,27 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.9
-signing_key: 
+rubygems_version: 3.4.22
+signing_key:
 specification_version: 4
 summary: Simple RPC protocol.
 test_files:
-- spec/spec_helper.rb
-- spec/toq/request_spec.rb
-- spec/toq/response_spec.rb
-- spec/toq/client_spec.rb
-- spec/toq/exceptions_spec.rb
-- spec/toq/server_spec.rb
-- spec/toq/proxy_spec.rb
-- spec/toq/message_spec.rb
-- spec/servers/server.rb
-- spec/servers/unix_socket.rb
 - spec/servers/with_ssl_primitives.rb
 - spec/servers/basic.rb
-- spec/pems/cacert.pem
-- spec/pems/server/cert.pem
-- spec/pems/server/key.pem
-- spec/pems/client/foo-key.pem
-- spec/pems/client/foo-cert.pem
+- spec/servers/server.rb
+- spec/servers/unix_socket.rb
 - spec/pems/client/cert.pem
 - spec/pems/client/key.pem
+- spec/pems/client/foo-cert.pem
+- spec/pems/client/foo-key.pem
+- spec/pems/server/cert.pem
+- spec/pems/server/key.pem
+- spec/pems/cacert.pem
+- spec/spec_helper.rb
+- spec/toq/proxy_spec.rb
+- spec/toq/client_spec.rb
+- spec/toq/response_spec.rb
+- spec/toq/server_spec.rb
+- spec/toq/message_spec.rb
+- spec/toq/request_spec.rb
+- spec/toq/exceptions_spec.rb