From dc73241bd9a529edc5573e10b5899cb47ca479ae Mon Sep 17 00:00:00 2001 From: Yamagishi Kazutoshi Date: Tue, 5 Jun 2018 01:58:36 +0900 Subject: Detect extname from Content-Type (#7733) --- app/models/concerns/remotable.rb | 34 +++++++++++++++++++++++++++------- 1 file changed, 27 insertions(+), 7 deletions(-) (limited to 'app/models/concerns/remotable.rb') diff --git a/app/models/concerns/remotable.rb b/app/models/concerns/remotable.rb index c17f04776..dc2e12b67 100644 --- a/app/models/concerns/remotable.rb +++ b/app/models/concerns/remotable.rb @@ -24,14 +24,16 @@ module Remotable Request.new(:get, url).perform do |response| next if response.code != 200 - matches = response.headers['content-disposition']&.match(/filename="([^"]*)"/) - filename = matches.nil? ? parsed_url.path.split('/').last : matches[1] + content_type = parse_content_type(response.headers['content-type']) + extname = detect_extname_from_content_type(content_type) + + if extname.nil? + matches = response.headers['content-disposition']&.match(/filename="([^"]*)"/) + filename = matches.nil? ? parsed_url.path.split('/').last : matches[1] + extname = filename.nil? ? '' : File.extname(filename) + end + basename = SecureRandom.hex(8) - extname = if filename.nil? - '' - else - File.extname(filename) - end send("#{attachment_name}=", StringIO.new(response.body_with_limit(limit))) send("#{attachment_name}_file_name=", basename + extname) @@ -57,4 +59,22 @@ module Remotable end end end + + private + + def detect_extname_from_content_type(content_type) + return if content_type.nil? + + type = MIME::Types[content_type].first + + return if type.nil? + + type.extensions.first + end + + def parse_content_type(content_type) + return if content_type.nil? + + content_type.split(/\s*;\s*/).first + end end -- cgit From b7b331ad0dd061b55435265009af51cdeef29fdc Mon Sep 17 00:00:00 2001 From: Yamagishi Kazutoshi Date: Thu, 7 Jun 2018 03:49:39 +0900 Subject: Add missing dot for remote image (#7751) --- app/models/concerns/remotable.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'app/models/concerns/remotable.rb') diff --git a/app/models/concerns/remotable.rb b/app/models/concerns/remotable.rb index dc2e12b67..90c6894e0 100644 --- a/app/models/concerns/remotable.rb +++ b/app/models/concerns/remotable.rb @@ -69,7 +69,11 @@ module Remotable return if type.nil? - type.extensions.first + extname = type.extensions.first + + return if extname.nil? + + ".#{extname}" end def parse_content_type(content_type) -- cgit From 683707839f6e61df95a4958675883c8f80aa6a84 Mon Sep 17 00:00:00 2001 From: Yamagishi Kazutoshi Date: Thu, 7 Jun 2018 03:50:07 +0900 Subject: Fix fetch of remote image with multiple Content-Type headers (#7749) --- app/models/concerns/remotable.rb | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'app/models/concerns/remotable.rb') diff --git a/app/models/concerns/remotable.rb b/app/models/concerns/remotable.rb index 90c6894e0..c17f19a60 100644 --- a/app/models/concerns/remotable.rb +++ b/app/models/concerns/remotable.rb @@ -24,13 +24,14 @@ module Remotable Request.new(:get, url).perform do |response| next if response.code != 200 - content_type = parse_content_type(response.headers['content-type']) + content_type = parse_content_type(response.headers.get('content-type').last) extname = detect_extname_from_content_type(content_type) if extname.nil? - matches = response.headers['content-disposition']&.match(/filename="([^"]*)"/) - filename = matches.nil? ? parsed_url.path.split('/').last : matches[1] - extname = filename.nil? ? '' : File.extname(filename) + disposition = response.headers.get('content-disposition').last + matches = disposition&.match(/filename="([^"]*)"/) + filename = matches.nil? ? parsed_url.path.split('/').last : matches[1] + extname = filename.nil? ? '' : File.extname(filename) end basename = SecureRandom.hex(8) -- cgit