trusted-sandbox 0.1.0 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 710b66a2281fd58e96bafba2d61df2aac9c9bcb8
-  data.tar.gz: cce27e66c0599c3c0ee94f1cc848f5e715dc3445
+  metadata.gz: 79c7242f41d0e034bb997f59a9a155b263887ea1
+  data.tar.gz: 7a63530de915aa77a320cf55bdec6ac0b337ef4f
 SHA512:
-  metadata.gz: 1ad8fc3d96d46c245f98dd5065e8916dad3e4a2754f9e3ddaf3510140713c43fd9a71dbe5a4cc11e56b43ad78233d7aa4de77b3de8a8b7bf72ff988ba4c3d5ac
-  data.tar.gz: c6e4c9de28b98df0abca1efda6fe8cb555b578c87bf3d267aaea9519d686e3befdb65e57ba9a7e664ceb5d45ab9ec63f893de9da1a91863d5c979287f807dc0a
+  metadata.gz: b7df8a4d8294da359c80211eded78ba1bd5417ee968cc366240d8aa76d57fd58d718c65028b01a1d72d3312ca0e12d864501a931d1b3555ff45a2fcf650206f3
+  data.tar.gz: 515e0bf30b9c8ad98f1358cf5597715b338a3dbbbe22e930f55e1876c4e2a4d31f038452da172854abc9526f9e56286778835fa6a12e2b49e3465ef91ccc932a

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    trusted-sandbox (0.0.11.pre)
+    trusted-sandbox (0.1.2)
       docker-api (~> 1.13)
       thor (~> 0.19)
 

data/README.md

@@ -107,7 +107,7 @@ $ trusted_sandbox test
 Install the image. This step is optional, as Docker automatically installs images when you first run them. However,
 since it takes a few minutes we suggest you do this in advance.
 ```
-$ docker run --rm vaharoni/trusted_sandbox:ruby-2.1.2.v1
+$ docker run --rm vaharoni/trusted_sandbox:ruby-2.1.2.v2
 ```
 If you see the message "you must provide a uid", then you are set.
 
@@ -148,7 +148,7 @@ YAML file which will override any configuration and passed through to `Docker.op
 
 In addition, these docker-related configuration parameters can be used:
 ```ruby
-docker_image_name: vaharoni/trusted_sandbox:ruby-2.1.2.v1
+docker_image_name: vaharoni/trusted_sandbox:ruby-2.1.2.v2
 
 # Optional authentication
 docker_login:
@@ -420,7 +420,7 @@ You should not override user quota related parameters, as they must be prepared
 ## Using custom docker images
 
 Trusted Sandbox comes with one ready-to-use image that includes Ruby 2.1.2. It is hosted on Docker Hub under
-`vaharoni/trusted_sandbox:ruby-2.1.2.v1`.
+`vaharoni/trusted_sandbox:ruby-2.1.2.v2`.
 
 We are actively looking for contributors who are willing to help expand the library of Docker images to support other
 languages and environments.

data/lib/trusted_sandbox/cli.rb

@@ -73,5 +73,11 @@ module TrustedSandbox
         TrustedSandbox.uid_pool.release_all
       end
     end
+
+    desc 'ssh UID', 'Shows how to run a container with the current configuration settings. If UID is provided, it includes mounting instructions.'
+    def ssh(uid=nil)
+      uid_string = uid ? "-v #{File.join(TrustedSandbox.config.host_code_root_path, uid)}:/home/sandbox/src" : nil
+      puts %{docker run -it #{uid_string} --entrypoint="/bin/bash" #{TrustedSandbox.config.docker_image_name} -s}
+    end
   end
 end

data/lib/trusted_sandbox/config.rb

@@ -49,7 +49,7 @@ module TrustedSandbox
                                 :memory_limit, :memory_swap_limit, :cpu_shares, :docker_image_name,
                                 :execution_timeout, :network_access, :enable_swap_limit, :enable_quotas,
                                 :container_code_path, :container_input_filename, :container_output_filename,
-                                :keep_code_folders, :keep_containers, :quiet_mode
+                                :keep_code_folders, :keep_containers, :quiet_mode, :container_manifest_filename
 
     attr_reader_with_fallback :host_code_root_path, :host_uid_pool_lock_path
 

data/lib/trusted_sandbox/defaults.rb

@@ -3,7 +3,7 @@ module TrustedSandbox
 
     def initialize
       self.docker_options = {}
-      self.docker_image_name = 'vaharoni/trusted_sandbox:ruby-2.1.2.v1'
+      self.docker_image_name = 'vaharoni/trusted_sandbox:ruby-2.1.2.v2'
       self.memory_limit = 50 * 1024 * 1024
       self.memory_swap_limit = 50 * 1024 * 1024
       self.cpu_shares = 1
@@ -19,6 +19,7 @@ module TrustedSandbox
 
       # Note, changing these may require changing Dockerfile and run.rb and rebuilding the docker image
       self.container_code_path = '/home/sandbox/src'
+      self.container_manifest_filename = 'manifest'
       self.container_input_filename = 'input'
       self.container_output_filename = 'output'
 

data/lib/trusted_sandbox/request_serializer.rb

@@ -1,13 +1,15 @@
 module TrustedSandbox
   class RequestSerializer
 
-    attr_reader :host_code_dir_path, :input_file_name
+    attr_reader :host_code_dir_path, :manifest_file_name, :input_file_name
 
     # @param host_code_dir_path [String] path to the folder where the argument value needs to be stored
+    # @param manifest_file_name [String] name of manifest file inside the host_code_dir_path
     # @param input_file_name [String] name of input file inside the host_code_dir_path
-    def initialize(host_code_dir_path, input_file_name)
+    def initialize(host_code_dir_path, manifest_file_name, input_file_name)
       @host_code_dir_path = host_code_dir_path
       @input_file_name = input_file_name
+      @manifest_file_name = manifest_file_name
     end
 
     # @param klass [Class] class name to be serialized
@@ -16,8 +18,9 @@ module TrustedSandbox
     def serialize(klass, *args)
       self.klass = klass
       copy_code_file
+      create_manifest_file
 
-      data = Marshal.dump([klass.name, dest_file_name, args])
+      data = Marshal.dump([klass.name, args])
       File.binwrite input_file_path, data
     end
 
@@ -27,6 +30,10 @@ module TrustedSandbox
       File.join host_code_dir_path, input_file_name
     end
 
+    def manifest_file_path
+      File.join host_code_dir_path, manifest_file_name
+    end
+
     # = Methods depending on @klass
 
     attr_accessor :klass
@@ -49,5 +56,12 @@ module TrustedSandbox
       FileUtils.cp source_file_path, dest_file_path
     end
 
+    def create_manifest_file
+      File.open(manifest_file_path, 'w') do |f|
+        # In the near future this will change to a list of files, hence we use array
+        f.write [dest_file_name].to_yaml
+      end
+    end
+
   end
 end

data/lib/trusted_sandbox/response.rb

@@ -42,6 +42,13 @@ module TrustedSandbox
     # Parses the output file and stores the values in the appropriate ivars
     # @return [nil]
     def parse!
+      unless File.exists? output_file_path
+        @status = 'error'
+        @error = ContainerError.new('User code did not finish properly')
+        @error_to_raise = @error
+        return
+      end
+
       begin
         data = File.binread output_file_path
         @raw_response = Marshal.load(data)
@@ -54,7 +61,7 @@ module TrustedSandbox
 
       unless ['success', 'error'].include? @raw_response[:status]
         @status = 'error'
-        @error = ContainerError.new('Output file has invalid format')
+        @error = InternalError.new('Output file has invalid format')
         @error_to_raise = @error
         return
       end

data/lib/trusted_sandbox/runner.rb

@@ -80,7 +80,7 @@ module TrustedSandbox
     end
 
     def serialize_request(klass, *args)
-      serializer = RequestSerializer.new(code_dir_path, config.container_input_filename)
+      serializer = RequestSerializer.new(code_dir_path, config.container_manifest_filename, config.container_input_filename)
       serializer.serialize(klass, *args)
     end
 

data/lib/trusted_sandbox/server_images/ruby-2.1.2/run.rb

@@ -1,12 +1,16 @@
 begin
   require 'active_support'
+  require 'yaml'
 
+  manifest_file_path = '/home/sandbox/src/manifest'
   input_file_path = '/home/sandbox/src/input'
   output_file_path = '/home/sandbox/src/output'
 
+  manifest = YAML.load_file(manifest_file_path)
+  manifest.each {|f| require_relative "src/#{f}"}
+
   data = File.binread(input_file_path)
-  klass_name, file_name, args = Marshal.load(data)
-  require File.join('/home/sandbox/src', file_name)
+  klass_name, args = Marshal.load(data)
   klass = ActiveSupport::Inflector.constantize klass_name
 
   obj = klass.new(*args)

data/lib/trusted_sandbox/version.rb

@@ -1,3 +1,3 @@
 module TrustedSandbox
-  VERSION = '0.1.0'
+  VERSION = '0.1.2'
 end

data/spec/lib/trusted_sandbox/request_serializer_spec.rb

@@ -3,27 +3,31 @@ require 'spec_helper'
 describe TrustedSandbox::RequestSerializer do
   before do
     @tmp_path = 'tmp/test/request_serializer'
-    @file_name = 'args'
-    @args_file_path = File.expand_path File.join(@tmp_path, @file_name)
+
+    @manifest_file_name = 'manifest'
+    @manifest_file_path = File.expand_path File.join(@tmp_path, @manifest_file_name)
+
+    @args_file_name = 'args'
+    @args_file_path = File.expand_path File.join(@tmp_path, @args_file_name)
     FileUtils.rm_rf @tmp_path
     FileUtils.mkdir_p @tmp_path
   end
 
   describe '#initialize' do
     before do
-      @subject = TrustedSandbox::RequestSerializer.new(@tmp_path, @file_name)
+      @subject = TrustedSandbox::RequestSerializer.new(@tmp_path, @manifest_file_name, @args_file_name)
     end
 
     it 'initializes attributes correctly' do
       @subject.host_code_dir_path.should == @tmp_path
-      @subject.input_file_name.should == @file_name
+      @subject.input_file_name.should == @args_file_name
     end
 
   end
 
   describe '#serialize' do
     before do
-      @subject = TrustedSandbox::RequestSerializer.new(@tmp_path, @file_name)
+      @subject = TrustedSandbox::RequestSerializer.new(@tmp_path, @manifest_file_name, @args_file_name)
       @arg1 = { test: 'working' }
       @arg2 = { another_test: 'working too' }
       @subject.serialize TrustedSandbox::RequestSerializer, @arg1, @arg2
@@ -37,10 +41,15 @@ describe TrustedSandbox::RequestSerializer do
       File.read(@target_class_file).should == File.read(@source_class_file)
     end
 
+    it 'creates a manifest file' do
+      File.exists?(@manifest_file_path).should == true
+      YAML.load_file(@manifest_file_path).should == ['request_serializer.rb']
+    end
+
     it 'serializes arguments' do
       File.exists?(@args_file_path).should == true
       data = File.binread(@args_file_path)
-      Marshal.load(data).should == ['TrustedSandbox::RequestSerializer', 'request_serializer.rb', [@arg1, @arg2]]
+      Marshal.load(data).should == ['TrustedSandbox::RequestSerializer', [@arg1, @arg2]]
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trusted-sandbox
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors:
 - Amit Aharoni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-31 00:00:00.000000000 Z
+date: 2014-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler