jruby_sandbox 0.1.2-java → 0.1.3-java

data/Gemfile.lock

@@ -7,7 +7,7 @@ GIT
 PATH
   remote: .
   specs:
-    jruby_sandbox (0.1.1-java)
+    jruby_sandbox (0.1.2-java)
       fakefs
 
 GEM

data/ext/java/sandbox/SandboxFull.java

@@ -17,11 +17,13 @@ import org.jruby.runtime.Block;
 import org.jruby.runtime.builtin.IRubyObject;
 import org.jruby.common.IRubyWarnings;
 import org.jruby.exceptions.RaiseException;
+import org.jruby.runtime.DynamicScope;
 
 
 @JRubyClass(name="Sandbox::Full")
 public class SandboxFull extends RubyObject {
   private Ruby wrapped;
+  private DynamicScope currentScope;
 
   public SandboxFull(Ruby runtime, RubyClass type) {
     super(runtime, type);
@@ -45,6 +47,8 @@ public class SandboxFull extends RubyObject {
 
     RubyClass cBoxedClass = wrapped.defineClass("BoxedClass", wrapped.getObject(), wrapped.getObject().getAllocator());
     cBoxedClass.defineAnnotatedMethods(BoxedClass.class);
+    
+    currentScope = wrapped.getCurrentContext().getCurrentScope();
 
     return this;
   }
@@ -52,7 +56,7 @@ public class SandboxFull extends RubyObject {
   @JRubyMethod(required=1)
   public IRubyObject eval(IRubyObject str) {
     try {
-      IRubyObject result = wrapped.evalScriptlet(str.asJavaString(), wrapped.getCurrentContext().getCurrentScope());
+      IRubyObject result = wrapped.evalScriptlet(str.asJavaString(), currentScope);
       return unbox(result);
     } catch (RaiseException e) {
       String msg = e.getException().callMethod(wrapped.getCurrentContext(), "message").asJavaString();

data/lib/sandbox/version.rb

@@ -1,3 +1,3 @@
 module Sandbox
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 end

data/lib/sandbox.rb

@@ -1,10 +1,11 @@
 require 'sandbox/sandbox'
 require 'sandbox/version'
 require 'fakefs/safe'
-require 'timeout'
 
 module Sandbox
   PRELUDE = File.expand_path('../sandbox/prelude.rb', __FILE__).freeze # :nodoc:
+  
+  TimeoutError = Class.new(Exception)
 
   class << self
     def new
@@ -49,6 +50,8 @@ module Sandbox
       ref     FakeFS::FileTest
       import  FakeFS::FileUtils #import FileUtils because it is a module
       
+      # this is basically what FakeFS.activate! does, but we want to do it in the sandbox
+      # so we have to live with this:
       eval <<-RUBY
         Object.class_eval do
           remove_const(:Dir)
@@ -66,16 +69,49 @@ module Sandbox
       FakeFS::FileSystem.clear
     end
     
-    def eval_with_timeout(code, timeout=10)
-      require 'timeout'
+    def eval(code, options={})
       
-      timeout_code = <<-RUBY
-        Timeout.timeout(#{timeout}) do
-          #{code}
+      if seconds = options[:timeout]
+        sandbox_timeout(code, seconds) do
+          super code
         end
-      RUBY
+      else
+        super code
+      end
+      
+    end
+    
+    private
+    
+    def sandbox_timeout(name, seconds)
+      val, exc = nil
       
-      eval timeout_code
+      thread = Thread.start(name) do
+        begin
+          val = yield
+        rescue Exception => exc
+        end
+      end
+      
+      thread.join(seconds)
+    
+      if thread.alive?
+        if thread.respond_to? :kill!
+          thread.kill!
+        else
+          thread.kill
+        end
+      
+        timed_out = true
+      end
+    
+      if timed_out
+        raise TimeoutError, "#{self.class} timed out"
+      elsif exc
+        raise exc
+      else
+        val
+      end
     end
     
     IO_S_METHODS = %w[

data/spec/sandbox_spec.rb

@@ -73,7 +73,7 @@ describe Sandbox do
     end
   end
   
-  describe "#eval_with_timeout" do
+  describe "#eval with timeout" do
     subject { Sandbox.safe }
     
     context "before it's been activated" do
@@ -83,8 +83,18 @@ describe Sandbox do
         RUBY
 
         expect {
-          subject.eval_with_timeout(long_code, 1)
-        }.to raise_error(Sandbox::SandboxException, /Timeout/)
+          subject.eval(long_code, timeout: 1)
+        }.to raise_error(Sandbox::TimeoutError)
+      end
+      
+      it "should not raise a timeout error if the code runs in under the passed in time" do
+        short_code = <<-RUBY
+          1+1
+        RUBY
+        
+        expect {
+          subject.eval(short_code, timeout: 1)
+        }.to_not raise_error(Sandbox::TimeoutError)
       end
     end
     
@@ -97,10 +107,16 @@ describe Sandbox do
         RUBY
 
         expect {
-          Timeout.timeout(3) do
-            subject.eval_with_timeout(long_code, 1)
-          end
-        }.to raise_error(Sandbox::SandboxException, /Timeout/)
+          subject.eval(long_code, timeout: 1)
+        }.to raise_error(Sandbox::TimeoutError)
+      end
+      
+      it "should persist state between evaluations" do
+        subject.eval('o = Object.new', timeout: 1)
+        
+        expect {
+          subject.eval('o', timeout: 1)
+        }.to_not raise_error(Sandbox::SandboxException)
       end
     end
   end
@@ -116,6 +132,12 @@ describe Sandbox do
       OPS
       subject.eval(operations).should == 'foo'
     end
+    
+    it "should have an empty ENV" do
+      pending do
+        subject.eval(%{ENV.to_a}).should be_empty 
+      end
+    end
 
     it "should persist state between evaluations" do
       subject.eval('o = Object.new')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jruby_sandbox
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: java
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-22 00:00:00.000000000Z
+date: 2011-09-29 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fakefs
-  requirement: &70213141993840 !ruby/object:Gem::Requirement
+  requirement: &70149996586680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70213141993840
+  version_requirements: *70149996586680
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70213141992860 !ruby/object:Gem::Requirement
+  requirement: &70149996586260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70213141992860
+  version_requirements: *70149996586260
 - !ruby/object:Gem::Dependency
   name: rake-compiler
-  requirement: &70213141991920 !ruby/object:Gem::Requirement
+  requirement: &70149996585840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70213141991920
+  version_requirements: *70149996585840
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70213141991120 !ruby/object:Gem::Requirement
+  requirement: &70149996585420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70213141991120
+  version_requirements: *70149996585420
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70213141989820 !ruby/object:Gem::Requirement
+  requirement: &70149996585000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,7 +66,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70213141989820
+  version_requirements: *70149996585000
 description: A version of _why's Freaky Freaky Sandbox for JRuby.
 email:
 - dray@envylabs.com