active_storage_validations 3.0.5 → 4.1.0

data/Rakefile

@@ -1,29 +1,27 @@
 # frozen_string_literal: true
 
 begin
-  require 'bundler/setup'
+  require "bundler/setup"
 rescue LoadError
-  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
+  puts "You must `gem install bundler` and `bundle install` to run rake tasks"
 end
 
-require 'rdoc/task'
+require "rdoc/task"
 
 RDoc::Task.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'ActiveStorageValidations'
-  rdoc.options << '--line-numbers'
-  rdoc.rdoc_files.include('README.md')
-  rdoc.rdoc_files.include('lib/**/*.rb')
+  rdoc.rdoc_dir = "rdoc"
+  rdoc.title    = "ActiveStorageValidations"
+  rdoc.options << "--line-numbers"
+  rdoc.rdoc_files.include("README.md")
+  rdoc.rdoc_files.include("lib/**/*.rb")
 end
 
-require 'bundler/gem_tasks'
+require "bundler/gem_tasks"
 
-require 'rake/testtask'
+require "rspec/core/rake_task"
 
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'test'
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = false
+RSpec::Core::RakeTask.new(:spec) do |t|
+  t.pattern = "spec/**/*_spec.rb"
 end
 
-task default: :test
+task default: :spec

data/config/locales/da.yml

@@ -55,6 +55,8 @@ da:
       aspect_ratio_not_x_y: "skal være %{authorized_aspect_ratios} (nuværende fil er %{width}x%{height}px)"
       aspect_ratio_invalid: "har et ugyldigt aspektforhold (gyldige aspektforhold er %{authorized_aspect_ratios})"
       file_not_processable: "identificeres ikke som en gyldig mediefil"
+      audio_missing: "skal have et lydspor"
+      audio_present: "må ikke have et lydspor"
       pages_not_less_than: "sideantal skal være mindre end %{max} (aktuelt sideantal er %{pages})"
       pages_not_less_than_or_equal_to: "sideantal skal være mindre end eller lig med %{max} (aktuelt sideantal er %{pages})"
       pages_not_greater_than: "sideantal skal være større end %{min} (aktuelt sideantal er %{pages})"

data/config/locales/de.yml

@@ -55,6 +55,8 @@ de:
       aspect_ratio_not_x_y: "muss %{authorized_aspect_ratios} sein (aktuelle Datei ist %{width}x%{height}px)"
       aspect_ratio_invalid: "hat ein ungültiges Seitenverhältnis (gültige Seitenverhältnisse sind %{authorized_aspect_ratios})"
       file_not_processable: "wird nicht als gültige Mediendatei identifiziert"
+      audio_missing: "muss eine Audiospur enthalten"
+      audio_present: "darf keine Audiospur enthalten"
       pages_not_less_than: "Die Seitenanzahl muss kleiner als %{max} sein (die aktuelle Seitenanzahl beträgt %{pages})."
       pages_not_less_than_or_equal_to: "Die Seitenanzahl muss kleiner oder gleich %{max} sein (die aktuelle Seitenanzahl beträgt %{pages})."
       pages_not_greater_than: "Die Seitenanzahl muss größer als %{min} sein (die aktuelle Seitenanzahl beträgt %{pages})."

data/config/locales/en-GB.yml

@@ -55,6 +55,8 @@ en-GB:
       aspect_ratio_not_x_y: "must be %{authorized_aspect_ratios} (current file is %{width}x%{height}px)"
       aspect_ratio_invalid: "has an invalid aspect ratio (valid aspect ratios are %{authorized_aspect_ratios})"
       file_not_processable: "is not identified as a valid media file"
+      audio_missing: "must have an audio track"
+      audio_present: "must not have an audio track"
       pages_not_less_than: "page count must be less than %{max} (current page count is %{pages})"
       pages_not_less_than_or_equal_to: "page count must be less than or equal to %{max} (current page count is %{pages})"
       pages_not_greater_than: "page count must be greater than %{min} (current page count is %{pages})"

data/config/locales/en.yml

@@ -55,6 +55,8 @@ en:
       aspect_ratio_not_x_y: "must be %{authorized_aspect_ratios} (current file is %{width}x%{height}px)"
       aspect_ratio_invalid: "has an invalid aspect ratio (valid aspect ratios are %{authorized_aspect_ratios})"
       file_not_processable: "is not identified as a valid media file"
