bwrap 1.0.0.pre.alpha5 → 1.0.0.pre.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dfb5f9bdbcf68df6068aebca204e72ef9272829b1f8db11c34e5a4da469cc2c7
-  data.tar.gz: 5f19c25ecad9b7f4923f80a6d61c87c6382671667f6b39eed0198befbb8eccd2
+  metadata.gz: db6e7253c0a896975954c0d649c68321958ade750f891f353ba30b9ea58880cb
+  data.tar.gz: 90f384499e8727660b9810711e0237ce604f8ef219ed415c210db16bcd764804
 SHA512:
-  metadata.gz: c9682aff2b43180fee0e8d7b2b7234d4bb516e86c85dcabc5b40a1047284f9f5bf9e0641dff80483e4645b8aa4bd06c9b9de8ba1b43cd78af3b77de1060c8ad6
-  data.tar.gz: cadd731077ff175b86cf0d56f17dd1c2cb3123e5d9b1dcff17156da5d706d7da12274bc59297ae925c1f07ea5b3a325c999c942048c2c5b165755934ae16d2f8
+  metadata.gz: 03e6873b068e52bc0c9fbbc072f9fc1a411696ca3c09aabcee05c8e660e5a210030c13fab84348aee720e7bd431600a0b18c3be124dfcb955ac95c250d83aeec
+  data.tar.gz: 4183575c47d740dd74c88995add7b87366299e75b4a8edaa89c20d422cd73cbd957b411e5bd51b9c9eabcd3881d8af1ba85922ce806b2387d75a0f30d8abd377

data/CHANGELOG.md

@@ -1,5 +1,18 @@
 # Changes
 
+## 1.0.0-beta1 (12.12.2021)
+
+* optimist gem is now optional dependency
+* Added Config#env_paths and Config#add_env_path
+* Added Config#command_inside_root
+* Added Bwrap#run_inside_root convenience method
+* Execution#command_available?: added env_path_var argument
+* Execution#which: added env_path_var argument
+* Be able to resolve /usr/bin/env to real executable
+* Try to avoid duplicate library binds
+* Added Config#extra_executables
+* Added Config::Features::Bash
+
 ## 1.0.0-alpha5 (29.11.2021)
 
 * Execution#command_available?: support absolute paths

data/lib/bwrap/args/args.rb

@@ -2,7 +2,11 @@
 
 require "bwrap/version"
 
-# bwrap argument related operations.
+# Classes that are used for building arguments.
+#
+# @note Classes inside here are kind of pseudo-internal API.
+#   In future, there may be some use for classes inside here, but for now they are
+#   only used internally.
 module Bwrap::Args
   # Nya.
 end

data/lib/bwrap/args/bind/library.rb

