From: Renato "Lond" Cerqueira <renato@lond.com.br>
Date: Thu, 8 Mar 2018 01:25:10 +0000 (+0100)
Subject: Rescue when there's no extension in the remotable (#6358)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=9aba44ea79c4c1bd21e9232b65f3cf1a9736c6cc;p=mastodon.git

Rescue when there's no extension in the remotable (#6358)

* Rescue when there's no extension in the remotable
Sometimes the remotable is pointing to a directory with no file
extension. Maybe it should not be expecting to identify based on
extensions to begin with, but since it's the case, it should be ready
for it.

* Fix codeclimate issue

* Check if filename is nil instead of rescueing exception
Suggestion made in the PR

* Avoid concatenation issue if filename is nil
If filename is nil, extname was undefined

* Invert condition
Address PR comments
---

diff --git a/app/models/concerns/remotable.rb b/app/models/concerns/remotable.rb
index 990035b34..020303a2f 100644
--- a/app/models/concerns/remotable.rb
+++ b/app/models/concerns/remotable.rb
@@ -28,7 +28,11 @@ module Remotable
           matches  = response.headers['content-disposition']&.match(/filename="([^"]*)"/)
           filename = matches.nil? ? parsed_url.path.split('/').last : matches[1]
           basename = SecureRandom.hex(8)
-          extname  = File.extname(filename)
+          extname = if filename.nil?
+                      ''
+                    else
+                      File.extname(filename)
+                    end
 
           send("#{attachment_name}=", StringIO.new(response.to_s))
           send("#{attachment_name}_file_name=", basename + extname)