mruby_sandbox 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4153c1ee7cc6e9c720dc076ac9c5f36b4af7bd18
-  data.tar.gz: 31afc8cb58cdc4abd03d83b1cf72207c8e65c789
+  metadata.gz: 5a2f7112f407c42a5d6991e90114f42df58f06c0
+  data.tar.gz: 81862829d3b0771964526afedf4302c185aed23e
 SHA512:
-  metadata.gz: 79148c19851f533cc0acd46408dae7f86905376cfabcfecfcfd0a2372101c8641109f945d75d42eaec06e000f387db272de17589804ab084afe9b5db26b4289a
-  data.tar.gz: 1d3d6d9ce89fa5e97a97b5bc1859b1c2cc1127dce92b5672f93d9c2eb637962722f9f80abdb25c88683836566b12f1ffb63ee250da59af076a0dc6efa066acf7
+  metadata.gz: 8f55f88f1588de6dfbc388ab7c4eabeb4576241e13b556dd2fc7fb55f2f6e492ee1f989b295b800ea6fed627f5887e414c3c2af2c711ee698c9caf423dc340eb
+  data.tar.gz: a940f8ed2d48b70671d6df40aa329264f2d16a0bfe278052f5bf16b769b9722c0b16d645b7bb254705fc31fd631568daeb837faf8ae055ec63dbdeedfbb1fd47

data/Gemfile.lock

@@ -1,15 +1,15 @@
 PATH
   remote: .
   specs:
-    mruby_sandbox (0.4.0)
-      pipe_rpc (~> 0.3)
+    mruby_sandbox (0.5.0)
+      pipe_rpc (~> 1.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
     diff-lcs (1.2.5)
     json (1.8.3)
-    pipe_rpc (0.3.2)
+    pipe_rpc (1.0.0)
       json
     rspec (3.4.0)
       rspec-core (~> 3.4.0)

data/lib/mruby_sandbox.rb

@@ -1,75 +1,66 @@
 require 'pipe_rpc'
-require 'forwardable'
 require 'logger'
+
 require_relative 'mruby_sandbox/version'
 require_relative 'mruby_sandbox/server'
 
-class MrubySandbox
-  extend Forwardable
-
-  class << self
-    attr_writer :logger
+module MrubySandbox
+  class MrubySandbox < PipeRpc::Gateway
+    class << self
+      attr_writer :logger
 
-    def logger
-      @logger ||= Logger.new(STDOUT)
+      def logger
+        @logger ||= Logger.new(STDOUT)
+      end
     end
-  end
 
-  def initialize
-    input, w = IO.pipe
-    r, output  = IO.pipe
-    @pid = spawn(executable, in: r, out: w)
-    r.close; w.close
+    def initialize
+      input, w = IO.pipe
+      r, output  = IO.pipe
+      @pid = spawn(executable, in: r, out: w)
+      r.close; w.close
 
-    self.class.logger.debug "Sandbox(#{__id__}) created with process #{@pid}"
+      self.class.logger.debug "Sandbox(#{__id__}) created with process #{@pid}"
 
-    @hub = PipeRpc::Hub.new(input: input, output: output)
-    @data = {}
+      super(input: input, output: output)
 
-  rescue Errno::ENOENT => e
-    STDERR.puts "The mruby_sandbox executable is missing. Run `build_mruby_sandbox` first."
-    fail e
-  end
+    rescue Errno::ENOENT => e
+      STDERR.puts "The mruby_sandbox executable is missing. Run `build_mruby_sandbox` first."
+      fail e
+    end
 
-  attr_reader :data
+    def client
+      clients[:default]
+    end
 
-  def client
-    client_for :default
-  end
+    def eval(*args)
+      client.eval(*args)
+    end
 
-  delegate [:clear, :eval] => :client
-  delegate [:add_server, :rmv_server, :client_for, :channel, :handle_message, :loop_iteration=,
-    :on_sent, :on_received, :on_incoming_request] => :@hub
-  alias_method :export, :add_server
+    def start_logging
+      on_sent do |message|
+        self.class.logger.debug "Sandbox(#{__id__}) sent: #{message}"
+      end
 
-  def start_logging
-    @hub.logger = proc do |message|
-      self.class.logger.debug "Sandbox(#{__id__}) #{message}"
+      on_received do |message|
+        self.class.logger.debug "Sandbox(#{__id__}) received: #{message}"
+      end
     end
-  end
 
-  def reflect_logger_server=(server)
-    client.debug_mode(!!server)
-    if server
-      add_server(reflect_logger: server)
-    else
-      rmv_server(:reflect_logger)
+    def close
+      return unless @pid
+      super
+      Process.kill 9, @pid
+      Process.wait @pid
+      self.class.logger.debug "Sandbox(#{__id__}) teared down and process #{@pid} killed"
+      @pid = nil
     end
-  end
 
-  def tear_down
-    return unless @pid
-    @hub.cancel
-    Process.kill 9, @pid
-    Process.wait @pid
-    self.class.logger.debug "Sandbox(#{__id__}) teared down and process #{@pid} killed"
-    @pid = nil
-  end
-
-  private
+    private
 
-  def executable
-    current_dir = File.expand_path(File.dirname(__FILE__))
-    File.join(current_dir, '../bin/mruby_sandbox')
+    def executable
+      current_dir = File.expand_path(File.dirname(__FILE__))
+      File.join(current_dir, '../bin/mruby_sandbox')
+    end
   end
 end

data/lib/mruby_sandbox/version.rb

@@ -1,3 +1,3 @@
-class MrubySandbox
-  VERSION = "0.4.0"
+module MrubySandbox
+  VERSION = "0.5.0"
 end

data/mruby/sandbox/mrblib/sandbox.rb

@@ -1,77 +1,43 @@
-class Sandbox < BasicObject
-  def initialize(main)
-    @main = main
-    @main.sandbox = self
+class Sandbox < PipeRpc::Gateway
+  def initialize
     input = IO.new(0, 'r')  #STDIN
     output = IO.new(1, 'w') #STDOUT
-    @hub = PipeRpc::Hub.new(input: input, output: output)
-    add_server(default: Controller.new(self))
-    ::Kernel.loop { iteration }
+    super(input: input, output: output)
   end
 
-  def eval(code, file = '', lineno = 0)
-    @main.eval(code, file, lineno)
-  end
+  def set_up(main)
+    servers.add(default: main)
 
-  def add_server(args = {})
-    @hub.add_server(args)
-  end
+    sandbox = self
 
-  def client_for(server_name)
-    @hub.client_for(server_name)
-  end
+    main.define_singleton_method :add_server do |*args|
+      sandbox.servers.add(*args)
+    end
 
-  def debug_mode(debug = true)
-    @hub.logger = debug ? :reflect : false
-  end
+    main.define_singleton_method :client_for do |server|
+      sandbox.clients[server]
+    end
 
-  private
-
-  def iteration
-    @hub.handle_message # blocks every iteration
-  rescue ::Exception => e
-    # reflect ALL rescueable errors back to the managing process
-    backtrace = e.backtrace
-    @hub.send_response PipeRpc::ErrorResponse.new(error: { code: -32603, data: { message: e.message, backtrace: backtrace } })
-    ::Kernel.raise e
-  end
-end
-
-class Sandbox::Controller
-  def initialize(sandbox)
-    @sandbox = sandbox
-  end
-
-  def eval(code, file = '', lineno = 0)
-    @sandbox.eval(code, file, lineno)
-  end
-
-  def debug_mode(debug = true)
-    @sandbox.debug_mode(debug)
+    loop do
+      handle_message # blocks every iteration
+    end
   end
 end
 
 # Interface for untrusted code to communicate with the outside
 class << self
-  attr_writer :sandbox
-
   def eval(code, file = '', lineno = 0)
     instance_eval(code, file, lineno)
   end
 
-  def export(args = {})
-    @sandbox.add_server(args)
-  end
-
-  def client_for(server = :default)
-    @sandbox.client_for(server)
+  def client
+    clients[:default]
   end
-  alias_method :client, :client_for
 end
 
 # Remove constants from global namespace so untrusted code cannot mess around with it.
-Sandbox::GC = Object.remove_const(:GC)
-Sandbox::ObjectSpace = Object.remove_const(:ObjectSpace)
+Object.remove_const(:GC)
+Object.remove_const(:ObjectSpace)
 Sandbox::IO = Object.remove_const(:IO)
 Sandbox::PipeRpc = Object.remove_const(:PipeRpc)
-Object.remove_const(:Sandbox).new(self)
+Object.remove_const(:Sandbox).new.set_up(self)

data/mruby_sandbox.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.executables   = ["build_mruby_sandbox"]
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "pipe_rpc", "~> 0.3"
+  spec.add_runtime_dependency "pipe_rpc", "~> 1.0"
   spec.add_development_dependency "bundler", "~> 1.8"
   spec.add_development_dependency "rspec", "~> 3.4"
   spec.add_development_dependency "rspec-its"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mruby_sandbox
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Christopher Aue
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-04 00:00:00.000000000 Z
+date: 2016-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pipe_rpc
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement