diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2021-10-06 15:49:32 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-06 14:49:32 +0100 |
| commit | 84ceebe1c4a7fbec883e37b90874145caea7bc76 (patch) | |
| tree | f64d143e2f84c559fe88a0869baed8eeb195c463 /app/models/media_attachment.rb | |
| parent | 900481b7fa638119b826ed888fc8eaca962ecf55 (diff) | |
Fix media attachment size validation not correctly accounting for file type (#16819)
* Fix media attachment size validation not correctly accounting for file type Fixes a regression introduced in #16724 caused by the fact that kt-paperclip now correctly runs validations before processing, meaning that file size verification could not rely on our before_post_processing hook. Moved the `before_post_processing` hooks to `before_validate` to make sure the media attachment type is set correctly before the file gets validated. * Add tests
Diffstat (limited to 'app/models/media_attachment.rb')
| -rw-r--r-- | app/models/media_attachment.rb | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/app/models/media_attachment.rb b/app/models/media_attachment.rb index cc48f65ed..97d619f35 100644 --- a/app/models/media_attachment.rb +++ b/app/models/media_attachment.rb @@ -167,12 +167,11 @@ class MediaAttachment < ApplicationRecord processors: ->(f) { file_processors f }, convert_options: GLOBAL_CONVERT_OPTIONS - before_file_post_process :set_type_and_extension - before_file_post_process :check_video_dimensions + before_file_validate :set_type_and_extension + before_file_validate :check_video_dimensions validates_attachment_content_type :file, content_type: IMAGE_MIME_TYPES + VIDEO_MIME_TYPES + AUDIO_MIME_TYPES - validates_attachment_size :file, less_than: IMAGE_LIMIT, unless: :larger_media_format? - validates_attachment_size :file, less_than: VIDEO_LIMIT, if: :larger_media_format? + validates_attachment_size :file, less_than: ->(m) { m.larger_media_format? ? VIDEO_LIMIT : IMAGE_LIMIT } remotable_attachment :file, VIDEO_LIMIT, suppress_errors: false, download_on_assign: false, attribute_name: :remote_url has_attached_file :thumbnail, |