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)

diff --git a/app/javascript/styles/accounts.scss b/app/javascript/styles/accounts.scss
index b2b807a821a2fc1654c4b7f635c1af5e0fd396c1..eb5ddc7423e1a1959300067606a42d02dee70a4e 100644 (file)
--- a/app/javascript/styles/accounts.scss
+++ b/app/javascript/styles/accounts.scss
@@ -302,6 +302,8 @@
         display: block;
         color: $ui-base-color;
         text-decoration: none;
+        text-overflow: ellipsis;
+        overflow: hidden;
 
         &:hover {
           .display_name {

diff --git a/app/lib/sanitize_config.rb b/app/lib/sanitize_config.rb
index 90098969faca62a976d4a9901ed1619fc2dbcff5..22b46a3d30c2e23e56bbe0f6bc47f17d3db8af51 100644 (file)
--- a/app/lib/sanitize_config.rb
+++ b/app/lib/sanitize_config.rb
@@ -8,7 +8,7 @@ class Sanitize
       elements: %w(p br span a),
 
       attributes: {
-        'a'    => %w(href),
+        'a'    => %w(href rel),
         'span' => %w(class),
       },
 

diff --git a/app/models/concerns/account_avatar.rb b/app/models/concerns/account_avatar.rb
index 38e32864af826638ebc82b4bb1963c4b2fef45ca..8b9b72659155449d6fa885c65abc60b8f77104cf 100644 (file)
--- 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 8fa5e16163deb26f6fc29fe0ecad3b99359d938b..42f556a46e9cc828d9d4e56ba19881cf651a2ba3 100644 (file)
--- 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

diff --git a/app/services/process_feed_service.rb b/app/services/process_feed_service.rb
index 70c05c93854d8b3bfb6b3beca50981da53468e43..1558f87906135b375315510cb5d44c7201d8d613 100644 (file)
--- a/app/services/process_feed_service.rb
+++ b/app/services/process_feed_service.rb
@@ -223,7 +223,7 @@ class ProcessFeedService < BaseService
         begin
           media.file_remote_url = link['href']
           media.save
-        rescue OpenURI::HTTPError, Paperclip::Errors::NotIdentifiedByImageMagickError
+        rescue OpenURI::HTTPError, OpenSSL::SSL::SSLError, Paperclip::Errors::NotIdentifiedByImageMagickError
           next
         end
       end