+      audio_missing: "must have an audio track"
+      audio_present: "must not have an audio track"
       pages_not_less_than: "page count must be less than %{max} (current page count is %{pages})"
       pages_not_less_than_or_equal_to: "page count must be less than or equal to %{max} (current page count is %{pages})"
       pages_not_greater_than: "page count must be greater than %{min} (current page count is %{pages})"

data/config/locales/es.yml

@@ -55,6 +55,8 @@ es:
       aspect_ratio_not_x_y: "debe ser %{authorized_aspect_ratios} (el archivo actual es %{width}x%{height}px)"
       aspect_ratio_invalid: "tiene una relación de aspecto inválida (las relaciones de aspecto válidas son %{authorized_aspect_ratios})"
       file_not_processable: "no se identifica como un archivo multimedia válido"
+      audio_missing: "debe tener una pista de audio"
+      audio_present: "no debe tener una pista de audio"
       pages_not_less_than: "el número de páginas debe ser menor que %{max} (el número actual de páginas es %{pages})"
       pages_not_less_than_or_equal_to: "el número de páginas debe ser menor o igual que %{max} (el número actual de páginas es %{pages})"
       pages_not_greater_than: "el número de páginas debe ser mayor que %{min} (el número actual de páginas es %{pages})"

data/config/locales/fr.yml

@@ -55,6 +55,8 @@ fr:
       aspect_ratio_not_x_y: "doit être %{authorized_aspect_ratios} (le fichier actuel est %{width}x%{height}px)"
       aspect_ratio_invalid: "a un rapport d'aspect invalide (les rapports d'aspect valides sont %{authorized_aspect_ratios})"
       file_not_processable: "n'est pas identifié comme un fichier média valide"
+      audio_missing: "doit contenir une piste audio"
+      audio_present: "ne doit pas contenir de piste audio"
       pages_not_less_than: "le nombre de pages doit être inférieur à %{max} (le nombre actuel est de %{pages})"
       pages_not_less_than_or_equal_to: "le nombre de pages doit être inférieur ou égal à %{max} (le nombre actuel est de %{pages})"
       pages_not_greater_than: "le nombre de pages doit être supérieur à %{min} (le nombre actuel est de %{pages})"

data/config/locales/it.yml

@@ -55,6 +55,8 @@ it:
       aspect_ratio_not_x_y: "deve essere %{authorized_aspect_ratios} (il file corrente è %{width}x%{height}px)"
       aspect_ratio_invalid: "ha un formato non valido (i rapporti di aspetto validi sono %{authorized_aspect_ratios})"
       file_not_processable: "non è identificato come file multimediale valido"
+      audio_missing: "deve contenere una traccia audio"
+      audio_present: "non deve contenere una traccia audio"
       pages_not_less_than: "il numero di pagine deve essere inferiore a %{max} (il numero di pagine corrente è %{pages})"
       pages_not_less_than_or_equal_to: "il numero di pagine deve essere inferiore o uguale a %{max} (il numero di pagine corrente è %{pages})"
       pages_not_greater_than: "il numero di pagine deve essere maggiore di %{min} (il numero di pagine corrente è %{pages})"

data/config/locales/ja.yml

@@ -55,6 +55,8 @@ ja:
       aspect_ratio_not_x_y: "のアスペクト比は%{authorized_aspect_ratios}にしてください (添付されたメディアの解像度は%{width}x%{height})"
       aspect_ratio_invalid: "のアスペクト比を検出できません (許可されたアスペクト比は%{authorized_aspect_ratios})"
       file_not_processable: "のメディアを処理できません"
+      audio_missing: "には音声トラックが必要です"
+      audio_present: "に音声トラックを含めることはできません"
       pages_not_less_than: "のページ数は%{max}未満にしてください (添付されたファイルは%{pages}ページ)"
       pages_not_less_than_or_equal_to: "のページ数は%{max}以下にしてください (添付されたファイルは%{pages}ページ)"
       pages_not_greater_than: "のページ数は%{min}より大きくしてください (添付されたファイルは%{pages}ページ)"

data/config/locales/nl.yml

@@ -55,6 +55,8 @@ nl:
       aspect_ratio_not_x_y: "moet %{authorized_aspect_ratios} zijn (huidig bestand is %{width}x%{height}px)"
       aspect_ratio_invalid: "heeft een ongeldige beeldverhouding (geldige beeldverhoudingen zijn %{authorized_aspect_ratios})"
       file_not_processable: "wordt niet geïdentificeerd als een geldig mediabestand"
+      audio_missing: "moet een audiotrack bevatten"
+      audio_present: "mag geen audiotrack bevatten"
       pages_not_less_than: "het aantal pagina's moet kleiner zijn dan %{max} (het huidige aantal pagina's is %{pages})"
       pages_not_less_than_or_equal_to: "het aantal pagina's moet kleiner zijn dan of gelijk zijn aan %{max} (het huidige aantal pagina's is %{pages})"
       pages_not_greater_than: "het aantal pagina's moet groter zijn dan %{min} (het huidige aantal pagina's is %{pages})"

data/config/locales/pl.yml

@@ -55,6 +55,8 @@ pl:
       aspect_ratio_not_x_y: "musi być %{authorized_aspect_ratios} (bieżący plik to %{width}x%{height}px)"
       aspect_ratio_invalid: "ma nieprawidłowy współczynnik kształtu (ważne współczynniki kształtu wynoszą %{authorized_aspect_ratios})"
       file_not_processable: "nie jest identyfikowany jako prawidłowy plik multimedialny"
+      audio_missing: "musi zawierać ścieżkę dźwiękową"
+      audio_present: "nie może zawierać ścieżki dźwiękowej"
       pages_not_less_than: "liczba stron musi być mniejsza niż %{max} (bieżąca liczba stron to %{pages})"
       pages_not_less_than_or_equal_to: "liczba stron musi być mniejsza lub równa %{max} (bieżąca liczba stron to %{pages})"
       pages_not_greater_than: "liczba stron musi być większa niż %{min} (bieżąca liczba stron to %{pages})"

data/config/locales/pt-BR.yml

@@ -55,6 +55,8 @@ pt-BR:
       aspect_ratio_not_x_y: "deve ser %{authorized_aspect_ratios} (o arquivo atual é %{width}x%{height}px)"
       aspect_ratio_invalid: "tem uma proporção inválida (as proporções válidas são %{authorized_aspect_ratios})"
       file_not_processable: "não é identificado como um arquivo de mídia válido"
+      audio_missing: "deve ter uma faixa de áudio"
+      audio_present: "não deve ter uma faixa de áudio"
       pages_not_less_than: "a contagem de páginas deve ser menor que %{max} (a contagem atual de páginas é %{pages})"
       pages_not_less_than_or_equal_to: "a contagem de páginas deve ser menor ou igual a %{max} (a contagem atual de páginas é %{pages})"
       pages_not_greater_than: "a contagem de páginas deve ser maior que %{min} (a contagem atual de páginas é %{pages})"

data/config/locales/ru.yml

@@ -55,6 +55,8 @@ ru:
       aspect_ratio_not_x_y: "должно быть %{authorized_aspect_ratios} (текущий файл %{width}x%{height} пикселей)"
       aspect_ratio_invalid: "имеет недействительное соотношение сторон (действительные соотношения сторон %{authorized_aspect_ratios})"
       file_not_processable: "не идентифицируется как действительный медиафайл"
+      audio_missing: "должен содержать аудиодорожку"
+      audio_present: "не должен содержать аудиодорожку"
       pages_not_less_than: "количество страниц должно быть меньше %{max} (текущее количество страниц %{pages})"
       pages_not_less_than_or_equal_to: "количество страниц должно быть меньше или равно %{max} (текущее количество страниц %{pages})"
       pages_not_greater_than: "количество страниц должно быть больше %{min} (текущее количество страниц %{pages})"

data/config/locales/sv.yml

@@ -55,6 +55,8 @@ sv:
       aspect_ratio_not_x_y: "måste vara% { authorized_aspect_ratios } (nuvarande fil är %{width}x%{height} pixlar)"
       aspect_ratio_invalid: "har ett ogiltigt bildförhållande (giltiga bildförhållanden är %{förväntat_aspect_ratios})"
       file_not_processable: "identifieras inte som en giltig mediefil"
+      audio_missing: "måste innehålla ett ljudspår"
+      audio_present: "får inte innehålla ett ljudspår"
       pages_not_less_than: "sidantal måste vara mindre än %{max} (nuvarande sidantal är %{pages})"
       pages_not_less_than_or_equal_to: "sidantal måste vara mindre än eller lika med %{max} (nuvarande antal sidor är %{pages})"
       pages_not_greater_than: "sidantal måste vara större än %{min} (nuvarande sidantal är %{pages})"

data/config/locales/tr.yml

@@ -55,6 +55,8 @@ tr:
       aspect_ratio_not_x_y: "%{authorized_aspect_ratios} olmalıdır (geçerli dosya %{width}x%{height}px)"
       aspect_ratio_invalid: "geçersiz bir en boy oranına sahiptir (geçerli en boy oranları %{authorized_aspect_ratios})"
       file_not_processable: "geçerli bir medya dosyası olarak tanımlanmadı"
+      audio_missing: "bir ses parçası içermelidir"
+      audio_present: "bir ses parçası içermemelidir"
       pages_not_less_than: "sayfa sayısı %{max} değerinden az olmalıdır (geçerli sayfa sayısı %{pages})"
       pages_not_less_than_or_equal_to: "sayfa sayısı %{max} değerinden az veya eşit olmalıdır (geçerli sayfa sayısı %{pages})"
       pages_not_greater_than: "sayfa sayısı %{min} değerinden fazla olmalıdır (geçerli sayfa sayısı %{pages})"

data/config/locales/uk.yml

@@ -55,6 +55,8 @@ uk:
       aspect_ratio_not_x_y: "повинен бути %{authorized_aspect_ratios} (поточний файл становить %{width}x%{height} пікселям)"
       aspect_ratio_invalid: "має недійсне співвідношення сторін (дійсні співвідношення сторін %{authorized_aspect_ratios})"
       file_not_processable: "не ідентифікується як дійсний медіа-файл"
+      audio_missing: "має містити аудіодоріжку"
+      audio_present: "не має містити аудіодоріжку"
       pages_not_less_than: "кількість сторінок має бути менше %{max} (поточна кількість сторінок %{pages})"
       pages_not_less_than_or_equal_to: "кількість сторінок має бути меншою або дорівнювати %{max} (поточна кількість сторінок становить %{pages})"
       pages_not_greater_than: "кількість сторінок має бути більшою за %{min} (поточна кількість сторінок становить %{pages})"

data/config/locales/vi.yml

@@ -55,6 +55,8 @@ vi:
       aspect_ratio_not_x_y: "phải là %{authorized_aspect_ratios} (tệp hiện tại là %{width}x%{height}px)"
       aspect_ratio_invalid: "có tỷ lệ khung hình không hợp lệ (tỷ lệ khung hình hợp lệ là %{authorized_aspect_ratios})"
       file_not_processable: "không được xác định là tệp phương tiện hợp lệ"
+      audio_missing: "phải có một bản âm thanh"
+      audio_present: "không được chứa bản âm thanh"
       pages_not_less_than: "số trang phải nhỏ hơn %{max} (số trang hiện tại là %{pages})"
       pages_not_less_than_or_equal_to: "số trang phải nhỏ hơn hoặc bằng %{max} (số trang hiện tại là %{pages})"
       pages_not_greater_than: "số trang phải lớn hơn %{min} (số trang hiện tại là %{pages})"

data/config/locales/zh-CN.yml

@@ -55,6 +55,8 @@ zh-CN:
       aspect_ratio_not_x_y: "必须为 %{authorized_aspect_ratios}（当前文件为 %{width} x%{height} 像素)"
       aspect_ratio_invalid: "具有无效的长宽比（有效长宽比为 %{authorized_aspect_ratios})"
       file_not_processable: "未标识为有效的媒体文件"
+      audio_missing: "必须包含音轨"
+      audio_present: "不得包含音轨"
       pages_not_less_than: "页数必须小于 %{max}（当前页数为 %{pages})"
       pages_not_less_than_or_equal_to: "页数必须小于或等于 %{max}（当前页数为 %{pages})"
       pages_not_greater_than: "页数必须大于 %{min}（当前页数为 %{pages})"

data/lib/active_storage_validations/analyzer/audio_analyzer.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require "open3"
 require_relative "shared/asv_ff_probable"
 
 module ActiveStorageValidations

