exec_sandbox 0.1.3 → 0.2.0

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.2.0

data/exec_sandbox.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "exec_sandbox"
-  s.version = "0.1.3"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Victor Costan"]
@@ -38,6 +38,7 @@ Gem::Specification.new do |s|
     "spec/exec_sandbox/wait4_spec.rb",
     "spec/fixtures/buffer.rb",
     "spec/fixtures/churn.rb",
+    "spec/fixtures/count.rb",
     "spec/fixtures/duplicate.rb",
     "spec/fixtures/exit_arg.rb",
     "spec/fixtures/fork.rb",
@@ -49,7 +50,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/pwnall/exec_sandbox"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.11"
+  s.rubygems_version = "1.8.12"
   s.summary = "Run foreign binaries using POSIX sandboxing features"
 
   if s.respond_to? :specification_version then

data/lib/exec_sandbox.rb

@@ -6,6 +6,7 @@ require 'English'
 require 'etc'
 require 'fcntl'
 require 'fileutils'
+require 'set'
 require 'tempfile'
 require 'tmpdir'
 

data/lib/exec_sandbox/sandbox.rb

@@ -92,8 +92,11 @@ class Sandbox
   # @option options [String] :out path to a file that is set as the child's
   #     stdout; if not set, the child will receive the write end of a pipe whose
   #     contents is returned in :out_data
+  # @option options [Symbol] :err :none closes the child's stderr, :out
+  #     redirects the child's stderr to stdout; by default, the child's stderr
+  #     is the same as the parent's
   # @return [Hash] the result of {Wait4#wait4}, plus an :out_data key if no :out
-  #                option is given
+  #                option is given  
   def run(command, options = {})
     limits = options[:limits] || {}
     
@@ -113,7 +116,14 @@ class Sandbox
       out_rd, out_wr = IO.pipe
       io[:out] = out_wr
     end
-    io[:err] = STDERR unless options[:no_stderr]
+    case options[:err]
+    when :out
+      io[:err] = STDOUT
+    when :none
+      # Don't set io[:err], so the child's stderr will be closed.
+    else
+      io[:err] = STDERR
+    end
     
     pid = ExecSandbox::Spawn.spawn command, io, @principal, limits
     # Close the pipe ends that are meant to be used in the child.

data/lib/exec_sandbox/spawn.rb

@@ -28,32 +28,44 @@ module Spawn
   # @param [Hash] io associates file descriptors with IO objects or file paths;
   #                  all file descriptors not covered by io will be closed
   def self.limit_io(io)
+    # Sort the list of redirections by file descriptor number.
+    redirects = []
     [:in, :out, :err].each_with_index do |sym, fd_num|
-      if target = io.delete(sym)
-        io[fd_num] = target
+      if target = io[sym]
+        redirects << [fd_num, redirects.length, target]
       end
     end
     io.each do |k, v|
-      if v.respond_to?(:fileno)
-        if v.fileno != k
-          LibC.close k
-          LibC.dup2 v.fileno, k
+      if k.kind_of? Integer
+        redirects << [k, redirects.length, v]
+      end
+    end
+    
+    # Perform the redirections.
+    redirects.sort!
+    redirects.each do |fd_num, _, target|    
+      if target.respond_to?(:fileno)
+        # IO stream.
+        if target.fileno != fd_num
+          LibC.close fd_num
+          LibC.dup2 target.fileno, fd_num
         end
       else
-        LibC.close k
-        open_fd = IO.sysopen(v, 'r+')
-        if open_fd != k
-          LibC.dup2 open_fd, k
+        # Filename string.
+        LibC.close fd_num
+        open_fd = IO.sysopen(target, 'r+')
+        if open_fd != fd_num
+          LibC.dup2 open_fd, fd_num
           LibC.close open_fd
         end
       end
     end
     
-    # Close all file descriptors.
+    # Close all file descriptors not in the redirection table.
+    redirected_fds = Set.new redirects.map(&:first)
     max_fd = LibC.getdtablesize
     0.upto(max_fd) do |fd|
-      next if io[fd]
-      LibC.close fd
+      LibC.close fd unless redirected_fds.include?(fd)
     end
   end
   

data/spec/exec_sandbox/sandbox_spec.rb

@@ -8,23 +8,44 @@ describe ExecSandbox::Sandbox do
       @temp_in.close
       @temp_out = Tempfile.new 'exec_sandbox_rspec'
       @temp_out.close
-      
-      ExecSandbox.use do |s|
-        @result = s.run bin_fixture(:duplicate), :in => @temp_in.path,
-                                                 :out => @temp_out.path
-      end
     end
     after do
       @temp_in.unlink
       @temp_out.unlink
     end
 
-    it 'should not crash' do
-      @result[:exit_code].should == 0
+    describe 'duplicate.rb' do
+      before do
+        ExecSandbox.use do |s|
+          @result = s.run bin_fixture(:duplicate), :in => @temp_in.path,
+                                                   :out => @temp_out.path
+        end
+      end
+
+      it 'should not crash' do
+        @result[:exit_code].should == 0
+      end
+      
+      it 'should produce the correct result' do
+        File.read(@temp_out.path).should == "I/O test\nI/O test\n" 
+      end
     end
