safe_image 0.3.0 → 0.4.0

data/lib/safe_image/image_magick_backend.rb

@@ -5,147 +5,171 @@ module SafeImage
     module_function
 
     DEFAULT_PROFILE = File.expand_path("RT_sRGB.icm", __dir__)
-    DECODERS = {
-      "jpg" => "jpeg",
-      "jpeg" => "jpeg",
-      "png" => "png",
-      "gif" => "gif",
-      "webp" => "webp",
-      "heic" => "heic",
-      "heif" => "heic",
-      "avif" => "heic",
-      "ico" => "ico",
-      "jxl" => "jxl"
-    }.freeze
-
-    IMAGEMAGICK_LIMIT_ARGS = [
-      "-limit", "memory", "256MiB",
-      "-limit", "map", "512MiB",
-      "-limit", "disk", "1GiB",
-      "-limit", "area", "128MP",
-      "-limit", "time", "20",
-      "-limit", "thread", "2"
+
+    IMAGEMAGICK_LIMIT_ARGS = %w[
+      -limit
+      memory
+      256MiB
+      -limit
+      map
+      512MiB
+      -limit
+      disk
+      1GiB
+      -limit
+      area
+      128MP
+      -limit
+      time
+      20
+      -limit
+      thread
+      2
     ].freeze
 
     ALLOWED_FONTS = %w[NimbusSans-Regular DejaVu-Sans Liberation-Sans Arial Helvetica Adwaita-Sans].freeze
 
     def probe(path, timeout: Runner::DEFAULT_TIMEOUT, max_pixels: nil)
       raise UnsupportedFormatError, "ImageMagick identify not available" unless Runner.available?("identify")
-      path = PathSafety.ensure_imagemagick_input_file!(path)
-      ext = File.extname(path).delete_prefix(".").downcase
-      decoder = DECODERS.fetch(ext) { raise UnsupportedFormatError, "unsupported ImageMagick input format: #{ext.inspect}" }
-      stdout, = Runner.run!(["identify", *IMAGEMAGICK_LIMIT_ARGS, "-ping", "-format", "%m %w %h %n\n", "#{decoder}:#{path}"], timeout: timeout)
+      input, ext, input_arg = imagemagick_input(path, frame: nil)
+      stdout, =
+        Runner.run!(
+          ["identify", *IMAGEMAGICK_LIMIT_ARGS, "-ping", "-format", "%m %w %h %n\n", input_arg],
+          timeout: timeout,
+          read: [input]
+        )
       _magick_format, width, height, frames = stdout.each_line.first.to_s.split
       width = width.to_i
       height = height.to_i
       if max_pixels && width * height > Integer(max_pixels)
         raise LimitError, "image has #{width * height} pixels, exceeds #{max_pixels}"
       end
-      { input_format: ext == "jpeg" ? "jpg" : ext, width: width, height: height, frames: frames.to_i, duration_ms: 0.0 }
+      { input_format: Formats.normalize(ext), width: width, height: height, frames: frames.to_i, duration_ms: 0.0 }
     end
 
     def thumbnail(input:, output:, width:, height:, format:, quality:, timeout: Runner::DEFAULT_TIMEOUT)
-      resize_like(input: input, output: output, width: width, height: height, format: format, quality: quality, crop: :centre, timeout: timeout)
+      resize_like(
+        input: input,
+        output: output,
+        width: width,
+        height: height,
+        format: format,
+        quality: quality,
+        crop: :centre,
+        timeout: timeout
+      )
     end
 
     def resize_like(input:, output:, width:, height:, format:, quality:, crop: false, timeout: Runner::DEFAULT_TIMEOUT)
       command = convert_command
 
-      input = PathSafety.ensure_imagemagick_input_file!(input)
-      output = PathSafety.ensure_safe_output_path!(output).to_s
-      output = PathSafety.ensure_imagemagick_safe!(output)
-      ext = File.extname(input).delete_prefix(".").downcase
-      decoder = DECODERS.fetch(ext) { raise UnsupportedFormatError, "unsupported ImageMagick input format: #{ext.inspect}" }
+      input, ext, input_arg = imagemagick_input(input, frame: 0)
+      output, output_arg = imagemagick_output(format, output)
 
       quality = validate_quality!(quality)
-      argv = [command, *IMAGEMAGICK_LIMIT_ARGS, "#{decoder}:#{input}[0]", "-auto-orient"]
+      argv = [command, *IMAGEMAGICK_LIMIT_ARGS, input_arg, "-auto-orient"]
       if crop == :north
-        argv.concat([
-          "-gravity", "north",
-          "-background", "transparent",
-          "-thumbnail", "#{Integer(width)}x#{Integer(height)}^",
-          "-crop", "#{Integer(width)}x#{Integer(height)}+0+0",
-          "-unsharp", "2x0.5+0.7+0",
-          "-interlace", "none"
-        ])
+        argv.concat(
+          [
+            "-gravity",
+            "north",
+            "-background",
+            "transparent",
+            "-thumbnail",
+            "#{Integer(width)}x#{Integer(height)}^",
+            "-crop",
+            "#{Integer(width)}x#{Integer(height)}+0+0",
+            "-unsharp",
+            "2x0.5+0.7+0",
+            "-interlace",
+            "none"
+          ]
+        )
       else
-        argv.concat([
-          "-gravity", "center",
-          "-background", "transparent",
-          "-thumbnail", "#{Integer(width)}x#{Integer(height)}^",
-          "-extent", "#{Integer(width)}x#{Integer(height)}",
-          "-interpolate", "catrom",
-          "-unsharp", "2x0.5+0.7+0",
-          "-interlace", "none"
-        ])
+        argv.concat(
+          [
+            "-gravity",
+            "center",
+            "-background",
+            "transparent",
+            "-thumbnail",
+            "#{Integer(width)}x#{Integer(height)}^",
+            "-extent",
+            "#{Integer(width)}x#{Integer(height)}",
+            "-interpolate",
+            "catrom",
+            "-unsharp",
+            "2x0.5+0.7+0",
+            "-interlace",
+            "none"
+          ]
+        )
       end
       argv.concat(["-profile", DEFAULT_PROFILE]) if File.file?(DEFAULT_PROFILE)
       argv.concat(["-quality", quality.to_s]) if quality
-      argv << output_spec(format, output)
+      argv << output_arg
 
-      run_image_command(argv, output, ext, format, timeout)
+      run_image_command(argv, output, ext, format, timeout, read: [input])
     end
 
     def downsize(input:, output:, dimensions:, format:, timeout: Runner::DEFAULT_TIMEOUT)
       command = convert_command
 
-      input = PathSafety.ensure_imagemagick_input_file!(input)
-      output = PathSafety.ensure_safe_output_path!(output).to_s
-      output = PathSafety.ensure_imagemagick_safe!(output)
-      ext = File.extname(input).delete_prefix(".").downcase
-      decoder = DECODERS.fetch(ext) { raise UnsupportedFormatError, "unsupported ImageMagick input format: #{ext.inspect}" }
+      input, ext, input_arg = imagemagick_input(input, frame: 0)
+      output, output_arg = imagemagick_output(format, output)
       dimensions = validate_dimensions!(dimensions)
       argv = [
-        command, *IMAGEMAGICK_LIMIT_ARGS, "#{decoder}:#{input}[0]",
+        command,
+        *IMAGEMAGICK_LIMIT_ARGS,
+        input_arg,
         "-auto-orient",
-        "-gravity", "center",
-        "-background", "transparent",
-        "-interlace", "none",
-        "-resize", dimensions,
+        "-gravity",
+        "center",
+        "-background",
+        "transparent",
+        "-interlace",
+        "none",
+        "-resize",
+        dimensions
       ]
       argv.concat(["-profile", DEFAULT_PROFILE]) if File.file?(DEFAULT_PROFILE)
-      argv << output_spec(format, output)
-      run_image_command(argv, output, ext, format, timeout)
+      argv << output_arg
+      run_image_command(argv, output, ext, format, timeout, read: [input])
     end
 
     def convert(input:, output:, format:, quality: nil, timeout: Runner::DEFAULT_TIMEOUT)
       command = convert_command
-      input = PathSafety.ensure_imagemagick_input_file!(input)
-      output = PathSafety.ensure_safe_output_path!(output).to_s
-      output = PathSafety.ensure_imagemagick_safe!(output)
-      ext = File.extname(input).delete_prefix(".").downcase
-      decoder = DECODERS.fetch(ext) { raise UnsupportedFormatError, "unsupported ImageMagick input format: #{ext.inspect}" }
-      normalized_format = format.to_s.downcase
-      normalized_format = "jpg" if normalized_format == "jpeg"
-      output_arg = output_spec(normalized_format, output)
+      input, ext, input_arg = imagemagick_input(input, frame: 0)
+      normalized_format = Formats.normalize(format)
+      output, output_arg = imagemagick_output(normalized_format, output)
       quality = validate_quality!(quality)
 
-      argv = [command, *IMAGEMAGICK_LIMIT_ARGS, "#{decoder}:#{input}[0]", "-auto-orient", "-interlace", "none"]
-      argv.concat(["-background", "white", "-flatten"]) if normalized_format == "jpg"
+      argv = [command, *IMAGEMAGICK_LIMIT_ARGS, input_arg, "-auto-orient", "-interlace", "none"]
+      argv.concat(%w[-background white -flatten]) if normalized_format == "jpg"
       argv.concat(["-quality", quality.to_s]) if quality
       argv << output_arg
-      run_image_command(argv, output, ext, normalized_format, timeout)
-    end
-
-    def convert_to_jpeg(input:, output:, quality: nil, timeout: Runner::DEFAULT_TIMEOUT)
-      convert(input: input, output: output, format: "jpg", quality: quality, timeout: timeout)
+      run_image_command(argv, output, ext, normalized_format, timeout, read: [input])
     end
 
     def convert_ico_to_png(input:, output:, timeout: Runner::DEFAULT_TIMEOUT)
       command = convert_command
-      input = PathSafety.ensure_imagemagick_input_file!(input)
-      output = PathSafety.ensure_safe_output_path!(output).to_s
-      output = PathSafety.ensure_imagemagick_safe!(output)
-      argv = [command, *IMAGEMAGICK_LIMIT_ARGS, "ico:#{input}[-1]", "-auto-orient", "-background", "transparent", output_spec("png", output)]
-      run_image_command(argv, output, "ico", "png", timeout)
+      input, ext, input_arg = imagemagick_input(input, frame: -1)
+      raise UnsupportedFormatError, "convert_favicon_to_png requires ico input, got #{ext.inspect}" unless ext == "ico"
+
+      output, output_arg = imagemagick_output("png", output)
+      argv = [command, *IMAGEMAGICK_LIMIT_ARGS, input_arg, "-auto-orient", "-background", "transparent", output_arg]
+      run_image_command(argv, output, "ico", "png", timeout, read: [input])
     end
 
     def frame_count(path, timeout: Runner::DEFAULT_TIMEOUT, max_pixels: nil)
       raise UnsupportedFormatError, "ImageMagick identify not available" unless Runner.available?("identify")
-      path = PathSafety.ensure_imagemagick_input_file!(path)
-      ext = File.extname(path).delete_prefix(".").downcase
-      decoder = DECODERS.fetch(ext) { raise UnsupportedFormatError, "unsupported ImageMagick input format: #{ext.inspect}" }
-      stdout, = Runner.run!(["identify", *IMAGEMAGICK_LIMIT_ARGS, "-ping", "-format", "%w %h %n\n", "#{decoder}:#{path}"], timeout: timeout)
+      input, _ext, input_arg = imagemagick_input(path, frame: nil)
+      stdout, =
+        Runner.run!(
+          ["identify", *IMAGEMAGICK_LIMIT_ARGS, "-ping", "-format", "%w %h %n\n", input_arg],
+          timeout: timeout,
+          read: [input]
+        )
       width, height, frames = stdout.each_line.first.to_s.split.map(&:to_i)
       if max_pixels && width.to_i * height.to_i > Integer(max_pixels)
         raise LimitError, "image has #{width * height} pixels, exceeds #{max_pixels}"
@@ -155,37 +179,52 @@ module SafeImage
 
     def orientation(path, timeout: Runner::DEFAULT_TIMEOUT)
       raise UnsupportedFormatError, "ImageMagick identify not available" unless Runner.available?("identify")
-      path = PathSafety.ensure_imagemagick_input_file!(path)
-      ext = File.extname(path).delete_prefix(".").downcase
-      decoder = DECODERS.fetch(ext) { raise UnsupportedFormatError, "unsupported ImageMagick input format: #{ext.inspect}" }
-      stdout, = Runner.run!(
-        ["identify", *IMAGEMAGICK_LIMIT_ARGS, "-ping", "-format", "%[EXIF:Orientation]", "#{decoder}:#{path}[0]"],
-        timeout: timeout
-      )
+      input, _ext, input_arg = imagemagick_input(path, frame: 0)
+      stdout, =
+        Runner.run!(
+          ["identify", *IMAGEMAGICK_LIMIT_ARGS, "-ping", "-format", "%[EXIF:Orientation]", input_arg],
+          timeout: timeout,
+          read: [input]
+        )
       value = stdout.to_s.strip
       value.empty? ? 1 : value.to_i
-    rescue CommandError
+    rescue CommandError => e
+      raise unless missing_orientation_property?(e)
+
       1
     end
 
+    def missing_orientation_property?(error)
+      return false unless error.category == :exit_status
+
+      detail = [error.stderr, error.stdout, error.message].join("\n")
+      detail.match?(/EXIF:Orientation|unknown image property|no such (?:property|attribute)|undefined/i)
+    end
+
     # Averages the whole image down to one pixel and reports it as an RRGGBB
-    # hex string, mirroring Discourse's Upload#calculate_dominant_color!.
+    # hex string.
     def dominant_color(path, timeout: Runner::DEFAULT_TIMEOUT)
       command = convert_command
-      path = PathSafety.ensure_imagemagick_input_file!(path)
-      ext = File.extname(path).delete_prefix(".").downcase
-      decoder = DECODERS.fetch(ext) { raise UnsupportedFormatError, "unsupported ImageMagick input format: #{ext.inspect}" }
-      stdout, = Runner.run!(
-        [
-          command, *IMAGEMAGICK_LIMIT_ARGS, "#{decoder}:#{path}[0]",
-          "-depth", "8",
-          "-resize", "1x1",
-          "-define", "histogram:unique-colors=true",
-          "-format", "%c",
-          "histogram:info:"
-        ],
-        timeout: timeout
-      )
+      input, _ext, input_arg = imagemagick_input(path, frame: 0)
+      stdout, =
+        Runner.run!(
+          [
+            command,
+            *IMAGEMAGICK_LIMIT_ARGS,
+            input_arg,
+            "-depth",
+            "8",
+            "-resize",
+            "1x1",
+            "-define",
+            "histogram:unique-colors=true",
+            "-format",
+            "%c",
+            "histogram:info:"
+          ],
+          timeout: timeout,
+          read: [input]
+        )
 
       # Typical output: `1: (110,116,93) #6F745E srgb(110,116,93)`. Alpha adds
       # two more hex digits; grayscale images report one channel (two digits,
@@ -193,66 +232,86 @@ module SafeImage
       digits = stdout[/#(\h+)/, 1]
       hex =
         case digits&.length
-        when 6, 8 then digits[0, 6]
-        when 2, 4 then digits[0, 2] * 3
+        when 6, 8
+          digits[0, 6]
+        when 2, 4
+          digits[0, 2] * 3
         end
-      raise InvalidImageError, "could not parse dominant color from ImageMagick output: #{stdout.strip.inspect}" if hex.nil?
+      if hex.nil?
+        raise InvalidImageError, "could not parse dominant color from ImageMagick output: #{stdout.strip.inspect}"
+      end
       hex.upcase
     end
 
-    def letter_avatar(output:, size:, background_rgb:, letter:, pointsize:, font: "NimbusSans-Regular", timeout: Runner::DEFAULT_TIMEOUT)
+    def letter_avatar(
+      output:,
+      size:,
+      background_rgb:,
+      letter:,
+      pointsize:,
+      font: "NimbusSans-Regular",
+      timeout: Runner::DEFAULT_TIMEOUT
+    )
       command = convert_command
-      output = PathSafety.ensure_safe_output_path!(output).to_s
-      output = PathSafety.ensure_imagemagick_safe!(output)
+      output, output_arg = imagemagick_output("png", output)
       rgb = Array(background_rgb).map { |v| Integer(v) }
       raise ArgumentError, "background_rgb must have three channels" unless rgb.length == 3
       glyph = letter.to_s.each_grapheme_cluster.first.to_s.gsub("%", "%%")
       font_name = font.to_s
-      raise ArgumentError, "unsupported font: #{font_name.inspect}" unless ALLOWED_FONTS.include?(font_name)
+      if ALLOWED_FONTS.none? { |candidate| candidate == font_name }
+        raise ArgumentError, "unsupported font: #{font_name.inspect}"
+      end
 
       argv = [
-        command, *IMAGEMAGICK_LIMIT_ARGS,
-        "-size", "#{Integer(size)}x#{Integer(size)}",
+        command,
+        *IMAGEMAGICK_LIMIT_ARGS,
+        "-size",
+        "#{Integer(size)}x#{Integer(size)}",
         "xc:rgb(#{rgb[0]},#{rgb[1]},#{rgb[2]})",
-        "-pointsize", Integer(pointsize).to_s,
-        "-fill", "#FFFFFFCC",
-        "-font", font_name,
-        "-gravity", "Center",
-        "-annotate", "-0+34", glyph,
-        "-depth", "8",
-        output_spec("png", output)
+        "-pointsize",
+        Integer(pointsize).to_s,
+        "-fill",
+        "#FFFFFFCC",
+        "-font",
+        font_name,
+        "-gravity",
+        "Center",
+        "-annotate",
+        "-0+34",
+        glyph,
+        "-depth",
+        "8",
+        output_arg
       ]
       run_image_command(argv, output, "generated", "png", timeout)
     end
 
-    def fix_orientation(input:, output: input, timeout: Runner::DEFAULT_TIMEOUT)
+    def fix_orientation(input:, output:, timeout: Runner::DEFAULT_TIMEOUT)
       command = convert_command
+      input, ext, input_arg = imagemagick_input(input, frame: 0)
+      output, output_arg = imagemagick_output(ext, output)
+      argv = [command, *IMAGEMAGICK_LIMIT_ARGS, input_arg, "-auto-orient", output_arg]
+      run_image_command(argv, output, ext, ext, timeout, read: [input])
+    end
+
+    def imagemagick_input(input, frame:)
       input = PathSafety.ensure_imagemagick_input_file!(input)
+      ext = Formats.extension(input)
+      decoder = Formats.imagemagick_decoder(ext)
+      frame_suffix = frame.nil? ? "" : "[#{Integer(frame)}]"
+      [input, ext, "#{decoder}:#{input}#{frame_suffix}"]
+    end
+
+    def imagemagick_output(format, output)
       output = PathSafety.ensure_safe_output_path!(output).to_s
       output = PathSafety.ensure_imagemagick_safe!(output)
-      ext = File.extname(input).delete_prefix(".").downcase
-      decoder = DECODERS.fetch(ext) { raise UnsupportedFormatError, "unsupported ImageMagick input format: #{ext.inspect}" }
-      argv = [command, *IMAGEMAGICK_LIMIT_ARGS, "#{decoder}:#{input}[0]", "-auto-orient", output_spec(ext, output)]
-      run_image_command(argv, output, ext, ext, timeout)
-    end
+      normalized = Formats.normalize(format)
+      ext = Formats.extension(output)
+      unless ext == normalized
+        raise UnsupportedFormatError, "output extension #{ext.inspect} does not match format #{normalized.inspect}"
+      end
 
-    def output_spec(format, output)
-      ext = File.extname(output).delete_prefix(".").downcase
-      ext = "jpg" if ext == "jpeg"
-      normalized = format.to_s.downcase
-      normalized = "jpg" if normalized == "jpeg"
-      raise UnsupportedFormatError, "output extension #{ext.inspect} does not match format #{normalized.inspect}" unless ext == normalized
-
-      coder = {
-        "jpg" => "jpeg",
-        "png" => "png",
-        "gif" => "gif",
-        "webp" => "webp",
-        "avif" => "avif",
-        "ico" => "ico",
-        "jxl" => "jxl"
-      }.fetch(normalized) { raise UnsupportedFormatError, "unsupported ImageMagick output format: #{normalized.inspect}" }
-      "#{coder}:#{output}"
+      [output, "#{Formats.imagemagick_output_coder(normalized)}:#{output}"]
     end
 
     def validate_quality!(quality)
@@ -264,12 +323,10 @@ module SafeImage
 
     def validate_dimensions!(dimensions)
       dimensions = dimensions.to_s
-      patterns = [
-        /\A\d+(?:\.\d+)?%\z/,
-        /\A\d+x\d+[!<>^]?\z/,
-        /\A\d+@\z/
-      ]
-      raise ArgumentError, "unsupported ImageMagick geometry: #{dimensions.inspect}" unless patterns.any? { |pattern| pattern.match?(dimensions) }
+      patterns = [/\A\d+(?:\.\d+)?%\z/, /\A\d+x\d+[!<>^]?\z/, /\A\d+@\z/]
+      unless patterns.any? { |pattern| pattern.match?(dimensions) }
+        raise ArgumentError, "unsupported ImageMagick geometry: #{dimensions.inspect}"
+      end
       dimensions
     end
 
@@ -279,17 +336,17 @@ module SafeImage
       raise UnsupportedFormatError, "ImageMagick convert/magick not available"
     end
 
-    def run_image_command(argv, output, input_format, output_format, timeout)
+    def run_image_command(argv, output, input_format, output_format, timeout, read: [])
       started = Process.clock_gettime(Process::CLOCK_MONOTONIC)
-      Runner.run!(argv, timeout: timeout)
+      Runner.run!(argv, timeout: timeout, read: read, write: [File.dirname(output), output])
       duration_ms = (Process.clock_gettime(Process::CLOCK_MONOTONIC) - started) * 1000
 
-      # Output dimensions via the fast native header read, or identify when
-      # libvips is not installed (this backend must work without it).
-      info = VipsGlue.available? ? Native.probe(output) : probe(output)
+      # Output dimensions via the helper's native header read, or identify when
+      # the helper is unavailable (this backend must work without libvips).
+      info = Native.available? ? Native.probe(output) : probe(output)
       {
-        input_format: input_format == "jpeg" ? "jpg" : input_format,
-        output_format: output_format == "jpeg" ? "jpg" : output_format,
+        input_format: input_format == "generated" ? "generated" : Formats.normalize(input_format),
+        output_format: Formats.normalize(output_format),
         width: info.fetch(:width),
         height: info.fetch(:height),
         duration_ms: duration_ms