image_processing 2.0.2 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5a11a590332eebc08eff9b2cc0ff0436ff8ab42c6bee6e85034232d8e5425700
-  data.tar.gz: 983201e5b89000e91f299f4f25cfa861673e6a552f5f751d336bf45b12f3b534
+  metadata.gz: a52c42f1463cc15caf0dfe57bc8a5efeb464006a2a29bbf1b8c842ada339e4aa
+  data.tar.gz: 2344e1015b02f4b24363371d8877bdcc4fb28b9fb820e15d2e2446f7874443c6
 SHA512:
-  metadata.gz: 762c39caba0bfba8f5b00eb3334308a0a3fd79f602301e087cc7e53acb38dc416ad8bd547d6779636c966c25fbf689c75d306394ca01a93d8dfe13e5fb902ac6
-  data.tar.gz: 94e92fff8dddd41a3651ee85e58bdcdc94d293fbacf573e62a2ca560ad9c5546f9e79e9e97736948b7daf65478938e15e2e7ffa8a4d7f8a6b55a7ed24e930f14
+  metadata.gz: 90c29ed45d475cc54f814a368e894504f5bc012835ef989d3678568dfb3cd29aca144e88cb17d102ffc82dcbd94c4d46de7d9a5fbc0474c0f6b15c481a1f4bb3
+  data.tar.gz: 8a7f991cf00725e1d5618add34f9b57814e2e273d8b9575f49e61701e80259ac8c2cd61028cdaefc6b4a6694a8a922d2246f5f6b8f7ee7184ff31bd0f8644813

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## 2.1.0 (2026-09-01)
+
+* [minimagick] Add `inherit_fds:` so a loader can name an already-open input (thanks to @flavorjones)
+
+## 2.0.3 (2026-08-06)
+
+* Prevent remote code execution when operation names come from user input, closing bypasses through the `#operation` meta-builder, `#method_missing`, and nested `#send` calls (reported by @szymonsec)
+
+* [minimagick] Prevent remote code execution through unsafe public methods (e.g. `#instance_eval`, `#send`) passed as loader/saver option names
+
 ## 2.0.2 (2026-06-03)
 
 * Raise `LoadError` instead of `ImageProcessing::Error` when soft dependencies are missing (@bdewater-thatch)

data/lib/image_processing/chainable.rb

@@ -86,25 +86,24 @@ module ImageProcessing
     private
 
     # This prevents calling unsafe Ruby core methods such as `Kernel#system`,
-    # which would allow for remote shell execution.
+    # which would allow for remote shell execution. The processor enforces the
+    # same guard when operations are dispatched, which also covers paths that
+    # bypass this early check (e.g. the #operation meta-builder).
+    #
+    # Bang names are rejected here because they are Chainable's execution
+    # shortcut (see #method_missing), not operations to chain.
     def invalid_operation?(name)
-      return true if name.end_with?("!")
-
-      owner = method(name).owner
-      [BasicObject, Kernel, Object, Module].include?(owner)
-    rescue NameError
-      false
+      name.end_with?("!") || ImageProcessing.unsafe_method?(self, name)
     end
 
     # Assume that any unknown method names an operation supported by the
     # processor. Add a bang ("!") if you want processing to be performed.
-    def method_missing(name, *args, &block)
-      return super if name.to_s.end_with?("?")
-      return public_send(name.to_s.chomp("!"), *args, &block).call if name.to_s.end_with?("!")
+    def method_missing(name, ...)
+      return super if name.end_with?("?")
+      return public_send(name.to_s.chomp("!"), ...).call if name.end_with?("!")
 
-      operation(name, *args, &block)
+      operation(name, ...)
     end
-    ruby2_keywords(:method_missing) if respond_to?(:ruby2_keywords, true)
 
     # Empty options which the builder starts with.
     DEFAULT_OPTIONS = {

data/lib/image_processing/mini_magick.rb

@@ -9,11 +9,20 @@ module ImageProcessing
   module MiniMagick
     extend Chainable
 
-    def self.convert_shim(&block)
+    # mini_magick gained `inherit_fds:` on MiniMagick::Shell#execute in 5.4.0.
+    INHERIT_FDS_MINIMUM_VERSION = Gem::Version.new("5.4.0")
+
+    def self.convert_shim(inherit_fds: nil, &block)
+      if inherit_fds && ::MiniMagick.version < INHERIT_FDS_MINIMUM_VERSION
+        raise LoadError, "The `inherit_fds` loader option requires mini_magick #{INHERIT_FDS_MINIMUM_VERSION} or newer, but mini_magick #{::MiniMagick.version} is loaded. Please upgrade the gem."
+      end
+
+      options = inherit_fds ? { inherit_fds: inherit_fds } : {}
+
       if ::MiniMagick.respond_to?(:convert)
-        ::MiniMagick.convert(&block)
+        ::MiniMagick.convert(**options, &block)
       else
-        ::MiniMagick::Tool::Convert.new(&block)
+        ::MiniMagick::Tool::Convert.new(**options, &block)
       end
     end
 
@@ -37,12 +46,16 @@ module ImageProcessing
       # Initializes the image on disk into a MiniMagick::Tool object. Accepts
       # additional options related to loading the image (e.g. geometry).
       # Additionally auto-orients the image to be upright.
-      def self.load_image(path_or_magick, loader: nil, page: nil, geometry: nil, auto_orient: true, **options)
+      # `inherit_fds` names IO objects the tool inherits, so the source may be a
+      # `/dev/fd/N` path. The source stays a path, so `loader`, `page` and
+      # `geometry` still apply to it, which they would not if the caller passed
+      # a pre-built MiniMagick::Tool carrying the descriptor.
+      def self.load_image(path_or_magick, loader: nil, page: nil, geometry: nil, auto_orient: true, inherit_fds: nil, **options)
         if path_or_magick.is_a?(::MiniMagick::Tool)
           magick = path_or_magick
         else
           source_path = path_or_magick
-          magick = ::ImageProcessing::MiniMagick.convert_shim
+          magick = ::ImageProcessing::MiniMagick.convert_shim(inherit_fds: inherit_fds)
 
           Utils.apply_options(magick, **options)
 
@@ -225,6 +238,13 @@ module ImageProcessing
         # Applies options from the provided hash.
         def apply_options(magick, define: {}, **options)
           options.each do |option, value|
+            # Loader/saver option names may come from user input, so guard
+            # against dispatching to unsafe Ruby core methods (e.g. #send,
+            # #instance_eval) that public_send does not block on its own.
+            if ImageProcessing.unsafe_method?(magick, option)
+              raise Error, "#{option.inspect} is not a valid option"
+            end
+
             case value
             when true, nil then magick.public_send(option)
             when false     then magick.public_send(option).+

data/lib/image_processing/processor.rb

@@ -53,6 +53,15 @@ module ImageProcessing
     # operation directly on the accumulator object. This provides a common
     # umbrella above defined macros and direct operations.
     def apply_operation(name, *args, &block)
+      # Chainable performs the same check when operations are built, but that
+      # guard only sees the outer builder method name, so it can be routed
+      # around via the #operation meta-builder, #method_missing, or a nested
+      # #send. This is the single point every operation is finally dispatched
+      # through, so enforcing the guard here closes all of those paths.
+      if ImageProcessing.unsafe_method?(self, name)
+        fail Error, "#{name.inspect} is not a valid operation"
+      end
+
       receiver = respond_to?(name) ? self : @accumulator
 
       if args.last.is_a?(Hash)

data/lib/image_processing/version.rb

@@ -1,3 +1,3 @@
 module ImageProcessing
-  VERSION = "2.0.2"
+  VERSION = "2.1.0"
 end

data/lib/image_processing.rb

@@ -7,6 +7,25 @@ require "image_processing/version"
 module ImageProcessing
   Error = Class.new(StandardError)
 
+  # Method owners considered unsafe to dispatch to when a method name comes
+  # from user input, because they expose Ruby's metaprogramming and shell
+  # primitives (e.g. Kernel#send, Kernel#eval, BasicObject#instance_eval,
+  # Kernel#system). Any name whose implementation is inherited from one of
+  # these should never be treated as an image operation or a loader/saver
+  # option.
+  UNSAFE_METHOD_OWNERS = [BasicObject, Kernel, Object, Module].freeze
+
+  # Whether calling +name+ on +receiver+ would dispatch to an unsafe Ruby core
+  # method rather than a genuine operation. Used as a single, shared guard at
+  # every place where a user-provided name is dispatched via +public_send+.
+  def self.unsafe_method?(receiver, name)
+    UNSAFE_METHOD_OWNERS.include?(receiver.method(name.to_s).owner)
+  rescue NameError
+    # An unknown name is not a Ruby core method, so it is safe to forward to
+    # the receiver (which will reject it if it is not a real operation).
+    false
+  end
+
   autoload :MiniMagick, "image_processing/mini_magick"
   autoload :Vips, "image_processing/vips"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: image_processing
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.1.0
 platform: ruby
 authors:
 - Janko Marohnić
@@ -105,7 +105,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.3
+rubygems_version: 4.0.13
 specification_version: 4
 summary: High-level wrapper for processing images for the web with ImageMagick or
   libvips.