luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-21 22:32:58 +00:00
Code Issues Projects Releases Wiki Activity

Fix invalid Content-Type header for WebP images (#26773)

Browse source
This commit is contained in:
Christian Schmidt 2023-09-04 09:46:33 +02:00 committed by GitHub
parent 1f92436745
commit ea31929776
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
config/initializers/mime_types.rb
View file

@ -1,6 +1,7 @@
# frozen_string_literal: true # frozen_string_literal: true
# Be sure to restart your server when you modify this file.
Mime::Type.register 'application/json', :json, %w(text/x-json application/jsonrequest application/jrd+json application/activity+json application/ld+json) Mime::Type.register 'application/json', :json, %w(text/x-json application/jsonrequest application/jrd+json application/activity+json application/ld+json)
Mime::Type.register 'text/xml', :xml, %w(application/xml application/atom+xml application/xrd+xml) Mime::Type.register 'text/xml', :xml, %w(application/xml application/atom+xml application/xrd+xml)
# WebP is not defined in Rack 2.2.
Rack::Mime::MIME_TYPES['.webp'] = 'image/webp'

3
spec/models/media_attachment_spec.rb
View file

@ -105,6 +105,9 @@ RSpec.describe MediaAttachment, paperclip_processing: true do
# sets file extension # sets file extension
expect(media.file_file_name).to end_with extension expect(media.file_file_name).to end_with extension
# Rack::Mime (used by PublicFileServerMiddleware) recognizes file extension
expect(Rack::Mime.mime_type(extension, nil)).to eq content_type
end end
it 'saves media attachment with correct size metadata' do it 'saves media attachment with correct size metadata' do