IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: Ensure lightbox image download has correct content disposition in S3 (#7845)

Browse Source
This commit is contained in:
Penar Musaraj
2019-07-04 11:32:51 -04:00
committed by GitHub
parent e9bb13c630
commit 03805e5a76
4 changed files with 40 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/file_store/s3_store.rb
View File

@@ -99,15 +99,23 @@ module FileStore
File.join("uploads", "tombstone", RailsMultisite::ConnectionManagement.current_db, "/")
end
def download_url(upload)
return unless upload
"#{upload.short_path}?dl=1"
end
def path_for(upload)
url = upload&.url
FileStore::LocalStore.new.path_for(upload) if url && url[/^\/[^\/]/]
end
def url_for(upload)
if upload.private?
def url_for(upload, force_download: false)
if upload.private? || force_download
opts = { expires_in: S3Helper::DOWNLOAD_URL_EXPIRES_AFTER_SECONDS }
opts[:response_content_disposition] = "attachment; filename=\"#{upload.original_filename}\"" if force_download
obj = @s3_helper.object(get_upload_key(upload))
url = obj.presigned_url(:get, expires_in: S3Helper::DOWNLOAD_URL_EXPIRES_AFTER_SECONDS)
url = obj.presigned_url(:get, opts)
else
url = upload.url
end