about summary refs log tree commit diff
path: root/app/models
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2017-05-11 23:14:00 +0200
committerGitHub <noreply@github.com>2017-05-11 23:14:00 +0200
commit58bcd50f7f8c187f8c0bd4a1d52aecafd76979fc (patch)
tree3299106ece1d8030d7551a7ae9dd75922b6b906d /app/models
parent60ecfb87ae4a2587169592ca38b3292798faab43 (diff)
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 <a> tags when sanitizing (microformats)
Diffstat (limited to 'app/models')
-rw-r--r--app/models/concerns/account_avatar.rb2
-rw-r--r--app/models/concerns/account_header.rb2
2 files changed, 2 insertions, 2 deletions
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