fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-11-26 07:22:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix error when processing remote files with unusually long names (#28823)

Browse source
This commit is contained in:
Claire 2024-01-19 19:52:59 +01:00
parent 460e4fbdd6
commit e6072a8d13
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/paperclip/response_with_limit_adapter.rb
View file

@ -16,7 +16,7 @@ module Paperclip
private private
def cache_current_values def cache_current_values
@original_filename = filename_from_content_disposition.presence || filename_from_path.presence || 'data' @original_filename = truncated_filename
@tempfile = copy_to_tempfile(@target) @tempfile = copy_to_tempfile(@target)
@content_type = ContentTypeDetector.new(@tempfile.path).detect @content_type = ContentTypeDetector.new(@tempfile.path).detect
@size = File.size(@tempfile) @size = File.size(@tempfile)
@ -43,6 +43,13 @@ module Paperclip
source.response.connection.close source.response.connection.close
end end
def truncated_filename
filename = filename_from_content_disposition.presence || filename_from_path.presence || 'data'
extension = File.extname(filename)
basename = File.basename(filename, extension)
[basename[...20], extension[..4]].compact_blank.join
end
def filename_from_content_disposition def filename_from_content_disposition
disposition = @target.response.headers['content-disposition'] disposition = @target.response.headers['content-disposition']
disposition&.match(/filename="([^"]*)"/)&.captures&.first disposition&.match(/filename="([^"]*)"/)&.captures&.first