From 60c449e1d77c6e11ced796a7e088038d80137de6 Mon Sep 17 00:00:00 2001 From: multiple creatures Date: Fri, 30 Aug 2019 20:29:42 -0500 Subject: make sure media attachments are not from a blocked account, CDN, or their subdomains --- app/models/media_attachment.rb | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'app/models') diff --git a/app/models/media_attachment.rb b/app/models/media_attachment.rb index 932632b20..f624e0721 100644 --- a/app/models/media_attachment.rb +++ b/app/models/media_attachment.rb @@ -161,6 +161,13 @@ class MediaAttachment < ApplicationRecord (file.blank? || (Paperclip::Attachment.default_options[:storage] == :filesystem && !File.exist?(file.path))) && remote_url.present? end + def blocked? + domains = Set[self.account.domain] + domains.add(remote_url.scan(/[\w\-]+\.[\w\-]+(?:\.[\w\-]+)*/).first) if remote_url.present? + blocks = DomainBlock.suspend.or(DomainBlock.where(reject_media: true)) + domains.any? { |domain| blocks.where(domain: domain).or(blocks.where('domain LIKE ?', "%.#{domain}")).exists? } + end + def video_or_audio? video? || gifv? || audio? end -- cgit