tykayn
/
mastodon
mirror of https://framagit.org/tykayn/mastodon.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix fetch of remote image with multiple Content-Type headers (#7749)

This commit is contained in:
Yamagishi Kazutoshi 2018-06-07 03:50:07 +09:00 committed by Eugen Rochko
parent c75493755f
commit 683707839f
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/models/concerns/remotable.rb
View File

@ -24,13 +24,14 @@ module Remotable
Request.new(:get, url).perform do |response| Request.new(:get, url).perform do |response|
next if response.code != 200 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) extname = detect_extname_from_content_type(content_type)
if extname.nil? if extname.nil?
matches = response.headers['content-disposition']&.match(/filename="([^"]*)"/) disposition = response.headers.get('content-disposition').last
filename = matches.nil? ? parsed_url.path.split('/').last : matches[1] matches = disposition&.match(/filename="([^"]*)"/)
extname = filename.nil? ? '' : File.extname(filename) filename = matches.nil? ? parsed_url.path.split('/').last : matches[1]
extname = filename.nil? ? '' : File.extname(filename)
end end
basename = SecureRandom.hex(8) basename = SecureRandom.hex(8)