exec_sandbox 0.2.6 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 09f406c9093bf2a8b3fb29e4eff7fb66440212e4
-  data.tar.gz: d1843fe96b2b322628773e4c492aa30876939bb9
+  metadata.gz: a9eb9c9752284a147c878f5271f7eb99d32290cc
+  data.tar.gz: 3e3c90d77b8bec213065c8b5a512a5ab99de8e88
 SHA512:
-  metadata.gz: 72dc4cb65baf9b34dd5329ed9d454e7d9ebc38926337122e5ecba16e851fad4100542130f8e91b032f2543278cd96b5247ca67775a1c551bfab63412eb047bed
-  data.tar.gz: 75139dd187ab0dcb646d1257a4101806480ce6b26911beb1084758e89acebeaae505f8bc9723a7f7372fcf28d608f9764a8f36e8c4bce93021fbc6b5770b08d9
+  metadata.gz: be2d2e056472f27f2f7b8a3add5360e9ae8270a0fc86c1ec02d75080cf61d52f255fd05b7ff5a829b95451598eb090a3f967ce23b082c14d28674478ced13427
+  data.tar.gz: f084d894ad94a4c2d2e1112a5a11e03e6963a85da8a9318510d581c6162ff61acc8d67deaf348510a136ec8bca21a352fb292906d917c7f9778c5fa8d4a3a903

data/Gemfile

@@ -1,14 +1,14 @@
 source 'https://rubygems.org'
 
 # Add dependencies required to use your gem here.
-gem 'ffi', '>= 1.9.3'
+gem 'ffi', '>= 1.9.6'
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
   gem 'rdoc', '>= 3.10'
-  gem 'rspec', '>= 2.14.1'
-  gem 'yard', '>= 0.8.7.3'
+  gem 'rspec', '>= 3.1.0'
+  gem 'yard', '>= 0.8.7.6'
   gem 'yard-rspec', '>= 0.1'
   gem 'bundler', '>= 1.3.5'
   gem 'jeweler', '>= 2.0.1'

data/Gemfile.lock

@@ -1,25 +1,26 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.3.5)
+    addressable (2.3.6)
     builder (3.2.2)
-    descendants_tracker (0.0.3)
+    descendants_tracker (0.0.4)
+      thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.2.5)
-    docile (1.1.3)
+    docile (1.1.5)
     faraday (0.9.0)
       multipart-post (>= 1.2, < 3)
-    ffi (1.9.3)
-    git (1.2.6)
-    github_api (0.11.2)
+    ffi (1.9.6)
+    git (1.2.8)
+    github_api (0.12.2)
       addressable (~> 2.3)
-      descendants_tracker (~> 0.0.1)
+      descendants_tracker (~> 0.0.4)
       faraday (~> 0.8, < 0.10)
-      hashie (>= 1.2)
+      hashie (>= 3.3)
       multi_json (>= 1.7.5, < 2.0)
-      nokogiri (~> 1.6.0)
+      nokogiri (~> 1.6.3)
       oauth2
-    hashie (2.0.5)
-    highline (1.6.20)
+    hashie (3.3.1)
+    highline (1.6.21)
     jeweler (2.0.1)
       builder
       bundler (>= 1.0)
@@ -30,38 +31,42 @@ GEM
       rake
       rdoc
     json (1.8.1)
-    jwt (0.1.11)
-      multi_json (>= 1.5)
-    mini_portile (0.5.2)
-    multi_json (1.8.4)
+    jwt (1.0.0)
+    mini_portile (0.6.1)
+    multi_json (1.10.1)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
-    nokogiri (1.6.1)
-      mini_portile (~> 0.5.0)
-    oauth2 (0.9.3)
+    nokogiri (1.6.4.1)
+      mini_portile (~> 0.6.0)
+    oauth2 (1.0.0)
       faraday (>= 0.8, < 0.10)
-      jwt (~> 0.1.8)
+      jwt (~> 1.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (~> 1.2)
     rack (1.5.2)
-    rake (10.1.1)
-    rdoc (4.1.1)
+    rake (10.3.2)
+    rdoc (4.1.2)
       json (~> 1.4)
-    rspec (2.14.1)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.7)
-    rspec-expectations (2.14.5)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.5)
-    simplecov (0.8.2)
+    rspec (3.1.0)
+      rspec-core (~> 3.1.0)
+      rspec-expectations (~> 3.1.0)
+      rspec-mocks (~> 3.1.0)
+    rspec-core (3.1.7)
+      rspec-support (~> 3.1.0)
+    rspec-expectations (3.1.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.1.0)
+    rspec-mocks (3.1.3)
+      rspec-support (~> 3.1.0)
+    rspec-support (3.1.2)
+    simplecov (0.9.1)
       docile (~> 1.1.0)
-      multi_json
+      multi_json (~> 1.0)
       simplecov-html (~> 0.8.0)
     simplecov-html (0.8.0)
