secure 1.0.0 → 1.1.0

data/.gitignore

@@ -2,3 +2,5 @@
 .bundle
 Gemfile.lock
 pkg/*
+.rbenv-version
+.DS_STORE

data/README.md

@@ -37,6 +37,8 @@ Options:
 * :limit_cpu => This is the limit of how many cpu-seconds your process can use. MUST be an integer. This should be used as a fallback in case :timeout is not honored
 * :run_before => A block, or array of blocks that is run before your code is sandboxed. Be careful. Remember how lambdas are bound in ruby. Refer to this for more details: http://blog.sidu.in/2007/11/ruby-blocks-gotchas.html
 * :pipe_stdin, :pipe_stdout, :pipe_stderr => A File to pipe the stdin, out ond stderr to
+* :safe => An integer that represents the new safe mode (default 3)
+* :limit_files => Maximum file descriptor the block can open. If you want to say no files, set this to 0
 
 Errors:
 =======

data/lib/secure/child_process.rb

@@ -12,6 +12,8 @@ module Secure
       @pipe_stderr = opts[:pipe_stderr]
       @pipe_stdin = opts[:pipe_stdin]
       @run_before = opts[:run_before]
+      @safe_value = opts[:safe] || 3
+      @limit_files = opts[:limit_files]
     end
 
     def guard_threads
@@ -21,6 +23,7 @@ module Secure
     def set_resource_limits
       Process::setrlimit(Process::RLIMIT_AS, @limit_memory) if @limit_memory
       Process::setrlimit(Process::RLIMIT_CPU, @limit_cpu, 2 + @limit_cpu) if @limit_cpu
+      Process::setrlimit(Process::RLIMIT_NOFILE, @limit_files, @limit_files) if @limit_files
     end
 
     def redirect_files
@@ -43,7 +46,7 @@ module Secure
       redirect_files
       thread = Thread.start do
         run_before_methods
-        $SAFE=3
+        $SAFE = @safe_value
         yield
       end
       decorate_with_guard_threads(thread)

data/lib/secure/version.rb

@@ -1,3 +1,3 @@
 module Secure
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

data/spec/secure/runner_spec.rb

@@ -57,6 +57,14 @@ module Secure
         response.should be_success
         $SAFE.should == 0
       end
+
+      it "can change the safe value if needed" do
+        response = Runner.new(:safe => 0).run do
+          $SAFE
+        end
+        response.should be_success
+        response.value.should == 0
+      end
     end
 
     context "security violations" do
@@ -104,6 +112,14 @@ module Secure
         response.error.should be_a(Secure::ChildKilledError)
       end
 
+      it "kills a process running trying to open a file" do
+        response = Runner.new(:safe => 0, :limit_files => 0).run do
+          File.read(__FILE__)
+        end
+        response.should_not be_success
+        response.error.should be_a(Errno::EMFILE)
+      end
+
       it "should not be able to open a file" do
         response = Runner.new.run do
           File.open("/etc/passwd")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: secure
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-10-26 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70153208867340 !ruby/object:Gem::Requirement
+  requirement: &70276562098440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '2.6'
   type: :development
   prerelease: false
-  version_requirements: *70153208867340
+  version_requirements: *70276562098440
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70153208866920 !ruby/object:Gem::Requirement
+  requirement: &70276562098020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70153208866920
+  version_requirements: *70276562098020
 description: see summary
 email:
 - tejas@gja.in