Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Detect and prevent image bombs, max. processable dimension 4096^2 (#7229)

Browse source
This commit is contained in:
Eugen Rochko 2018-04-23 09:16:38 +02:00 • committed by GitHub
parent 3bf6da1ffc
commit 7db7d68136
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 34 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

16
app/models/media_attachment.rb
View file

@ -19,8 +19,6 @@
# description :text
#
require 'mime/types'
class MediaAttachment < ApplicationRecord
self.inheritance_column = nil
@ -70,6 +68,8 @@ class MediaAttachment < ApplicationRecord
validates_attachment_size :file, less_than: LIMIT
remotable_attachment :file, LIMIT
include Attachmentable
validates :account, presence: true
validates :description, length: { maximum: 420 }, if: :local?
@ -176,9 +176,6 @@ class MediaAttachment < ApplicationRecord
def set_type_and_extension
self.type = VIDEO_MIME_TYPES.include?(file_content_type) ? :video : :image
extension = appropriate_extension
basename = Paperclip::Interpolations.basename(file, :original)
file.instance_write :file_name, [basename, extension].delete_if(&:blank?).join('.')
end
def set_meta
@ -223,13 +220,4 @@ class MediaAttachment < ApplicationRecord
bitrate: movie.bitrate,
}
end
def appropriate_extension
mime_type = MIME::Types[file.content_type]
extensions_for_mime_type = mime_type.empty? ? [] : mime_type.first.extensions
original_extension = Paperclip::Interpolations.extension(file, :original)
extensions_for_mime_type.include?(original_extension) ? original_extension : extensions_for_mime_type.first
end
end