From 58bcd50f7f8c187f8c0bd4a1d52aecafd76979fc Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Thu, 11 May 2017 23:14:00 +0200 Subject: Fix #1426 - Trim long usernames in public follower/following lists (#2993) Fix #2221 - Catch OpenSSL exceptions when loading remote avatars/headers/attachments Don't strip "rel" attribute from tags when sanitizing (microformats) --- app/models/concerns/account_avatar.rb | 2 +- app/models/concerns/account_header.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'app/models/concerns') diff --git a/app/models/concerns/account_avatar.rb b/app/models/concerns/account_avatar.rb index 38e32864a..8b9b72659 100644 --- a/app/models/concerns/account_avatar.rb +++ b/app/models/concerns/account_avatar.rb @@ -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 diff --git a/app/models/concerns/account_header.rb b/app/models/concerns/account_header.rb index 8fa5e1616..42f556a46 100644 --- a/app/models/concerns/account_header.rb +++ b/app/models/concerns/account_header.rb @@ -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 -- cgit