zelo72
/
mastodon
mirror of https://github.com/mastodon/mastodon
2
2
Fork 1
Code Issues 10 Releases Wiki Activity

Skip remote media URLs that don't have a hostname

This commit is contained in:
Eugen Rochko 2017-02-22 19:55:14 +01:00
parent 3202bdd744
commit 53ae431867
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/account.rb
View File

@ -138,7 +138,7 @@ class Account < ApplicationRecord
def avatar_remote_url=(url) def avatar_remote_url=(url)
parsed_url = URI.parse(url) parsed_url = URI.parse(url)
return if !%w(http https).include?(parsed_url.scheme) || self[:avatar_remote_url] == url return if !%w(http https).include?(parsed_url.scheme) || parsed_url.host.empty? || self[:avatar_remote_url] == url
self.avatar = parsed_url self.avatar = parsed_url
self[:avatar_remote_url] = url self[:avatar_remote_url] = url

3
app/services/process_feed_service.rb
View File

@ -181,6 +181,9 @@ class ProcessFeedService < BaseService
next unless link['href'] next unless link['href']
media = MediaAttachment.where(status: parent, remote_url: link['href']).first_or_initialize(account: parent.account, status: parent, remote_url: link['href']) media = MediaAttachment.where(status: parent, remote_url: link['href']).first_or_initialize(account: parent.account, status: parent, remote_url: link['href'])
parsed_url = URI.parse(link['href'])
next if !%w(http https).include?(parsed_url.scheme) || parsed_url.host.empty?
begin begin
media.file_remote_url = link['href'] media.file_remote_url = link['href']