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

FIX: Make clean up upload script a safer task to run.

Browse Source
This commit is contained in:
Guo Xiang Tan
2016-09-02 14:50:13 +08:00
parent cdc1d7e46c
commit e4b75f604c
4 changed files with 101 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/models/upload.rb
View File

@ -81,6 +81,10 @@ class Upload < ActiveRecord::Base
use
}
def self.generate_digest(path)
Digest::SHA1.file(path).hexdigest
end
def self.svg_whitelist_xpath
@@svg_whitelist_xpath ||= "//*[#{WHITELISTED_SVG_ELEMENTS.map { |e| "name()!='#{e}'" }.join(" and ") }]"
end
@ -145,7 +149,7 @@ class Upload < ActiveRecord::Base
end
# compute the sha of the file
sha1 = Digest::SHA1.file(file).hexdigest
sha1 = Upload.generate_digest(file)
# do we already have that upload?
upload = find_by(sha1: sha1)
@ -259,7 +263,7 @@ class Upload < ActiveRecord::Base
end
# compute SHA if missing
if upload.sha1.blank?
upload.sha1 = Digest::SHA1.file(path).hexdigest
upload.sha1 = Upload.generate_digest(path)
end
# optimize if image
if FileHelper.is_image?(File.basename(path))