about summary refs log tree commit diff
path: root/config/application.rb
diff options
context:
space:
mode:
authorClaire <claire.github-309c@sitedethib.com>2023-07-06 15:05:05 +0200
committerStarfall <us@starfall.systems>2023-07-07 11:45:48 -0500
commitc58ab80b976410b51bc5520b00a98dcdc256dee3 (patch)
tree30f37474642eb7d8120c82b6dd534fb43806d5df /config/application.rb
parent5ddae512857eb143ff91741f4a35c186fac1036e (diff)
Merge pull request from GHSA-9928-3cp5-93fm
* Fix attachments getting processed despite failing content-type validation

* Add a restrictive ImageMagick security policy tailored for Mastodon

* Fix misdetection of MP3 files with large cover art

* Reject unprocessable audio/video files instead of keeping them unchanged
Diffstat (limited to 'config/application.rb')
-rw-r--r--config/application.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/config/application.rb b/config/application.rb
index f72cc8e11..4a440c6f2 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -28,6 +28,7 @@ require_relative '../lib/paperclip/url_generator_extensions'
 require_relative '../lib/paperclip/attachment_extensions'
 require_relative '../lib/paperclip/lazy_thumbnail'
 require_relative '../lib/paperclip/gif_transcoder'
+require_relative '../lib/paperclip/media_type_spoof_detector_extensions'
 require_relative '../lib/paperclip/transcoder'
 require_relative '../lib/paperclip/type_corrector'
 require_relative '../lib/paperclip/response_with_limit_adapter'