Add extra protection in Upload#get_from_url.

In case the extension goes missing from the URL.
discourse · Sep 14, 2018 · dffd4fa · dffd4fa
1 parent 39a2d92
commit dffd4fa
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/app/models/upload.rb b/app/models/upload.rb
@@ -177,7 +177,7 @@ def self.get_from_url(url)
     end
 
     return if uri&.path.blank?
-    data = uri.path.match(/(\/original\/\dX[\/\.\w]*\/([a-zA-Z0-9]+)[\.\w]+)/)
+    data = uri.path.match(/(\/original\/\dX[\/\.\w]*\/([a-zA-Z0-9]+)[\.\w]*)/)
     return if data.blank?
     sha1 = data[2]
     upload = nil

diff --git a/spec/models/upload_spec.rb b/spec/models/upload_spec.rb
@@ -82,9 +82,16 @@
       expect(Upload.get_from_url(upload.url)).to eq(upload)
     end
 
+    describe 'for an extensionless url' do
+      let(:url) { "/uploads/default/original/1X/#{sha1}" }
+
+      it 'should return the right upload' do
+        expect(Upload.get_from_url(upload.url)).to eq(upload)
+      end
+    end
+
     describe 'for a url without a tree' do
       let(:url) { "/uploads/default/original/1X/#{sha1}.png" }
-      let(:upload) { Fabricate(:upload, url: url, sha1: sha1) }
 
       it 'should return the right upload' do
         expect(Upload.get_from_url(upload.url)).to eq(upload)