Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix get from url for external uploads without CDN

This commit is contained in:
Maja Komel 2018-06-05 15:19:06 +02:00 committed by Sam
parent 0c2f590c64
commit 6c9190357c
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/upload.rb
View File

@ -79,6 +79,8 @@ class Upload < ActiveRecord::Base
return if url.blank? return if url.blank?
# we store relative urls, so we need to remove any host/cdn # we store relative urls, so we need to remove any host/cdn
url = url.sub(Discourse.asset_host, "") if Discourse.asset_host.present? && Discourse.asset_host != SiteSetting.Upload.s3_cdn_url url = url.sub(Discourse.asset_host, "") if Discourse.asset_host.present? && Discourse.asset_host != SiteSetting.Upload.s3_cdn_url
# when using s3 without CDN
url = url.sub(/^https?\:/, "") if url.include?(Discourse.store.absolute_base_url) && Discourse.store.external?
# when using s3, we need to replace with the absolute base url # when using s3, we need to replace with the absolute base url
url = url.sub(SiteSetting.Upload.s3_cdn_url, Discourse.store.absolute_base_url) if SiteSetting.Upload.s3_cdn_url.present? url = url.sub(SiteSetting.Upload.s3_cdn_url, Discourse.store.absolute_base_url) if SiteSetting.Upload.s3_cdn_url.present?

7
spec/models/upload_spec.rb
View File

@ -106,6 +106,13 @@ describe Upload do
SiteSetting.enable_s3_uploads = false SiteSetting.enable_s3_uploads = false
end end
it "should return the right upload when using base url (not CDN) for s3" do
upload
url = "https://#{SiteSetting.s3_upload_bucket}.s3.amazonaws.com#{path}"
expect(Upload.get_from_url(url)).to eq(upload)
end
it "should return the right upload when using a CDN for s3" do it "should return the right upload when using a CDN for s3" do
upload upload
s3_cdn_url = 'https://mycdn.slowly.net' s3_cdn_url = 'https://mycdn.slowly.net'