dynamic_image 2.0.24 → 2.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6828f7825142e16348273c97f77cda19d191849ff09e545174c8bb445372257e
-  data.tar.gz: 480ebd62de3ddf2a780971b1b63c1ef545dff59f7f54ee1f7ede5ebef33a485b
+  metadata.gz: 88946bb221af4be324495c5cbce15352b0dac30c805cc26539278849c84203c7
+  data.tar.gz: dec702cf571d58550096276cdd4149c2764f848755c57d5dd6dbed9d842f92e6
 SHA512:
-  metadata.gz: 95279e2367c7f8639be599e3717fd815bcf4f482a59ab3bcafd1e51aac3ce7c86621a1f694a2dfced38473de1b73fde9e7396a085d7e0cc6a335270267ddccfb
-  data.tar.gz: 62e6c9b6b440a51855ae1d5a89bb2b85fab6c126603aa5e0b08f58b372bf7007ddb3e5eb7c9d910a2bb0ee59a0fb217711e706e5adbdb19008f0e97d9ec67087
+  metadata.gz: f1a20baa94b4629f9a1772a745cb6a26910e9d01696d13df1678498449f0c0a7cd1f06c3a143b2f117b0ec340c84333063aaf59bbc4ca8b95e71a95f861a6726
+  data.tar.gz: fec483b01c6025ddb6c6037bbd6655fadc33516216d3d0f83945f7417a2418de53d8b0bdd53b34b768084b76cd7660893c36c6f50453a49a076a2e34061562c9

data/README.md

@@ -31,6 +31,7 @@ and enumeration attacks.
 * Rails 5
 * Ruby 2.4+
 * ImageMagick command line tools
+* ExifTool
 
 ## Documentation
 

data/lib/dynamic_image.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require "mini_exiftool"
 require "mini_magick"
 require "dis"
 require "vector2d"
@@ -19,5 +20,5 @@ require "dynamic_image/processed_image"
 require "dynamic_image/routing"
 
 module DynamicImage
-  cattr_accessor :digest_verifier
+  cattr_accessor :digest_verifier, :process_later_limit
 end

data/lib/dynamic_image/controller.rb

@@ -44,16 +44,33 @@ module DynamicImage
     private
 
     def cache_expiration_header
-      expires_in 30.days, public: true if response.status == 200
+      expires_in 1.year, public: true if response.status == 200
     end
 
     def find_record
       @record = model.find(params[:id])
     end
 
+    def process_and_send(image, options)
+      processed_image = DynamicImage::ProcessedImage.new(image, options)
+      if process_later?(processed_image, requested_size)
+        process_later(image, options, requested_size)
+        head 503, retry_after: 10
+      else
+        send_image(processed_image, requested_size)
+      end
+    end
+
+    def process_later(image, options, requested_size)
+      DynamicImage::Jobs::CreateVariant
+        .perform_later(image, options, requested_size.to_s)
+    end
+
     def process_later?(processed_image, size)
+      return false unless DynamicImage.process_later_limit
+
       image_size = processed_image.record.size.x * processed_image.record.size.y
-      image_size > 12_500_000 &&
+      image_size > DynamicImage.process_later_limit &&
         !processed_image.find_variant(size)
     end
 
@@ -66,7 +83,7 @@ module DynamicImage
                  layout: false, locals: { options: options })
         end
         format.any(:gif, :jpeg, :jpg, :png, :tiff, :webp) do
-          send_image(@record, options)
+          process_and_send(@record, options)
         end
       end
     end
@@ -88,17 +105,10 @@ module DynamicImage
       params[:format]
     end
 
-    def send_image(image, options)
-      processed_image = DynamicImage::ProcessedImage.new(image, options)
-      if process_later?(processed_image, requested_size)
-        DynamicImage::Jobs::CreateVariant
-          .perform_later(image, options, requested_size.to_s)
-        head 503, retry_after: 10
-      else
-        send_data(processed_image.cropped_and_resized(requested_size),
-                  content_type: processed_image.content_type,
-                  disposition: "inline")
-      end
+    def send_image(processed_image, requested_size)
+      send_data(processed_image.cropped_and_resized(requested_size),
+                content_type: processed_image.content_type,
+                disposition: "inline")
     end
 
     def verify_signed_params

data/lib/dynamic_image/errors.rb

@@ -3,11 +3,17 @@
 module DynamicImage
   module Errors
     class Error < StandardError; end
+
     class InvalidImage < DynamicImage::Errors::Error; end
+
     class InvalidHeader < DynamicImage::Errors::Error; end
+
     class InvalidSignature < DynamicImage::Errors::Error; end
+
     class InvalidSizeOptions < DynamicImage::Errors::Error; end
+
     class InvalidTransformation < DynamicImage::Errors::Error; end
+
     class ParameterMissing < DynamicImage::Errors::Error; end
   end
 end

data/lib/dynamic_image/image_reader.rb

@@ -21,6 +21,12 @@ module DynamicImage
       @data = data
     end
 
+    def exif
+      raise DynamicImage::Errors::InvalidHeader unless valid_header?
+
+      MiniExiftool.new(string_io)
+    end
+
     def read
       raise DynamicImage::Errors::InvalidHeader unless valid_header?
 
@@ -39,7 +45,11 @@ module DynamicImage
     private
 
     def file_header
-      @file_header ||= StringIO.new(@data, "rb").read(8)
+      @file_header ||= string_io.read(8)
+    end
+
+    def string_io
+      StringIO.new(@data, "rb")
     end
   end
 end

data/lib/dynamic_image/processed_image.rb

@@ -90,7 +90,10 @@ module DynamicImage
     end
 
     def convert_to_srgb(image, combined)
-      combined.profile(srgb_profile) if image.data["profiles"].present?
+      if image.data["profiles"].present? &&
+         exif.colorspacedata&.strip&.downcase == record.colorspace
+        combined.profile(srgb_profile)
+      end
       combined.colorspace("sRGB") if record.cmyk?
     end
 
@@ -111,6 +114,10 @@ module DynamicImage
       end
     end
 
+    def exif
+      @exif ||= DynamicImage::ImageReader.new(record.data).exif
+    end
+
     def format
       @format ||= record_format
     end

data/lib/dynamic_image/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DynamicImage
-  VERSION = "2.0.24"
+  VERSION = "2.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dynamic_image
 version: !ruby/object:Gem::Version
-  version: 2.0.24
+  version: 2.1.3
 platform: ruby
 authors:
 - Inge Jørgensen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-27 00:00:00.000000000 Z
+date: 2021-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dis
@@ -30,6 +30,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.6
+- !ruby/object:Gem::Dependency
+  name: mini_exiftool
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.10'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.10'
 - !ruby/object:Gem::Dependency
   name: mini_magick
   requirement: !ruby/object:Gem::Requirement
@@ -96,16 +110,16 @@ dependencies:
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.7.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.7.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -188,7 +202,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: Rails plugin that simplifies image uploading and processing