github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-06-06 23:07:28 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: add Content-Disposition and Content-Type headers when downloading attachments

Browse Source
This commit is contained in:
Régis Hanol
2017-02-20 15:59:01 +01:00
parent fd62909819
commit 3ce3abef8f
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/controllers/uploads_controller.rb
View File

@ -39,8 +39,12 @@ class UploadsController < ApplicationController
return render_404 if SiteSetting.login_required? && db == "default" && current_user.nil? return render_404 if SiteSetting.login_required? && db == "default" && current_user.nil?
if upload = Upload.find_by(sha1: params[:sha]) || Upload.find_by(id: params[:id], url: request.env["PATH_INFO"]) if upload = Upload.find_by(sha1: params[:sha]) || Upload.find_by(id: params[:id], url: request.env["PATH_INFO"])
opts = { filename: upload.original_filename } opts = {
opts[:disposition] = 'inline' if params[:inline] filename: upload.original_filename,
content_type: Rack::Mime.mime_type(File.extname(upload.original_filename)),
}
opts[:disposition] = "inline" if params[:inline]
opts[:disposition] ||= "attachment" unless FileHelper.is_image?(upload.original_filename)
send_file(Discourse.store.path_for(upload), opts) send_file(Discourse.store.path_for(upload), opts)
else else
render_404 render_404

2
lib/file_helper.rb
View File

@ -28,7 +28,7 @@ class FileHelper
private private
def self.images def self.images
@@images ||= Set.new ["jpg", "jpeg", "png", "gif", "tif", "tiff", "bmp", "svg", "webp", "ico"] @@images ||= Set.new %w{jpg jpeg png gif tif tiff bmp svg webp ico}
end end
def self.images_regexp def self.images_regexp