data/lib/active_storage_validations/analyzer/content_type_analyzer/file.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module ActiveStorageValidations
+  # Content-type sniffer using the UNIX {file}[https://en.wikipedia.org/wiki/File_(command)] command.
+  #
+  # Override the binary path with +ActiveStorage.paths[:file]+.
+  class Analyzer::ContentTypeAnalyzer::File < Analyzer::ContentTypeAnalyzer
+    class CommandLineToolNotInstalledError < StandardError; end
+
+    private
+
+    def backend
+      :file
+    end
+
+    def media_from_path(path)
+      instrument("file") do |payload|
+        result = run_command(file_path, "-b", "--mime-type", path, payload: payload)
+        result.success? ? result.stdout.strip : nil
+      end
+    end
+
+    def file_path
+      ActiveStorage.paths[:file] || "file"
+    end
+
+    def missing_backend_error
+      CommandLineToolNotInstalledError.new("file command-line tool is not installed")
+    end
+  end
+end

data/lib/active_storage_validations/analyzer/content_type_analyzer/magika.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+require "json"
+
+module ActiveStorageValidations
+  # Content-type sniffer using the Google {Magika}[https://github.com/google/magika] CLI.
+  #
+  # Override the binary path with +ActiveStorage.paths[:magika]+.
+  class Analyzer::ContentTypeAnalyzer::Magika < Analyzer::ContentTypeAnalyzer
+    class CommandLineToolNotInstalledError < StandardError; end
+
+    private
+
+    def backend
+      :magika
+    end
+
+    def media_from_path(path)
+      instrument("magika") do |payload|
+        result = run_command(magika_path, "--json", path, payload: payload)
+        result.success? ? mime_type_from_magika_json(result.stdout) : nil
+      end
+    end
+
+    def mime_type_from_magika_json(stdout)
+      parsed = JSON.parse(stdout)
+      entry = parsed.is_a?(Array) ? parsed.first : parsed
+      return nil unless entry.is_a?(Hash)
+      return nil unless entry.dig("result", "status") == "ok"
+
+      entry.dig("result", "value", "output", "mime_type").presence
+    rescue JSON::ParserError
+      nil
+    end
+
+    def magika_path
+      ActiveStorage.paths[:magika] || "magika"
+    end
+
+    def missing_backend_error
+      CommandLineToolNotInstalledError.new("magika command-line tool is not installed")
+    end
+  end
+end

data/lib/active_storage_validations/analyzer/content_type_analyzer.rb

@@ -1,26 +1,22 @@
 # frozen_string_literal: true
 
-require "open3"
-
 module ActiveStorageValidations
   # = ActiveStorageValidations ContentType \Analyzer
   #
-  # Extracts the content type from an attachable. This is used to prevent content
-  # type spoofing.
-  #
-  # Example:
+  # Abstract base for content-type sniffers used by +spoofing_protection+.
+  # Concrete backends:
   #
-  #   ActiveStorageValidations::Analyzer::ContentTypeAnalyzer.new(attachable).content_type
-  #   # => { content_type: "image/png" }
+  #   ActiveStorageValidations::Analyzer::ContentTypeAnalyzer::File.new(attachable).content_type
+  #   # => { content_type: "image/png", content_type_backend: "file" }
   #
-  # This analyzer requires the {UNIX file}[https://en.wikipedia.org/wiki/File_(command)] command, which is not provided by \Rails. While it is available on most UNIX distributions, it may need to be installed explicitly on minimal or custom setups.
+  #   ActiveStorageValidations::Analyzer::ContentTypeAnalyzer::Magika.new(attachable).content_type
+  #   # => { content_type: "image/png", content_type_backend: "magika" }
   class Analyzer::ContentTypeAnalyzer < Analyzer
-    class FileCommandLineToolNotInstalledError < StandardError; end
-
     def content_type
       read_media do |media|
         {
-          content_type: media
+          content_type: media,
+          content_type_backend: backend.to_s
         }
       end
     end
@@ -33,7 +29,7 @@ module ActiveStorageValidations
           if media(tempfile).present?
             yield media(tempfile)
           else
-            logger.info "Skipping file content_type analysis because Linux file command doesn't support the file"
+            logger.info "Skipping content_type analysis because #{backend} doesn't support the file"
             nil
           end
         ensure
@@ -41,20 +37,15 @@ module ActiveStorageValidations
         end
       end
     rescue Errno::ENOENT
-      raise FileCommandLineToolNotInstalledError, "file command-line tool is not installed"
+      raise missing_backend_error
     end
 
-    def media_from_path(path)
-      instrument("file") do
-        stdout, status = Open3.capture2(
-          "file",
-          "-b",
-          "--mime-type",
-          path
-        )
+    def backend
+      raise NotImplementedError
+    end
 
-        status.success? ? stdout.strip : nil
-      end
+    def missing_backend_error
+      raise NotImplementedError
     end
   end
 end

data/lib/active_storage_validations/analyzer/image_analyzer/image_magick.rb

@@ -1,17 +1,30 @@
 # frozen_string_literal: true
 
 module ActiveStorageValidations
-  # This analyzer relies on the third-party {MiniMagick}[https://github.com/minimagick/minimagick] gem.
+  # This analyzer relies on the third-party {MiniMagick}[https://github.com/minimagick/minimagick] gem
+  # only to resolve the ImageMagick / GraphicsMagick +identify+ argv. Commands are executed through
+  # {ASVCommandable#run_command} so +command_timeout+ can kill hung processes.
   # MiniMagick requires the {ImageMagick}[http://www.imagemagick.org] system library.
   # This is the default Rails image analyzer.
   class Analyzer::ImageAnalyzer::ImageMagick < Analyzer::ImageAnalyzer
+    ImageInfo = Struct.new(:width, :height, :orientation, keyword_init: true) do
+      def valid?
+        width.to_i.positive? && height.to_i.positive?
+      end
+
+      def [](key)
+        orientation if key == "%[orientation]"
+      end
+    end
+
     private
 
     def read_media
       Tempfile.create(binmode: true) do |tempfile|
         begin
-          if media(tempfile).valid?
-            yield media(tempfile)
+          info = media(tempfile)
+          if info&.valid?
+            yield info
           else
             logger.info "Skipping image analysis because ImageMagick doesn't support the file"
             {}
@@ -20,17 +33,38 @@ module ActiveStorageValidations
           tempfile.close
         end
       end
-    rescue MiniMagick::Error => error
-      logger.error "Skipping image analysis due to an ImageMagick error: #{error.message}"
+    rescue Errno::ENOENT
+      logger.info "Skipping image analysis because ImageMagick isn't installed"
       {}
     end
 
     def media_from_path(path)
-      instrument("mini_magick") do
-        MiniMagick::Image.new(path)
+      instrument("mini_magick") do |payload|
+        result = run_command(*identify_command(path), payload: payload)
+        return nil unless result.success?
+
+        parse_identify_output(result.stdout)
       end
     end
 
+    def identify_command(path)
+      require "mini_magick"
+
+      tool = ::MiniMagick::Tool.new("identify")
+      tool.format("%w\t%h\t%[orientation]")
+      tool << path
+      tool.command
+    end
+
+    def parse_identify_output(stdout)
+      width, height, orientation = stdout.to_s.strip.split("\t", 3)
+      ImageInfo.new(
+        width: width.to_i,
+        height: height.to_i,
+        orientation: orientation.to_s
+      )
+    end
+
     def rotated_image?(image)
       %w[ RightTop LeftBottom TopRight BottomLeft ].include?(image["%[orientation]"])
     end

data/lib/active_storage_validations/analyzer/image_analyzer/vips.rb

@@ -16,6 +16,9 @@ module ActiveStorageValidations
             {}
           end
         ensure
+          # Best-effort: avoid unlinking the tempfile while a timed-out FFI load
+          # may still be using the path.
+          wait_for_vips_load_thread
           tempfile.close
         end
       end
@@ -25,19 +28,42 @@ module ActiveStorageValidations
     end
 
     def media_from_path(path)
-      instrument("vips") do
-        begin
-          ::Vips::Image.new_from_file(path, access: :sequential)
-        rescue ::Vips::Error
-          # Vips throw errors rather than returning false when reading a not
-          # supported attachable.
-          # We stumbled upon this issue while reading 0 byte size attachable
-          # https://github.com/janko/image_processing/issues/97
-          nil
-        end
+      instrument("vips") do |payload|
+        load_vips_image(path, payload)
+      end
+    end
+
+    def load_vips_image(path, payload)
+      timeout = timeout_in_seconds
+      return open_vips_image(path) if timeout.nil?
+
+      result = nil
+      @vips_load_thread = Thread.new { result = open_vips_image(path) }
+
+      if @vips_load_thread.join(timeout)
+        result
+      else
+        # libvips work may continue in the background until the C call returns.
+        mark_timed_out!(payload, "vips")
+        nil
       end
     end
 
