Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Validate maximum file size after converting audio/video file for tipline content #2046

Merged
merged 1 commit into from
Sep 23, 2024
Merged

Validate maximum file size after converting audio/video file for tipline content #2046

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion app/models/concerns/tipline_content_multimedia.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
# Attached file: image, audio or video

module TiplineContentMultimedia
class ConvertedFileTooLarge < StandardError; end
extend ActiveSupport::Concern

included do
Expand Down Expand Up @@ -50,11 +51,12 @@ def convert_header_file_audio_or_video(type)
output_path = File.join(Rails.root, 'tmp', "#{content_name}-#{type}-output-#{self.id}-#{now}.mp4")
video = FFMPEG::Movie.new(input.path)
video.transcode(output_path, options)
raise TiplineContentMultimedia::ConvertedFileTooLarge.new('Converted file for tipline content is too large') if (File.size(output_path).to_f / 1024000.0) > self.header_file_video_max_size
path = "#{content_name}/video/#{content_name}-#{type}-#{self.id}-#{now}"
CheckS3.write(path, 'video/mp4', File.read(output_path))
url = CheckS3.public_url(path)
rescue StandardError => e
CheckSentry.notify(e)
CheckSentry.notify(e, class: self.class, id: self.id)
ensure
FileUtils.rm_f input.path
FileUtils.rm_f output_path
Expand Down
6 changes: 5 additions & 1 deletion app/models/concerns/tipline_content_video.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,12 @@ module TiplineContentVideo
extend ActiveSupport::Concern

# MP4 less than 10 MB (WhatsApp supports 16 MB, let's be safe)
def header_file_video_max_size
10
end

def validate_header_file_video
self.validate_header_file(10, ['mp4'], 'errors.messages.video_too_large')
self.validate_header_file(self.header_file_video_max_size, ['mp4'], 'errors.messages.video_too_large')
end

def should_convert_header_video?
Expand Down
Binary file added test/data/h265-video.mp4
View file
Open in desktop
Binary file not shown.
11 changes: 11 additions & 0 deletions test/models/tipline_newsletter_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -479,4 +479,15 @@ def teardown
create_tipline_newsletter send_every: nil
end
end

test 'should validate video size after converting' do
# This test file is 300 KB, but 1.6 MB after converting
WebMock.stub_request(:get, /:9000/).to_return(body: File.read(File.join(Rails.root, 'test', 'data', 'h265-video.mp4')))
TiplineNewsletter.any_instance.stubs(:new_file_uploaded?).returns(true)
TiplineNewsletter.any_instance.stubs(:header_file_video_max_size).returns(1) # Maximum 1 MB
CheckSentry.stubs(:notify).once
Sidekiq::Testing.inline! do
create_tipline_newsletter header_type: 'video', header_file: 'h265-video.mp4'
end
end
end
Loading