-    
-    it 'should produce the correct result' do
-      File.read(@temp_out.path).should == "I/O test\nI/O test\n" 
+
+    describe 'count.rb' do
+      before do
+        ExecSandbox.use do |s|
+          @result = s.run [bin_fixture(:count), '9'], :in => @temp_in.path,
+              :out => @temp_out.path, :err => :out
+        end
+      end
+      
+      it 'should not crash' do
+        @result[:exit_code].should == 0
+      end
+      
+      it 'should produce the correct result' do
+        File.read(@temp_out.path).should == (1..9).map { |i| "#{i}\n" }.join('')
+      end
     end
   end
   
@@ -61,6 +82,22 @@ describe ExecSandbox::Sandbox do
         @result[:out_data].should == "S" * buffer_size
       end
     end
+    
+    describe 'count.rb' do
+      before do
+        ExecSandbox.use do |s|
+          @result = s.run [bin_fixture(:count), '9'], :err => :out
+        end
+      end
+      
+      it 'should not crash' do
+        @result[:exit_code].should == 0
+      end
+      
+      it 'should produce the correct result' do
+        @result[:out_data].should == (1..9).map { |i| "#{i}\n" }.join('')
+      end
+    end
   end
   
   

data/spec/exec_sandbox/spawn_spec.rb

@@ -69,6 +69,35 @@ describe ExecSandbox::Spawn do
         @status[:exit_code].should_not == 0
       end
     end
+    
+    shared_examples_for 'count.rb' do
+      it 'should not crash' do
+        @status[:exit_code].should == 0
+      end
+      
+      it 'should write successfully' do
+        @temp_out.open
+        begin
+          @temp_out.read.should == (1..9).map { |i| "#{i}\n" }.join('')
+        ensure
+          @temp_out.close
+        end
+      end
+    end
+
+    describe 'with file descriptor and stderr redirected to stdout' do
+      before do
+        File.open(@temp_in.path, 'r') do |in_io|
+          File.open(@temp_out.path, 'w') do |out_io|
+            pid = ExecSandbox::Spawn.spawn [bin_fixture(:count), '9'],
+                {:in => in_io, :out => out_io, :err => STDOUT}
+            @status = ExecSandbox::Wait4.wait4 pid
+          end
+        end
+      end
+
+      it_behaves_like 'count.rb'
+    end
   end
 
   describe '#spawn principal' do

data/spec/fixtures/count.rb

@@ -0,0 +1,12 @@
+#!/usr/bin/env ruby
+
+# Counts from 1 to the first argument, and writes each number on a separate
+# line. Odd numbers go to STDOUT, even numbers go to STDERR. 
+# on both STDOUT and STDERR.
+
+limit = ARGV[0].to_i
+1.upto(limit) do |i|
+  file = (i % 2 == 0) ? STDERR : STDOUT
+  file.write "#{i}\n"
+  file.flush
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: exec_sandbox
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-12-20 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
-  requirement: &15824600 !ruby/object:Gem::Requirement
+  requirement: &26627980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.0.11
   type: :runtime
   prerelease: false
-  version_requirements: *15824600
+  version_requirements: *26627980
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &15824120 !ruby/object:Gem::Requirement
+  requirement: &26627380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *15824120
+  version_requirements: *26627380
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &15823640 !ruby/object:Gem::Requirement
+  requirement: &26626760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *15823640
+  version_requirements: *26626760
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &15823160 !ruby/object:Gem::Requirement
+  requirement: &26626260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 0.7.2
   type: :development
   prerelease: false
-  version_requirements: *15823160
+  version_requirements: *26626260
 - !ruby/object:Gem::Dependency
   name: yard-rspec
-  requirement: &15822680 !ruby/object:Gem::Requirement
+  requirement: &26625740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0.1'
   type: :development
   prerelease: false
-  version_requirements: *15822680
+  version_requirements: *26625740
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &15822200 !ruby/object:Gem::Requirement
+  requirement: &26625220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: 1.0.21
   type: :development
   prerelease: false
-  version_requirements: *15822200
+  version_requirements: *26625220
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &15821720 !ruby/object:Gem::Requirement
+  requirement: &26624740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *15821720
+  version_requirements: *26624740
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &15821240 !ruby/object:Gem::Requirement
+  requirement: &26624240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *15821240
+  version_requirements: *26624240
 description: Temporary users and groups, rlimits
 email: costan@gmail.com
 executables: []
@@ -128,6 +128,7 @@ files:
 - spec/exec_sandbox/wait4_spec.rb
 - spec/fixtures/buffer.rb
 - spec/fixtures/churn.rb
+- spec/fixtures/count.rb
 - spec/fixtures/duplicate.rb
 - spec/fixtures/exit_arg.rb
 - spec/fixtures/fork.rb
@@ -150,7 +151,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3240483873242314683
+      hash: -1397950588643828772
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -159,7 +160,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.12
 signing_key: 
 specification_version: 3
 summary: Run foreign binaries using POSIX sandboxing features