cheetah 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 4af5244a54ce65d8ca375a0fd9b868db3cddbaa2
-  data.tar.gz: fd2c672c6ee3a7b19802004b127e26e0f08747f3
+SHA256:
+  metadata.gz: d3e79228df3ba4822704c7f3e81fe0fdbec93a7a36f7935d2b117380470be1ed
+  data.tar.gz: f398f8b357f85c2c7cf8f08a790bb77f586e1d251eba4eea0d97ea940e651517
 SHA512:
-  metadata.gz: 843e3a2137117843ce28075d7278092fc682daa1b01860283aaa2504810b725e36b0a35e342b4f14ebcf4bac09757a0f54dcafe2c7f7057fb57f9310113b80bc
-  data.tar.gz: c51c8b5c470afb34ee59e58ca715515f533aad699ab8dab0ad1e416a71b36a4ed53e01b642e67b4dc778254ceb4be9cdde62d5e82614ba63ffbdbd5c8a72fdcc
+  metadata.gz: 06fbed837fee79bbf04be03355c8c339df1ffdf9d3f005743f6bcc7896a2c4a604a53f723e8cc2f95e6d07db4cd0b6ca105272ab0ac870b6d37d21baa15d4a38
+  data.tar.gz: 1ef2088f550bf7d7bf4c3ea7369fdef6ea3e9a49b36d5f5666f6ddcf449663e484073eb85a47f47f9e5d14b89ba6da13ac7b0065852884fb7fcc7f848f631d11

data/CHANGELOG

@@ -1,3 +1,11 @@
+0.5.1 (2019-10-16)
+------------------
+
+* Implement closing open fds after call to fork (bsc#1151960). This will work
+  only in linux system with mounted /proc. For other Unixes it works as before.
+* drop support for ruby that is EOL (2.3 and lower)
+* Added support for ruby 2.4, 2.5, 2.6
+
 0.5.0 (2015-12-18)
 ------------------
 

data/VERSION

@@ -1 +1 @@
-0.5.0
+0.5.1

data/lib/cheetah.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "abstract_method"
 require "logger"
 require "shellwords"
@@ -142,16 +144,16 @@ module Cheetah
   class DefaultRecorder < Recorder
     # @private
     STREAM_INFO = {
-      stdin:  { name: "Standard input",  method: :info  },
+      stdin: { name: "Standard input", method: :info },
       stdout: { name: "Standard output", method: :info  },
       stderr: { name: "Error output",    method: :error }
-    }
+    }.freeze
 
     def initialize(logger)
       @logger = logger
 
       @stream_used   = { stdin: false, stdout: false, stderr: false }
-      @stream_buffer = { stdin: "",    stdout: "",    stderr: "" }
+      @stream_buffer = { stdin: +"", stdout: +"", stderr: +"" }
     end
 
     def record_commands(commands)
@@ -212,13 +214,13 @@ module Cheetah
 
   # @private
   BUILTIN_DEFAULT_OPTIONS = {
-    stdin:  "",
+    stdin: "",
     stdout: nil,
     stderr: nil,
     logger: nil,
-    env:    {},
+    env: {},
     chroot: "/"
-  }
+  }.freeze
 
   READ  = 0 # @private
   WRITE = 1 # @private
@@ -426,7 +428,7 @@ module Cheetah
       # and nil is an IO-like object. We avoid detecting it directly to allow
       # passing StringIO, mocks, etc.
       {
-        stdin:  !options[:stdin].is_a?(String),
+        stdin: !options[:stdin].is_a?(String),
         stdout: ![nil, :capture].include?(options[:stdout]),
         stderr: ![nil, :capture].include?(options[:stderr])
       }
@@ -434,9 +436,9 @@ module Cheetah
 
     def build_streams(options, streamed)
       {
-        stdin:  streamed[:stdin] ? options[:stdin] : StringIO.new(options[:stdin]),
-        stdout: streamed[:stdout] ? options[:stdout] : StringIO.new(""),
-        stderr: streamed[:stderr] ? options[:stderr] : StringIO.new("")
+        stdin: streamed[:stdin] ? options[:stdin] : StringIO.new(options[:stdin]),
+        stdout: streamed[:stdout] ? options[:stdout] : StringIO.new(+""),
+        stderr: streamed[:stderr] ? options[:stderr] : StringIO.new(+"")
       }
     end
 
@@ -494,7 +496,7 @@ module Cheetah
       return options if [nil, "/"].include?(options[:chroot])
 
       options = options.dup
-      # delete chroot option otherwise in pipe will chroot each fork recursivelly
+      # delete chroot option otherwise in pipe will chroot each fork recursively
       root = options.delete(:chroot)
       Dir.chroot(root)
       # curdir can be outside chroot which is considered as security problem
@@ -520,8 +522,7 @@ module Cheetah
                                       stdout: pipe_to_child,
                                       stderr: pipes[:stderr]
                                     },
-                                    options
-                                   )
+                                    options)
 
             pipes[:stdin][READ].close
             pipes[:stdin][WRITE].close
@@ -532,9 +533,7 @@ module Cheetah
           into_pipe(STDOUT, pipes[:stdout])
           into_pipe(STDERR, pipes[:stderr])
 
-          # All file descriptors from 3 above should be closed here, but since I
-          # don't know about any way how to detect the maximum file descriptor
-          # number portably in Ruby, I didn't implement it. Patches welcome.
+          close_fds
 
           command, *args = commands.last
           with_env(options[:env]) do
@@ -550,6 +549,27 @@ module Cheetah
       end
     end
 
+    # closes all open fds starting with 3 and above
+    def close_fds
+      # note: this will work only if unix has /proc filesystem. If it does not
+      # have it, it won't close other fds.
+      Dir.glob("/proc/self/fd/*").each do |path|
+        fd = File.basename(path).to_i
+        next if (0..2).include?(fd)
+
+        # here we intentionally ignore some failures when fd close failed
+        # rubocop:disable Lint/HandleExceptions
+        begin
+          IO.new(fd).close
+        # Ruby reserves some fds for its VM and it result in this exception
+        rescue ArgumentError
+        # Ignore if close failed with invalid FD
+        rescue Errno::EBADF
+        end
+        # rubocop:enable Lint/HandleExceptions
+      end
+    end
+
     def fork_commands(commands, options)
       pipes = { stdin: IO.pipe, stdout: IO.pipe, stderr: IO.pipe }
 
@@ -595,9 +615,7 @@ module Cheetah
         ios_read, ios_write, ios_error = select(pipes_readable, pipes_writable,
                                                 pipes_readable + pipes_writable)
 
-        if !ios_error.empty?
-          raise IOError, "Error when communicating with executed program."
-        end
+        raise IOError, "Error when communicating with executed program." if !ios_error.empty?
 
         ios_read.each do |pipe|
           begin

data/lib/cheetah/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Cheetah namespace
 module Cheetah
   # Cheetah version (uses [semantic versioning](http://semver.org/)).

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cheetah
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - David Majda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-18 00:00:00.000000000 Z
+date: 2019-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: abstract_method
@@ -42,16 +42,16 @@ dependencies:
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.11
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.11
 description: Your swiss army knife for executing external commands in Ruby safely
   and conveniently.
 email: dmajda@suse.de
@@ -84,11 +84,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Your swiss army knife for executing external commands in Ruby safely and
   conveniently.
 test_files: []
-has_rdoc: