From 1f4ac98fcf9d69f9bb0512f945c8aed01ae11624 Mon Sep 17 00:00:00 2001 From: MAEDA Go Date: Sat, 27 Mar 2021 16:28:58 +0900 Subject: [PATCH 2/2] Replace MimeMagic with Marcel --- Gemfile | 2 +- lib/redmine/thumbnail.rb | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index b4ab703ba..443cd04d7 100644 --- a/Gemfile +++ b/Gemfile @@ -10,7 +10,7 @@ gem 'request_store', '~> 1.5.0' gem "mini_mime", "~> 1.0.1" gem "actionpack-xml_parser" gem 'roadie-rails', (RUBY_VERSION < '2.5' ? '~> 1.3.0' : '~> 2.2.0') -gem "mimemagic" +gem 'marcel' gem "mail", "~> 2.7.1" gem 'csv', (RUBY_VERSION < '2.5' ? ['>= 3.1.1', '<= 3.1.5'] : '~> 3.1.1') gem 'nokogiri', (RUBY_VERSION < '2.5' ? '~> 1.10.0' : '~> 1.11.1') diff --git a/lib/redmine/thumbnail.rb b/lib/redmine/thumbnail.rb index 53a0f5350..4bee4085a 100644 --- a/lib/redmine/thumbnail.rb +++ b/lib/redmine/thumbnail.rb @@ -18,7 +18,6 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. require 'fileutils' -require 'mimemagic' module Redmine module Thumbnail @@ -35,8 +34,7 @@ module Redmine unless File.exists?(target) # Make sure we only invoke Imagemagick if the file type is allowed - mime_type = File.open(source) {|f| MimeMagic.by_magic(f).try(:type)} - return nil if mime_type.nil? + mime_type = File.open(source) {|f| Marcel::MimeType.for(f)} return nil if !ALLOWED_TYPES.include? mime_type return nil if is_pdf && mime_type != "application/pdf" -- 2.29.2