e65ede1ac5
Under certain conditions, files fetched from remotes trigger an error when being uploaded using OpenStack Swift. This is because in some cases, the remote server will not return a content-length, so our ResponseWithLimitAdapter will hold a `nil` value for `#size`, which will lead to an invalid value for the Content-Length header of the Swift API call. This commit fixes that by taking the size from the actually-downloaded file size rather than the upstream-provided Content-Length header value.
55 lines
1.3 KiB
Ruby
55 lines
1.3 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
module Paperclip
|
|
class ResponseWithLimitAdapter < AbstractAdapter
|
|
def self.register
|
|
Paperclip.io_adapters.register self do |target|
|
|
target.is_a?(ResponseWithLimit)
|
|
end
|
|
end
|
|
|
|
def initialize(target, options = {})
|
|
super
|
|
cache_current_values
|
|
end
|
|
|
|
private
|
|
|
|
def cache_current_values
|
|
@original_filename = filename_from_content_disposition.presence || filename_from_path.presence || 'data'
|
|
@tempfile = copy_to_tempfile(@target)
|
|
@content_type = ContentTypeDetector.new(@tempfile.path).detect
|
|
@size = File.size(@tempfile)
|
|
end
|
|
|
|
def copy_to_tempfile(source)
|
|
bytes_read = 0
|
|
|
|
source.response.body.each do |chunk|
|
|
bytes_read += chunk.bytesize
|
|
|
|
destination.write(chunk)
|
|
chunk.clear
|
|
|
|
raise Mastodon::LengthValidationError if bytes_read > source.limit
|
|
end
|
|
|
|
destination.rewind
|
|
destination
|
|
rescue Mastodon::LengthValidationError
|
|
destination.close(true)
|
|
raise
|
|
ensure
|
|
source.response.connection.close
|
|
end
|
|
|
|
def filename_from_content_disposition
|
|
disposition = @target.response.headers['content-disposition']
|
|
disposition&.match(/filename="([^"]*)"/)&.captures&.first
|
|
end
|
|
|
|
def filename_from_path
|
|
@target.response.uri.path.split('/').last
|
|
end
|
|
end
|
|
end
|