github-mirror/discourse
github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-04-03 05:39:41 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Add extra safety

Browse Source
This commit is contained in:
Sam 2015-08-25 12:05:15 +10:00
parent 2c59ad3dd3
commit 4e37bcc3e2
1 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/controllers/static_controller.rb
View File

@ -93,13 +93,21 @@ class StaticController < ApplicationController
# a huge expiry, we also cache these assets in nginx so it bypassed if needed # a huge expiry, we also cache these assets in nginx so it bypassed if needed
def favicon def favicon
data = DistributedMemoizer.memoize('favicon' + SiteSetting.favicon_url, 60*60*24) do data = DistributedMemoizer.memoize('favicon' + SiteSetting.favicon_url, 60*30) do
begin
file = FileHelper.download(SiteSetting.favicon_url, 50.kilobytes, "favicon.png") file = FileHelper.download(SiteSetting.favicon_url, 50.kilobytes, "favicon.png")
data = file.read data = file.read
file.unlink file.unlink
data data
rescue => e
Rails.logger.warn("Invalid favicon_url #{SiteSetting.favicon_url}: #{e}\n#{e.backtrace}")
""
end
end end
if data.bytesize == 0
render text: UserAvatarsController::DOT, content_type: "image/gif"
else
expires_in 1.year, public: true expires_in 1.year, public: true
response.headers["Expires"] = 1.year.from_now.httpdate response.headers["Expires"] = 1.year.from_now.httpdate
response.headers["Content-Length"] = data.bytesize.to_s response.headers["Content-Length"] = data.bytesize.to_s
@ -107,6 +115,8 @@ class StaticController < ApplicationController
render text: data, content_type: "image/png" render text: data, content_type: "image/png"
end end
end
def cdn_asset def cdn_asset
path = File.expand_path(Rails.root + "public/assets/" + params[:path]) path = File.expand_path(Rails.root + "public/assets/" + params[:path])