+    def wait_for_vips_load_thread
+      return unless @vips_load_thread&.alive?
+
+      @vips_load_thread.join(0.5)
+    end
+
+    # Returns nil for unsupported / empty files instead of raising.
+    # Vips raises on unreadable input (e.g. 0-byte files) rather than returning
+    # a falsy image — see https://github.com/janko/image_processing/issues/97
+    def open_vips_image(path)
+      ::Vips::Image.new_from_file(path, access: :sequential)
+    rescue ::Vips::Error
+      nil
+    end
+
     ROTATIONS = /Right-top|Left-bottom|Top-right|Bottom-left/
     def rotated_image?(image)
       ROTATIONS === image.get("exif-ifd0-Orientation")

data/lib/active_storage_validations/analyzer/pdf_analyzer.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "open3"
-
 module ActiveStorageValidations
   # = ActiveStorageValidations PDF \Analyzer
   #
@@ -49,13 +47,9 @@ module ActiveStorageValidations
     end
 
     def media_from_path(path)
-      instrument(File.basename(pdfinfo_path)) do
-        stdout, _stderr, status = Open3.capture3(
-          pdfinfo_path,
-          path
-        )
-
-        status.success? ? stdout_to_hash(stdout) : nil
+      instrument(File.basename(pdfinfo_path)) do |payload|
+        result = run_command(pdfinfo_path, path, payload: payload)
+        result.success? ? stdout_to_hash(result.stdout) : nil
       end
     end
 

data/lib/active_storage_validations/analyzer/shared/asv_ff_probable.rb

@@ -28,17 +28,18 @@ module ActiveStorageValidations
     end
 
     def media_from_path(path)
-      instrument(File.basename(ffprobe_path)) do
-        stdout, _stderr, status = Open3.capture3(
+      instrument(File.basename(ffprobe_path)) do |payload|
+        result = run_command(
           ffprobe_path,
           "-print_format", "json",
           "-show_streams",
           "-show_format",
           "-v", "error",
-          path
+          path,
+          payload: payload
         )
 
-        status.success? ? JSON.parse(stdout) : nil
+        result.success? ? JSON.parse(result.stdout) : nil
       end
     end
 

data/lib/active_storage_validations/analyzer/video_analyzer.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require "open3"
 require_relative "shared/asv_ff_probable"
 
 module ActiveStorageValidations

data/lib/active_storage_validations/analyzer.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require_relative "shared/asv_attachable"
+require_relative "shared/asv_commandable"
 require_relative "shared/asv_loggable"
 
 module ActiveStorageValidations
@@ -12,12 +13,14 @@ module ActiveStorageValidations
   # Heavily (not to say 100%) inspired by Rails own ActiveStorage::Analyzer
   class Analyzer
     include ASVAttachable
+    include ASVCommandable
     include ASVLoggable
 
     attr_reader :attachable
 
-    def initialize(attachable)
+    def initialize(attachable, timeout: ActiveStorageValidations.command_timeout)
       @attachable = attachable
+      @timeout = timeout
     end
 
     # Override this method in a concrete subclass. Have it return a String content type.
@@ -81,8 +84,37 @@ module ActiveStorageValidations
       raise NotImplementedError
     end
 
-    def instrument(analyzer, &block)
-      ActiveSupport::Notifications.instrument("analyze.active_storage_validations", analyzer: analyzer, &block)
+    def timeout_in_seconds
+      return nil if @timeout.nil?
+
+      @timeout.to_f
+    end
+
+    def instrument(analyzer)
+      payload = {
+        analyzer: analyzer,
+        command: analyzer,
+        timeout: timeout_in_seconds,
+        timed_out: false
+      }
+
+      ActiveSupport::Notifications.instrument("analyze.active_storage_validations", payload) do
+        started_at = monotonic_time
+        result = yield payload
+        payload[:duration] = monotonic_time - started_at
+        result
+      end
+    end
+
+    def mark_timed_out!(payload, command)
+      payload[:timed_out] = true if payload
+      ActiveSupport::Notifications.instrument(
+        "timeout.active_storage_validations",
+        analyzer: payload&.[](:analyzer) || command,
+        command: command,
+        timeout: timeout_in_seconds
+      )
+      logger.info "Skipping file analysis because #{command} timed out after #{timeout_in_seconds} seconds"
     end
   end
 end