-    yard (0.8.7.3)
+    thread_safe (0.3.4)
+    yard (0.8.7.6)
     yard-rspec (0.1)
       yard
 
@@ -70,10 +75,10 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (>= 1.3.5)
-  ffi (>= 1.9.3)
+  ffi (>= 1.9.6)
   jeweler (>= 2.0.1)
   rdoc (>= 3.10)
-  rspec (>= 2.14.1)
+  rspec (>= 3.1.0)
   simplecov
-  yard (>= 0.8.7.3)
+  yard (>= 0.8.7.6)
   yard-rspec (>= 0.1)

data/VERSION

@@ -1 +1 @@
-0.2.6
+0.3.0

data/exec_sandbox.gemspec

@@ -2,14 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+# stub: exec_sandbox 0.3.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "exec_sandbox"
-  s.version = "0.2.6"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib"]
   s.authors = ["Victor Costan"]
-  s.date = "2014-02-06"
+  s.date = "2014-11-19"
   s.description = "Temporary users and groups, rlimits"
   s.email = "costan@gmail.com"
   s.extra_rdoc_files = [
@@ -49,37 +51,36 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/pwnall/exec_sandbox"
   s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = "2.0.14"
+  s.rubygems_version = "2.4.4"
   s.summary = "Run foreign binaries using POSIX sandboxing features"
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<ffi>, [">= 1.9.3"])
+      s.add_runtime_dependency(%q<ffi>, [">= 1.9.6"])
       s.add_development_dependency(%q<rdoc>, [">= 3.10"])
-      s.add_development_dependency(%q<rspec>, [">= 2.14.1"])
-      s.add_development_dependency(%q<yard>, [">= 0.8.7.3"])
+      s.add_development_dependency(%q<rspec>, [">= 3.1.0"])
+      s.add_development_dependency(%q<yard>, [">= 0.8.7.6"])
       s.add_development_dependency(%q<yard-rspec>, [">= 0.1"])
       s.add_development_dependency(%q<bundler>, [">= 1.3.5"])
       s.add_development_dependency(%q<jeweler>, [">= 2.0.1"])
       s.add_development_dependency(%q<simplecov>, [">= 0"])
     else
-      s.add_dependency(%q<ffi>, [">= 1.9.3"])
+      s.add_dependency(%q<ffi>, [">= 1.9.6"])
       s.add_dependency(%q<rdoc>, [">= 3.10"])
-      s.add_dependency(%q<rspec>, [">= 2.14.1"])
-      s.add_dependency(%q<yard>, [">= 0.8.7.3"])
+      s.add_dependency(%q<rspec>, [">= 3.1.0"])
+      s.add_dependency(%q<yard>, [">= 0.8.7.6"])
       s.add_dependency(%q<yard-rspec>, [">= 0.1"])
       s.add_dependency(%q<bundler>, [">= 1.3.5"])
       s.add_dependency(%q<jeweler>, [">= 2.0.1"])
       s.add_dependency(%q<simplecov>, [">= 0"])
     end
   else
-    s.add_dependency(%q<ffi>, [">= 1.9.3"])
+    s.add_dependency(%q<ffi>, [">= 1.9.6"])
     s.add_dependency(%q<rdoc>, [">= 3.10"])
-    s.add_dependency(%q<rspec>, [">= 2.14.1"])
-    s.add_dependency(%q<yard>, [">= 0.8.7.3"])
+    s.add_dependency(%q<rspec>, [">= 3.1.0"])
+    s.add_dependency(%q<yard>, [">= 0.8.7.6"])
     s.add_dependency(%q<yard-rspec>, [">= 0.1"])
     s.add_dependency(%q<bundler>, [">= 1.3.5"])
     s.add_dependency(%q<jeweler>, [">= 2.0.1"])

data/lib/exec_sandbox/wait4.rb

@@ -9,21 +9,41 @@ module Wait4
   #                     this process
   # @return [Hash] exit code and resource usage information
   def self.wait4(pid)
-    status_ptr = FFI::MemoryPointer.new :int
-    rusage = ExecSandbox::Wait4::Rusage.new
-    returned_pid = LibC.wait4(pid, status_ptr, 0, rusage.pointer)
-    raise SystemCallError, FFI.errno if returned_pid < 0
-    status = { bits: status_ptr.read_int }
-    status_ptr.free
+    _wait4 pid, 0
+  end
 
