Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Fix #1426 - Trim long usernames in public follower/following lists (#2993)

Browse source 
Fix #2221 - Catch OpenSSL exceptions when loading remote avatars/headers/attachments
Don't strip "rel" attribute from <a> tags when sanitizing (microformats)
This commit is contained in:
Eugen Rochko 2017-05-11 23:14:00 +02:00 • committed by GitHub
parent 60ecfb87ae
commit 58bcd50f7f
5 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/models/concerns/account_avatar.rb
View file

@ -34,7 +34,7 @@ module AccountAvatar
self.avatar = URI.parse(parsed_url.to_s)
self[:avatar_remote_url] = url
rescue OpenURI::HTTPError => e
rescue OpenURI::HTTPError, OpenSSL::SSL::SSLError, Paperclip::Errors::NotIdentifiedByImageMagickError => e
Rails.logger.debug "Error fetching remote avatar: #{e}"
end
end

2
app/models/concerns/account_header.rb
View file

@ -34,7 +34,7 @@ module AccountHeader
self.header = URI.parse(parsed_url.to_s)
self[:header_remote_url] = url
rescue OpenURI::HTTPError => e
rescue OpenURI::HTTPError, OpenSSL::SSL::SSLError, Paperclip::Errors::NotIdentifiedByImageMagickError => e
Rails.logger.debug "Error fetching remote header: #{e}"
end
end