@@ -0,0 +1,125 @@
+# frozen_string_literal: true
+
+require "bwrap/execution/path"
+require "bwrap/output"
+require_relative "../library"
+require_relative "mime"
+
+class Bwrap::Args::Bind
+  # TODO: documentation
+  #
+  # @api private
+  class Library
+    include Bwrap::Execution::Path
+    include Bwrap::Output
+
+    # @see Bwrap::Args::Construct#command=
+    #
+    # @see (see Bwrap::Args::Construct#command=)
+    attr_writer :command
+
+    # Instance of {Bwrap::Config}.
+    attr_writer :config
+
+    # Instance of {Bwrap::Args::Environment}.
+    attr_writer :environment
+
+    attr_writer :executable_name
+
+    attr_writer :executable_path
+
+    def initialize args
+      @args = args
+    end
+
+    def extra_executables_mounts
+      return unless @config&.extra_executables
+
+      @config.extra_executables.each do |executable|
+        @executable_name = resolve_executable_name executable
+        @executable_path = resolve_executable_path @executable_name, not_inside_root: true
+
+        @args.append %W{ --ro-bind #{@executable_path} #{@executable_path} }
+
+        resolve_executable_libraries
+      end
+    end
+
+    # Convenience method to call {#resolve_executable_libraries}.
+    #
+    # Used by {#handle_system_mounts}.
+    def libs_command_requires
+      @executable_name = resolve_executable_name @command
+      @executable_path = resolve_executable_path @executable_name
+
+      # Actually add the executable to be bound to the sandbox.
+      unless @config&.command_inside_root
+        @args.append %W{ --ro-bind #{@executable_path} #{@executable_path} }
+      end
+
+      resolve_executable_libraries
+    end
+
+    # Does some inspection to find out libraries given executable needs in order to work.
+    #
+    # @warning scanelf does not play with spaces in names well. This method assumes that libraries
+    #   have no spaces in names, though binaries can have.
+    #
+    # @todo Ensure scanelf is available (and throw proper error if it is not, telling to not use
+    #   full_system_mounts option.)
+    def resolve_executable_libraries
+      trace "Resolving executable libraries of #{@executable_path}"
+
+      # TODO: Put this behind additional flag for extra control/sanity.
+      # Some executables are shell scripts and similar. For them we need to use the interpreter.
+
+      mime = Mime.new @executable_name, @executable_path
+      return unless mime.resolve_mime_type
+
+      # Then find out required libraries
+
+      library_mounts = []
+
+      library_object = ::Bwrap::Args::Library.new
+      libraries = library_object.libraries_needed_by mime.executable_path
+
+      # TODO: following is bad?
+      #library_object.needed_libraries(mime.executable_path).each do |library|
+      libraries.each do |library|
+        library_mounts << "--ro-bind" << library << library
+      end
+
+      @args.append library_mounts
+    end
+
+    # Used by {#libs_command_requires}.
+    private def resolve_executable_name command
+      if command.is_a? String
+        return command
+      end
+
+      # Array-like.
+      if command.respond_to? :at
+        return command.at(0)
+      end
+
+      raise "Can’t recognize type of given command. Type: #{command.class}"
+    end
+
+    # @warning Requires environment paths to be resolved beforehand.
+    #
+    # Used by {#libs_command_requires}.
+    private def resolve_executable_path executable_name, not_inside_root: nil
+      if @config&.command_inside_root.nil? or not_inside_root
+        return which executable_name
+      end
+
+      paths = @environment.env_paths.map do |path|
+        "#{@config.root}/#{path}"
+      end
+      env_path = paths.join ":"
+
+      which executable_name, env_path_var: env_path
+    end
+  end
+end

data/lib/bwrap/args/bind/mime.rb

@@ -0,0 +1,58 @@
+# frozen_string_literal: true
+
+require "bwrap/execution"
+require "bwrap/output"
+
+class Bwrap::Args::Bind
+  # Inner class to clean up namespace for implementation specific reasons.
+  #
+  # @api private
+  class Mime
+    include Bwrap::Execution
+    include Bwrap::Output
+
+    # Name given to {#initialize}.
+    attr_reader :executable_name
+
+    # Either path given to {#initialize} or one parsed from shebang.
+    attr_reader :executable_path
+
+    def initialize executable_name, executable_path
+      @executable_name = executable_name
+      @executable_path = executable_path
+    end
+
+    # Used by {Bwrap::Args::Bind::Library#libs_command_requires}.
+    #
+    # @return false if caller should also return
+    def resolve_mime_type
+      mime_type = execvalue %W{ file --brief --mime-type #{@executable_path} }
+      trace "Mime type of #{@executable_path} is #{mime_type}"
+      return true unless mime_type[0..6] == "text/x-"
+
+      shebang = File.open @executable_path, &:readline
+      if shebang[0..1] != "#!"
+        warn "Executable #{@executable_name} was recognized as #{mime_type} but does not have " \
+             "proper shebang line. Skipping automatic library mounts."
+        return false
+      end
+
+      resolve_real_executable shebang
+
+      true
+    end
+
+    private def resolve_real_executable shebang
+      command_line = shebang.delete_prefix("#!").strip
+      real_executable, args = command_line.split " ", 2
+
+      if [ "/usr/bin/env", "/bin/env" ].include? real_executable
+        # First argument is name of the executable, resolved from PATH.
+        executable_name = args.split(" ", 2).first
+        real_executable = which executable_name
+      end
+
+      @executable_path = real_executable
+    end
+  end
+end

data/lib/bwrap/args/bind.rb

@@ -3,7 +3,7 @@
 require "bwrap/execution"
 require "bwrap/output"
 require_relative "args"
-require_relative "library"
+require_relative "bind/library"
 
 # Bind arguments for bwrap.
 class Bwrap::Args::Bind
@@ -18,52 +18,12 @@ class Bwrap::Args::Bind
   # @see (see Bwrap::Args::Construct#command=)
   attr_writer :command
 
-  # Instance of {Config}.
+  # Instance of {Bwrap::Config}.
   attr_writer :config
 
   # Instance of {Bwrap::Args::Environment}.
   attr_writer :environment
 
-  # Inner class to clean up namespace for implementation specific reasons.
-  #
-  # @api internal
-  class Mime
-    include Bwrap::Execution
-    include Bwrap::Output
-
-    # Name given to {#initialize}.
-    attr_reader :executable_name
-
-    # Either path given to {#initialize} or one parsed from shebang.
-    attr_reader :executable_path
-
-    def initialize executable_name, executable_path
-      @executable_name = executable_name
-      @executable_path = executable_path
-    end
-
-    # Used by {Bwrap::Args::Bind#libs_command_requires}.
-    #
-    # @return false if caller should also return
-    def resolve_mime_type
-      mime_type = execvalue %W{ file --brief --mime-type #{@executable_path} }
-      return true unless mime_type[0..6] == "text/x-"
-
-      shebang = File.open @executable_path, &:readline
-      if shebang[0..1] != "#!"
-        warn "Executable #{@executable_name} was recognized as #{mime_type} but does not have " \
-             "proper shebang line. Skipping automatic library mounts."
-        return false
-      end
-
-      shebang = shebang.delete_prefix("#!").strip
-      real_executable, _args = shebang.split " ", 2
-      @executable_path = real_executable
-
-      true
-    end
-  end
-
   # Arguments to bind /dev/dri from host to sandbox.
   def bind_dev_dri
     @args.append %w{ --dev-bind /dev/dri /dev/dri }
@@ -99,13 +59,13 @@ class Bwrap::Args::Bind
   end
 
   # Arguments to read-only bind whole system inside sandbox.
-  def full_system_mounts
+  def handle_system_mounts
     bindir_mounts = []
     binaries_from = @config.binaries_from
     binaries_from.each do |path|
       bindir_mounts << "--ro-bind" << path << path
     end
-    @environment["PATH"] = binaries_from.join(":")
+    @environment.add_to_path binaries_from
 
     @args.append bindir_mounts
 
@@ -117,10 +77,13 @@ class Bwrap::Args::Bind
 
     libdir_mounts
 
+    library_bind = construct_library_bind
+
+    library_bind.extra_executables_mounts
+
     return unless @config.full_system_mounts
 
-    loader_binds
-    libs_command_requires
+    library_bind.libs_command_requires
   end
 
   # These are something user can specify to do custom --ro-bind binds.
@@ -135,7 +98,12 @@ class Bwrap::Args::Bind
     @args.append binds
   end
 
-  # Used by {#full_system_mounts}.
+  # Performs cleanup operations after execution.
+  def cleanup
+    Bwrap::Args::Library.clear_needed_libraries_cache
+  end
+
+  # Used by {#handle_system_mounts}.
   private def libdir_mounts
     return unless @config.libdir_mounts
 
@@ -155,49 +123,12 @@ class Bwrap::Args::Bind
     @args.append libdir_mounts
   end
 
-  # Used by {#full_system_mounts}.
-  private def loader_binds
-    loader_mounts = []
-    path = "/lib64/ld-linux-x86-64.so.2"
-    loader_mounts << "--ro-bind" << path << path if File.exist? path
-    path = "/lib/ld-linux.so.2"
-    loader_mounts << "--ro-bind" << path << path if File.exist? path
-
-    @args.append loader_mounts
-  end
-
-  # Does some inspection to find out libraries given executable needs in order to work.
-  #
-  # Used by {#full_system_mounts}.
-  #
-  # @warning scanelf does not play with spaces in names well. This method assumes that libraries
-  #   have no spaces in names, though binaries can have.
-  #
-  # @todo Ensure scanelf is available (and throw proper error if it is not, telling to not use
-  #   full_system_mounts option.)
-  private def libs_command_requires
-    executable_name = @command.is_a?(String) && @command || @command[0]
-    executable_path = which executable_name
-
-    # TODO: Put this behind additional flag for extra control/sanity.
-    # Some executables are shell scripts and similar. For them we need to use the interpreter.
-
-    mime = Mime.new executable_name, executable_path
-    return unless mime.resolve_mime_type
-
-    # Then find out required libraries
-
-    library_mounts = []
-
-    library_object = Bwrap::Args::Library.new
-    libraries = library_object.libraries_needed_by mime.executable_path
-
-    # TODO: following is bad?
-    #library_object.needed_libraries(mime.executable_path).each do |library|
-    libraries.each do |library|
-      library_mounts << "--ro-bind" << library << library
-    end
+  private def construct_library_bind
+    library_bind = Bwrap::Args::Bind::Library.new @args
+    library_bind.command = @command
+    library_bind.config = @config
+    library_bind.environment = @environment
 
-    @args.append library_mounts
+    library_bind
   end
 end

data/lib/bwrap/args/construct.rb

@@ -22,7 +22,7 @@ class Bwrap::Args::Construct
   #   setting {Config#full_system_mounts=} uses this to resolve some
   #   additional data.
   #
-  # @param command [Array, String] Command with arguments
+  # @param value [Array, String] Command with arguments
   attr_writer :command
 
   # Constructs arguments for bwrap execution.
@@ -35,7 +35,7 @@ class Bwrap::Args::Construct
     machine_id = @machine_id.machine_id
     @args.append machine_id if machine_id
     resolv_conf
-    @bind.full_system_mounts
+    @bind.handle_system_mounts
     @features.feature_binds
     @bind.custom_read_only_binds
     create_user_dir
@@ -60,6 +60,7 @@ class Bwrap::Args::Construct
   # Performs cleanup operations after execution.
   def cleanup
     @machine_id&.cleanup
+    @bind&.cleanup
   end
 
   # Used by {#construct_bwrap_args}.

data/lib/bwrap/args/environment.rb

@@ -10,15 +10,46 @@ class Bwrap::Args::Environment < Hash
   # Instance of {Config}.
   attr_writer :config
 
-  # Returns used environment variables.
+  # Returns used environment variables wrapped as bwrap arguments.
   def environment_variables
     if debug?
       debug "Passing following environment variables to bwrap:\n" \
             "#{self}"
     end
 
+    env_paths
+
     map do |key, value|
+      if key == "PATH" and value.respond_to? :join
+        value = value.join ":"
+      end
+
       [ "--setenv", key, value ]
     end
   end
+
+  # @return [Array] All environment paths added via {Config#add_env_path} and other parsing logic
+  def env_paths
+    if @config.env_paths.respond_to? :each
+      self["PATH"] ||= []
+
+      self["PATH"] |= @config.env_paths
+    end
+
+    self["PATH"]
+  end
+
+  # Adds given paths to PATH environment variable defined in the sandbox.
+  #
+  # @param elements [String, Array] Path(s) to be added added to PATH environment variable
+  def add_to_path elements
+    self["PATH"] ||= []
+
+    if elements.respond_to? :each
+      self["PATH"] += elements
+    else
+      # Expecting elements to be single path element as a string.
+      self["PATH"] << elements
+    end
+  end
 end

data/lib/bwrap/args/features.rb

@@ -10,8 +10,30 @@ require_relative "library"
 class Bwrap::Args::Features < Hash
   include Bwrap::Output
 
-  # @api internal
+  # Implementation for Bash feature set.
+  #
+  # @api private
+  class BashBinds
+    # Mounts stuff like /bin/bash.
+    def bash_mounts
+      mounts = []
+
+      if File.file? "/bin/bash"
+        mounts << "--ro-bind" << "/bin/bash" << "/bin/bash"
+      end
+      if File.file? "/usr/bin/bash"
+        mounts << "--ro-bind" << "/usr/bin/bash" << "/usr/bin/bash"
+      end
+
+      mounts
+    end
+  end
+
+  # Implementation for Ruby feature set.
+  #
+  # @api private
   class RubyBinds
+    # Returns mounts needed by Ruby feature set.
     attr_reader :mounts
 
     # Bind system paths so scripts works inside sandbox.
@@ -40,19 +62,34 @@ class Bwrap::Args::Features < Hash
           library_mounts << "--ro-bind" << requisite_library << requisite_library
         end
       end
+
+      library_mounts
     end
   end
 
-  # {Array} of parameters passed to bwrap.
+  # `Array` of parameters passed to bwrap.
   attr_writer :args
 
   # Instance of {Config}.
   attr_writer :config
 
+  # Resolves binds required by different features.
+  #
+  # Currently implemented feature sets:
+  # - ruby
   def feature_binds
+    bash_binds
     ruby_binds
   end
 
+  private def bash_binds
+    return unless @config.features.bash.enabled?
+
+    binds = BashBinds.new
+
+    @args.append binds.bash_mounts
+  end
+
   # @note This does not allow development headers needed for compilation for now.
   #   I’ll look at it after I have an use for it.
   private def ruby_binds
@@ -61,6 +98,6 @@ class Bwrap::Args::Features < Hash
     binds = RubyBinds.new
 
     @args.append binds.sitedir_mounts
-    @args.append binds.stdlib_mounts @config.features.ruby.stdlib
+    @args.append binds.stdlib_mounts(@config.features.ruby.stdlib)
   end
 end

data/lib/bwrap/args/library.rb

@@ -6,7 +6,7 @@ require_relative "args"
 
 # Class to clean up namespace for implementation specific reasons.
 #
-# @api internal
+# @api private
 class Bwrap::Args::Library
   include Bwrap::Execution
   include Bwrap::Output
@@ -14,6 +14,11 @@ class Bwrap::Args::Library
   # NOTE: This caching can be made more efficient, but need to look at it later, what to do about it.
   @@needed_libraries_cache ||= []
 
+  # Empties {@@needed_libraries_cache}.
+  def self.clear_needed_libraries_cache
+    @@needed_libraries_cache.clear
+  end
+
   # Otherwise similar to {#needed_libraries}, but checks used libc to handle musl executables.
   #
   # @param executable [String] Path to the executable to find dependencies for
@@ -99,17 +104,17 @@ class Bwrap::Args::Library
     binary_path, libraries_line = line.split "::SEPARATOR::"
     libraries = libraries_line.split ","
 
-    @needed_libraries += libraries
+    (@needed_libraries & libraries).each do |library|
+      verb "Binding #{library} as dependency of #{binary_path}"
+    end
+
+    @needed_libraries |= libraries
 
     # Also check if requisite libraries needs some libraries.
     inner = Bwrap::Args::Library.new
-    @needed_libraries += inner.needed_libraries libraries
+    @needed_libraries |= inner.needed_libraries libraries
 
-    # Mark library cached only after its dependencies have been also handled.
-    libraries.each do |library|
-      verb "Binding #{library} as dependency of #{binary_path}"
-      @@needed_libraries_cache << library
-    end
+    @@needed_libraries_cache |= libraries
   end
 
   # Used by {#musl_needed_libraries}.
@@ -120,11 +125,13 @@ class Bwrap::Args::Library
     matches = library_data.match(/(.*) \(0x[0-9a-f]+\)/)
     library_path = matches[1]
 
-    @needed_libraries << library_path
+    unless @needed_libraries.include? library_path
+      @needed_libraries << library_path
+    end
 
     # Also check if requisite libraries needs some libraries.
     inner = Bwrap::Args::Library.new
-    @needed_libraries += inner.musl_needed_libraries library_path
+    @needed_libraries |= inner.musl_needed_libraries library_path
   end
 end
 # class Library ended

data/lib/bwrap/args/machine_id.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "securerandom"
+require "tempfile"
 
 require "bwrap/output"
 require_relative "args"
@@ -51,7 +52,7 @@ class Bwrap::Args::MachineId
     debug "Using random machine id as /etc/machine-id"
 
     @machine_id_file = Tempfile.new "bwrap-random_machine_id-", @config.tmpdir
-    @machine_id_file.write SecureRandom.uuid.gsub("-", "")
+    @machine_id_file.write SecureRandom.uuid.delete("-", "")
     @machine_id_file.flush
 
     %W{ --ro-bind-data #{machine_id_file.fileno} /etc/machine-id }