-    signal_code = status[:bits] & 0x7f
-    status[:exit_code] = (signal_code != 0) ? -signal_code : status[:bits] >> 8
-    status[:user_time] = rusage[:ru_utime_sec] +
-                         rusage[:ru_utime_usec] * 0.000_001
-    status[:system_time] = rusage[:ru_stime_sec] +
-                           rusage[:ru_stime_usec] * 0.000_001
-    status[:rss] = rusage[:ru_maxrss] / 1024.0
-    return status
+  # Collects a child process' exit status and resource usage.
+  #
+  # @param [Fixnum] pid the PID of the process to wait for; should be a child of
+  #                     this process
+  # @return [Hash] exit code and resource usage information; nil if the process
+  #   hasn't terminated
+  def self.wait4_nonblock(pid)
+    _wait4 pid, WNOHANG
+  end
+
+  class <<self
+    # @private
+    def _wait4(pid, options)
+      status_ptr = FFI::MemoryPointer.new :int
+      rusage = ExecSandbox::Wait4::Rusage.new
+      returned_pid = LibC.wait4(pid, status_ptr, options, rusage.pointer)
+      raise SystemCallError, FFI.errno if returned_pid < 0
+      return nil if returned_pid == 0
+
+      status = { bits: status_ptr.read_int }
+      status_ptr.free
+
+      signal_code = status[:bits] & 0x7f
+      status[:exit_code] = (signal_code != 0) ? -signal_code : status[:bits] >> 8
+      status[:user_time] = rusage[:ru_utime_sec] +
+                           rusage[:ru_utime_usec] * 0.000_001
+      status[:system_time] = rusage[:ru_stime_sec] +
+                             rusage[:ru_stime_usec] * 0.000_001
+      status[:rss] = rusage[:ru_maxrss] / 1024.0
+      return status
+    end
+    private :_wait4
   end
 
   # Maps wait4 in libc.
@@ -34,6 +54,9 @@ module Wait4
                     blocking: true
   end  # module ExecSandbox::Wait4::Libc
 
+  # Option passed to LibC::wait4.
+  WNOHANG = 1
+
   # Maps struct rusage in sys/resource.h, used by wait4.
   class Rusage < FFI::Struct
     # Total amount of user time used.

data/spec/exec_sandbox/wait4_spec.rb

@@ -7,30 +7,30 @@ describe ExecSandbox::Wait4 do
         pid = Kernel.fork { Process.exec bin_fixture(:exit_arg), '42' }
         @status = ExecSandbox::Wait4.wait4 pid
       end
-      
+
       it 'should have the correct exit status' do
         @status[:exit_code].should == 42
       end
-      
+
       it 'should not take more than 1s of user time' do
         @status[:user_time].should < 1
       end
-      
+
       it 'should not take more than 1s of system time' do
         @status[:system_time].should < 1
       end
     end
-    
+
     describe 'churn.rb' do
       before do
         pid = Kernel.fork { Process.exec bin_fixture(:churn), '', '2' }
         @status = ExecSandbox::Wait4.wait4 pid
       end
-      
+
       it 'should have the correct exit status' do
         @status[:exit_code].should == 0
       end
-      
+
       it 'should not take more than 3s of user time' do
         @status[:user_time].should < 3
       end
@@ -38,10 +38,44 @@ describe ExecSandbox::Wait4 do
       it 'should not take less than 1s of user time' do
         @status[:user_time].should > 1
       end
-      
+
       it 'should not take more than 1s of system time' do
         @status[:system_time].should < 1
       end
     end
   end
+
+  describe '#wait4_nonblock' do
+    describe 'churn.rb' do
+      before do
+        @pid = Kernel.fork { Process.exec bin_fixture(:churn), '', '1' }
+      end
+
+      after do
+        begin
+          ExecSandbox::Wait4.wait4 @pid
+        rescue Errno::ECHILD
+          # The child's status has already been reaped.
+        end
+      end
+
+      it 'returns nil when wait4 would block' do
+        ExecSandbox::Wait4.wait4_nonblock(@pid).should == nil
+      end
+
+      it 'does not block' do
+        t_start = Time.now
+        ExecSandbox::Wait4.wait4_nonblock @pid
+        t_end = Time.now
+        (t_end - t_start).should < 0.1
+      end
+
+      it 'returns resource usage data if called after the process ends' do
+        sleep 2
+        status = ExecSandbox::Wait4.wait4_nonblock @pid
+        status[:user_time].should > 0.5
+        status[:user_time].should < 2
+      end
+    end
+  end
 end

metadata

@@ -1,125 +1,125 @@
 --- !ruby/object:Gem::Specification
 name: exec_sandbox
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.3.0
 platform: ruby
 authors:
 - Victor Costan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-06 00:00:00.000000000 Z
+date: 2014-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.9.3
+        version: 1.9.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.9.3
+        version: 1.9.6
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.10'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.14.1
+        version: 3.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.14.1
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.7.3
+        version: 0.8.7.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.7.3
+        version: 0.8.7.6
 - !ruby/object:Gem::Dependency
   name: yard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.5
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.1
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Temporary users and groups, rlimits
@@ -130,9 +130,9 @@ extra_rdoc_files:
 - LICENSE.txt
 - README.rdoc
 files:
-- .document
-- .project
-- .rspec
+- ".document"
+- ".project"
+- ".rspec"
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -169,17 +169,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.4.4
 signing_key: 
 specification_version: 4
 summary: Run foreign binaries using POSIX sandboxing features