mirrors/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-11-20 03:25:17 +01:00
Code Issues Projects Releases Wiki 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/javascript/styles/accounts.scss
View File

@ -302,6 +302,8 @@
display: block;
color: $ui-base-color;
text-decoration: none;
text-overflow: ellipsis;
overflow: hidden;
&:hover {
.display_name {

2
app/lib/sanitize_config.rb
View File

@ -8,7 +8,7 @@ class Sanitize
elements: %w(p br span a),
attributes: {
'a' => %w(href),
'a' => %w(href rel),
'span' => %w(class),
},

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

2
app/services/process_feed_service.rb
View File

@ -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